diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 6f67681a1..7ebf12c54 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -119,6 +119,7 @@ death.attack.teleporter=%1$s wurde ins Nichts teleportiert. death.attack.blackhole=%1$s wurde spaghettifiziert. death.attack.blender=%1$s wurde in kleine, mundgerechte Stücke geschnitten. death.attack.meteorite=%1$s wurde von einem fallenden Stein aus dem Weltall erschlagen. +death.attack.boxcar=%1$s wurde von einem fallenden Güterwagon zermatscht. Autsch! item.redstone_sword.name=Redstoneschwert item.big_sword.name=Großes Schwert @@ -194,6 +195,7 @@ tile.therm_endo.name=Endothermische Bombe tile.therm_exo.name=Exothermische Bombe tile.crashed_bomb.name=Blindgänger +tile.boxcar.name=Güterwagon tile.crate.name=Vorratskiste tile.marker_structure.name=Multiblock-Strukturvorlage @@ -398,6 +400,7 @@ item.pipes_steel.name=Stahlrohre item.drill_titanium.name=Titanbohrer item.bolt_tungsten.name=Wolframbolzen item.bolt_compound.name=Verstärkte Turbinenwelle +item.plate_polymer.name=Isolator item.ingot_australium.name=Australiumbarren item.ingot_weidanium.name=Weidaniumbarren @@ -417,6 +420,10 @@ item.nugget_desh.name=Deshnugget item.powder_desh.name=Deshstaub item.powder_desh_mix.name=Deshmischung item.powder_nitan_mix.name=Nitaniummischung +item.powder_spark_mix.name=Sparkmischung +item.ingot_dineutronium.name=Dineutroniumbarren +item.powder_dineutronium.name=Dineutroniumstaub +item.nugget_dineutronium.name=Dineutroniumnugget item.solid_fuel.name=Festbrennstoff @@ -594,8 +601,12 @@ item.battery_generic.name=Batterie item.battery_advanced.name=Fortgeschrittene Batterie item.battery_lithium.name=Lithium-Ionen-Batterie item.battery_schrabidium.name=Schrabidiumbatterie +item.battery_spark.name=Spark-Batterie item.battery_creative.name=Unendliche Batterie +item.battery_su.name=Einwegbatterie +item.battery_su_l.name=Große Einwegbatterie + item.battery_red_cell.name=Redstone-Energiezelle item.battery_advanced_cell.name=Fortgeschrittene Energiezelle item.battery_lithium_cell.name=Lithium-Ionen-Energiezelle @@ -608,6 +619,8 @@ item.battery_red_cell_24.name=24-fache Redstone-Energiezelle item.battery_advanced_cell_12.name=Zwölffache fortgeschrittene Energiezelle item.battery_lithium_cell_6.name=Sechsfache Lithium-Ionen-Energiezelle item.battery_schrabidium_cell_4.name=Vierfache Schrabidium-Energiezelle +item.battery_spark_cell_6.name=Spark-Energiezelle +item.battery_spark_cell_25.name=Spark-Arkane Autobatterie item.upgrade_template.name=Maschinenupgrade-Vorlage item.upgrade_speed_1.name=Rotes Maschinenupgrade Mk.I @@ -723,7 +736,7 @@ item.rod_pu240.name=Pu240-Brennstab item.rod_neptunium.name=Neptuniumbrennstab item.rod_lead.name=Bleistab item.rod_schrabidium.name=Schrabidiumbrennstab -item.rod_astatine.name=Euphemiumbrennstab +item.rod_euphemium.name=Euphemiumbrennstab item.rod_australium.name=Australiumbrennstab item.rod_weidanium.name=Weidaniumbrennstab item.rod_reiium.name=Reiiumbrennstab @@ -915,6 +928,7 @@ item.gun_revolver_schrabidium.name=Schrabidiumrevolver item.gun_revolver_cursed.name=Verfluchte Pistole item.gun_revolver_nightmare.name=Nightmare-Revolver (Original) item.gun_revolver_nightmare2.name=Nightmare-Revolver (Dunkel) +item.gun_revolver_pip.name=Lil' Pipsqueak item.gun_fatman.name=M42 Nukleares Katapult "Fat Man" item.gun_mirv.name=M42 Nukleares Katapult "Experimentelles MIRV" item.gun_bf.name=M42_2 Nukleares Katapult "Antimaterienwerfer" @@ -944,6 +958,7 @@ item.gun_revolver_schrabidium_ammo.name=Schrabidiumpatrone item.gun_revolver_cursed_ammo.name=Stahlpatrone item.gun_revolver_nightmare_ammo.name=Nightmare-Kugel item.gun_revolver_nightmare2_ammo.name=Laserschrot +item.gun_revolver_pip_ammo.name=Verdorbene Patrone 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. @@ -1045,16 +1060,16 @@ item.chopper_blades.name=Jagdschrauber Rotorblätter item.igniter.name=Zünder item.watch.name=Zerbrochene Taschenuhr -item.apple_astatine.name=Euphemiumapfel -item.ingot_astatine.name=Euphemiumbarren -item.nugget_astatine.name=Euphemiumnugget -item.rod_quad_astatine.name=Ausgebrannter Schrabidiumvierfachbrennstab +item.apple_euphemium.name=Euphemiumapfel +item.ingot_euphemium.name=Euphemiumbarren +item.nugget_euphemium.name=Euphemiumnugget +item.rod_quad_euphemium.name=Ausgebrannter Schrabidiumvierfachbrennstab item.plate_euphemium.name=Euphemium-Verbundplatte -item.astatine_helmet.name=Euphemiumstiefel -item.astatine_plate.name=Euphemiumbrustplatte -item.astatine_legs.name=Euphemiumbeinschutz -item.astatine_boots.name=Euphemiumstiefel +item.euphemium_helmet.name=Euphemiumstiefel +item.euphemium_plate.name=Euphemiumbrustplatte +item.euphemium_legs.name=Euphemiumbeinschutz +item.euphemium_boots.name=Euphemiumstiefel item.schrabidium_helmet.name=Schrabidiumhelm item.schrabidium_plate.name=Schrabidiumbrustplatte @@ -1281,6 +1296,7 @@ item.bottle_empty.name=Leere bombenförmige Glasflasche item.bottle_nuka.name=Nuka-Cola Flasche item.bottle_cherry.name=Nuka-Cherry Flasche item.bottle_quantum.name=Nuka Cola Quantum +item.bottle_sparkle.name=S~Cola item.bottle2_empty.name=Leere Glasflasche item.bottle2_korl.name=Korl item.bottle2_fritz.name=Fritz-Kola @@ -1289,6 +1305,7 @@ item.bottle2_fritz_special.name=Die erste Fritz-Kola item.chocolate_milk.name=Schokomilch item.cap_nuka.name=Nuka-Cola Kronkorken item.cap_quantum.name=Nuka Cola Quantum Kronkorken +item.cap_sparkle.name=S~Cola Kronkorken item.cap_korl.name=Korl Kronkorken item.cap_fritz.name=Fritz-Kola Kronkorken item.ring_pull.name=Dosenring @@ -1335,6 +1352,32 @@ item.part_carbon.name=Kohlenstoffstaubkiste item.part_copper.name=Kupferstaubkiste item.part_plutonium.name=Plutoniumstaubkiste +item.rune_blank.name=Blank Catalyst Matrix +item.rune_isa.name=Cool Catalyst Matrix +item.rune_dagaz.name=Balanced Catalyst Matrix +item.rune_hagalaz.name=Rough Catalyst Matrix +item.rune_jera.name=Multiplicative Catalyst Matrix +item.rune_thurisaz.name=Additive Catalyst Matrix + +item.ams_catalyst_blank.name=Blanker Reaktionskatalysator +item.ams_catalyst_aluminium.name=Aluminium-Reaktionskatalysator +item.ams_catalyst_beryllium.name=Beryllium-Reaktionskatalysator +item.ams_catalyst_caesium.name=Caeseium-Reaktionskatalysator +item.ams_catalyst_cerium.name=Cer-Reaktionskatalysator +item.ams_catalyst_cobalt.name=Cobalt-Reaktionskatalysator +item.ams_catalyst_copper.name=Kupfer-Reaktionskatalysator +item.ams_catalyst_euphemium.name=Euphemium-Reaktionskatalysator +item.ams_catalyst_iron.name=Eisen-Reaktionskatalysator +item.ams_catalyst_lithium.name=Lithium-Reaktionskatalysator +item.ams_catalyst_niobium.name=Niob-Reaktionskatalysator +item.ams_catalyst_strontium.name=Strontium-Reaktionskatalysator +item.ams_catalyst_thorium.name=Thorium-Reaktionskatalysator +item.ams_catalyst_tungsten.name=Wolfram-Reaktionskatalysator + +item.ams_focus_blank.name=Blanker Stabilisierungsfokus +item.ams_focus_limiter.name=Beschränkender Stabilisierungsfokus +item.ams_focus_booster.name=Verstärkender Stabilisierungsfokus + item.crystal_energy.name=Energiekristall item.pellet_coolant.name=Kühlcluster diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 33ef14469..bd31915f4 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -119,6 +119,7 @@ death.attack.teleporter=%1$s was teleported into nothingness. death.attack.blackhole=%1$s was spaghettified. death.attack.blender=%1$s was chopped in small, bite-sized pieces. death.attack.meteorite=%1$s was hit by a falling rock from outer space. +death.attack.boxcar=%1$s was smushed by a falling boxcar. Oh well. item.redstone_sword.name=Redstone Sword item.big_sword.name=Great Sword @@ -186,6 +187,7 @@ tile.therm_endo.name=Endothermic Bomb tile.therm_exo.name=Exothermic Bomb tile.crashed_bomb.name=Dud +tile.boxcar.name=Boxcar tile.turret_light.name=Light Machine Gun Turret tile.turret_heavy.name=Heavy Machine Gun Turret @@ -398,6 +400,7 @@ item.pipes_steel.name=Steel Pipes item.drill_titanium.name=Titanium Drill item.bolt_tungsten.name=Tunsten Bolt item.bolt_compound.name=Reinforced Turbine Shaft +item.plate_polymer.name=Insulator item.ingot_australium.name=Australium Ingot item.ingot_weidanium.name=Weidanium Ingot @@ -415,8 +418,12 @@ item.nugget_verticium.name=Verticium Nugget item.ingot_desh.name=Desh Ingot item.nugget_desh.name=Desh Nugget item.powder_desh.name=Desh Powder -item.powder_desh_mix.name=Desh Mixture -item.powder_nitan_mix.name=Nitanium Mixture +item.powder_desh_mix.name=Desh Blend +item.powder_nitan_mix.name=Nitanium Blend +item.powder_spark_mix.name=Spark Blend +item.ingot_dineutronium.name=Dineutronium Ingot +item.powder_dineutronium.name=Dineutronium Powder +item.nugget_dineutronium.name=Dineutronium Nugget item.solid_fuel.name=Solid Fuel @@ -581,6 +588,9 @@ item.powder_niobium_tiny.name=Tiny Pile of Niobium Powder item.powder_cerium_tiny.name=Tiny Pile of Cerium Powder item.powder_lanthanium_tiny.name=Tiny Pile of Lanthanium Powder item.powder_actinium_tiny.name=Tiny Pile of Actinium Powder +item.powder_euphemium.name=Euphemium Powder +item.powder_meteorite.name=Meteorite Powder +item.powder_meteorite_tiny.name=Tiny Pile of Ḿeteorite Powder item.fragment_neodymium.name=Neodymium Fragment item.fragment_cobalt.name=Cobalt Fragment @@ -594,8 +604,12 @@ item.battery_generic.name=Battery item.battery_advanced.name=Advanced Battery item.battery_lithium.name=Lithium-Ion Battery item.battery_schrabidium.name=Schrabidium Battery +item.battery_spark.name=Spark Battery item.battery_creative.name=Infinite Battery +item.battery_su.name=SU-Battery +item.battery_su_l.name=Large SU-Battery + item.battery_red_cell.name=Redstone Power Cell item.battery_advanced_cell.name=Advanced Power Cell item.battery_lithium_cell.name=Lithium-Ion Power Cell @@ -608,6 +622,8 @@ item.battery_red_cell_24.name=24-Fold Redstone Power Cell item.battery_advanced_cell_12.name=Twelvefold Advanced Power Cell item.battery_lithium_cell_6.name=Sixfold Lithium-Ion Power Cell item.battery_schrabidium_cell_4.name=Quadruple Schrabidium Power Cell +item.battery_spark_cell_6.name=Spark Power Cell +item.battery_spark_cell_25.name=Spark Arcane Car Battery item.upgrade_template.name=Machine Upgrade Piece Template item.upgrade_speed_1.name=Red Machine Upgrade Mk.I @@ -712,7 +728,7 @@ item.fluid_barrel_empty.name=Empty Fluid Barrel item.fluid_barrel_full.name=Fluid Barrel: item.fluid_barrel_infinite.name=Infinite Fluid Barrel -item.rod_empty.name=Emty Rod +item.rod_empty.name=Empty Rod item.rod_uranium.name=Uranium Rod item.rod_u235.name=U235 Rod item.rod_u238.name=U238 Rod @@ -723,7 +739,7 @@ item.rod_pu240.name=Pu240 Rod item.rod_neptunium.name=Neptunium Rod item.rod_lead.name=Lead Rod item.rod_schrabidium.name=Schrabidium Rod -item.rod_astatine.name=Euphemium Rod +item.rod_euphemium.name=Euphemium Rod item.rod_australium.name=Australium Rod item.rod_weidanium.name=Weidanium Rod item.rod_reiium.name=Reiium Rod @@ -731,8 +747,8 @@ item.rod_unobtainium.name=Unobtainium Rod item.rod_daffergon.name=Daffergon Rod item.rod_verticium.name=Verticium Rod -item.rod_dual_empty.name=Emty Dual Rod -item.rod_dual_uranium.name=Uranium Dual Fl Rod +item.rod_dual_empty.name=Empty Dual Rod +item.rod_dual_uranium.name=Uranium Dual Fuel Rod item.rod_dual_u235.name=U235 Dual Rod item.rod_dual_u238.name=U238 Dual Rod item.rod_dual_plutonium.name=Plutonium Dual Rod @@ -743,7 +759,7 @@ item.rod_dual_neptunium.name=Neptunium Dual Rod item.rod_dual_lead.name=Lead Dual Rod item.rod_dual_schrabidium.name=Schrabidium Dual Rod -item.rod_quad_empty.name=Emty Quad Rod +item.rod_quad_empty.name=Empty Quad Rod item.rod_quad_uranium.name=Uranium Quad Rod item.rod_quad_u235.name=U235 Quad Rod item.rod_quad_u238.name=U238 Quad Rod @@ -915,6 +931,7 @@ item.gun_revolver_schrabidium.name=Schrabidium Revolver item.gun_revolver_cursed.name=Cursed Revolver item.gun_revolver_nightmare.name=Nightmare Revolver (Original) item.gun_revolver_nightmare2.name=Nightmare Revolver (Dark) +item.gun_revolver_pip.name=Lil' Pipsqueak item.gun_fatman.name=M42 Nuclear Catapult "Fat Man" item.gun_mirv.name=M42 Nuclear Catapult "Experimental MIRV" item.gun_bf.name=M42_2 Nuclear Catapult "Antimatter Launcher" @@ -944,6 +961,7 @@ item.gun_revolver_schrabidium_ammo.name=Schrabidium Bullet item.gun_revolver_cursed_ammo.name=Steel Bullet item.gun_revolver_nightmare_ammo.name=Nightmare Bullet item.gun_revolver_nightmare2_ammo.name=Laser Buckshot +item.gun_revolver_pip_ammo.name=Tainted Bullet 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. @@ -1045,16 +1063,16 @@ item.chopper_blades.name=Hunter Chopper Rotor Blades item.igniter.name=Igniter item.watch.name=Broken Pocket Watch -item.apple_astatine.name=Euphemium Apple -item.ingot_astatine.name=Euphemium Ingot -item.nugget_astatine.name=Euphemium Nugget -item.rod_quad_astatine.name=Burned Out Quad Schrabidium Fuel Rod +item.apple_euphemium.name=Euphemium Apple +item.ingot_euphemium.name=Euphemium Ingot +item.nugget_euphemium.name=Euphemium Nugget +item.rod_quad_euphemium.name=Burned Out Quad Schrabidium Fuel Rod item.plate_euphemium.name=Euphemium Compound Plate -item.astatine_helmet.name=Euphemium Helemt -item.astatine_plate.name=Euphemium Chestplate -item.astatine_legs.name=Euphemium Leggings -item.astatine_boots.name=Euphemiums Boots +item.euphemium_helmet.name=Euphemium Helemt +item.euphemium_plate.name=Euphemium Chestplate +item.euphemium_legs.name=Euphemium Leggings +item.euphemium_boots.name=Euphemiums Boots item.schrabidium_helmet.name=Schrabidium Helmet item.schrabidium_plate.name=Schrabidium Chestpate @@ -1281,6 +1299,7 @@ item.bottle_empty.name=Empty Bomb-Shaped Bottle item.bottle_nuka.name=Bottle of Nuka Cola item.bottle_cherry.name=Bottle of Nuka Cherry item.bottle_quantum.name=Bottle of Nuka Cola Quantum +item.bottle_sparkle.name=Bottle of S~Cola item.bottle2_empty.name=Empty Bottle item.bottle2_korl.name=Korl item.bottle2_fritz.name=Fritz Cola @@ -1289,6 +1308,7 @@ item.bottle2_fritz_special.name=The First Fritz Cola item.chocolate_milk.name=Chocolate Milk item.cap_nuka.name=Nuka Cola Bottle Cap item.cap_quantum.name=Nuka Cola Quantum Bottle Cap +item.cap_sparkle.name=S~Cola Bottle Cap item.cap_korl.name=Korl Bottle Cap item.cap_fritz.name=Fritz Cola Bottle Cap item.ring_pull.name=Ring Pull @@ -1335,6 +1355,32 @@ item.part_carbon.name=Box of Carbon Dust item.part_copper.name=Box of Copper Dust item.part_plutonium.name=Box of Plutonium Dust +item.rune_blank.name=Blank Catalyst Matrix +item.rune_isa.name=Cool Catalyst Matrix +item.rune_dagaz.name=Balanced Catalyst Matrix +item.rune_hagalaz.name=Rough Catalyst Matrix +item.rune_jera.name=Multiplicative Catalyst Matrix +item.rune_thurisaz.name=Additive Catalyst Matrix + +item.ams_catalyst_blank.name=Blank Reaction Catalyst +item.ams_catalyst_aluminium.name=Aluminium Reaction Catalyst +item.ams_catalyst_beryllium.name=Beryllium Reaction Catalyst +item.ams_catalyst_caesium.name=Caeseium Reaction Catalyst +item.ams_catalyst_cerium.name=Cerium Reaction Catalyst +item.ams_catalyst_cobalt.name=Cobalt Reaction Catalyst +item.ams_catalyst_copper.name=Copper Reaction Catalyst +item.ams_catalyst_euphemium.name=Euphemium Reaction Catalyst +item.ams_catalyst_iron.name=Iron Reaction Catalyst +item.ams_catalyst_lithium.name=Lithium Reaction Catalyst +item.ams_catalyst_niobium.name=Niobium Reaction Catalyst +item.ams_catalyst_strontium.name=Strontium Reaction Catalyst +item.ams_catalyst_thorium.name=Thorium Reaction Catalyst +item.ams_catalyst_tungsten.name=Tungsten Reaction Catalyst + +item.ams_focus_blank.name=Blank Stabilizer Focus +item.ams_focus_limiter.name=Limiting Stabilizer Focus +item.ams_focus_booster.name=Boosting Stabilizer Focus + item.crystal_energy.name=Energy Crystal item.pellet_coolant.name=Coolant Cluster diff --git a/assets/hbm/models/boxcar.obj b/assets/hbm/models/boxcar.obj new file mode 100644 index 000000000..e44dd93fe --- /dev/null +++ b/assets/hbm/models/boxcar.obj @@ -0,0 +1,4477 @@ +# Blender v2.76 (sub 0) OBJ File: 'boxcar.blend' +# www.blender.org +o Cube_Cube.001 +v 1.000000 0.750000 4.000000 +v 1.000000 2.750000 4.000000 +v 1.000000 0.750000 -4.000000 +v 1.000000 2.750000 -4.000000 +v 1.000000 0.750000 3.000000 +v 1.000000 2.750000 3.000000 +v 1.000000 0.750000 2.000000 +v 1.000000 2.750000 2.000000 +v 1.000000 0.750000 1.000000 +v 1.000000 2.750000 1.000000 +v 1.000000 0.750000 0.000000 +v 1.000000 2.750000 0.000000 +v 1.000000 0.750000 -1.000000 +v 1.000000 2.750000 -1.000000 +v 1.000000 0.750000 -2.000000 +v 1.000000 2.750000 -2.000000 +v 1.000000 0.750000 -3.000000 +v 1.000000 2.750000 -3.000000 +v -1.000000 0.750000 2.000000 +v -1.000000 2.750000 3.000000 +v -1.000000 0.750000 3.000000 +v -1.000000 2.750000 -4.000000 +v -1.000000 0.750000 -4.000000 +v -1.000000 2.750000 4.000000 +v -1.000000 0.750000 4.000000 +v 1.000000 0.850000 1.950000 +v 1.000000 0.850000 1.050000 +v 1.000000 2.650000 1.050000 +v 1.000000 2.650000 1.950000 +v 1.000000 0.850000 0.950000 +v 1.000000 2.650000 0.950000 +v 1.000000 0.850000 2.950000 +v 1.000000 0.850000 2.050000 +v 1.000000 2.650000 2.050000 +v 1.000000 2.650000 2.950000 +v 1.000000 0.850000 3.950000 +v 1.000000 0.850000 3.050000 +v 1.000000 2.650000 3.050000 +v 1.000000 2.650000 3.950000 +v 1.000000 0.850000 -0.950000 +v 1.000000 2.650000 -0.950000 +v 1.000000 0.850000 -1.050000 +v 1.000000 0.850000 -1.950000 +v 1.000000 2.650000 -1.950000 +v 1.000000 2.650000 -1.050000 +v 1.000000 0.850000 -2.050000 +v 1.000000 0.850000 -2.950000 +v 1.000000 2.650000 -2.950000 +v 1.000000 2.650000 -2.050000 +v 1.000000 0.850000 -3.950000 +v 1.000000 2.650000 -3.950000 +v 1.000000 2.650000 -3.050000 +v 1.000000 0.850000 -3.050000 +v -1.000000 2.750000 2.000000 +v -1.000000 0.750000 1.000000 +v -1.000000 2.750000 1.000000 +v -1.000000 0.750000 0.000000 +v -1.000000 2.750000 0.000000 +v -1.000000 0.750000 -1.000000 +v -1.000000 2.750000 -1.000000 +v -1.000000 0.750000 -2.000000 +v -1.000000 2.750000 -2.000000 +v -1.000000 0.750000 -3.000000 +v -1.000000 2.750000 -3.000000 +v -1.000000 0.850000 1.950000 +v -1.000000 0.850000 1.050000 +v -1.000000 2.650000 1.050000 +v -1.000000 2.650000 1.950000 +v -1.000000 0.850000 0.950000 +v -1.000000 0.850000 0.050000 +v -1.000000 2.650000 0.050000 +v -1.000000 2.650000 0.950000 +v -1.000000 0.850000 2.950000 +v -1.000000 0.850000 2.050000 +v -1.000000 2.650000 2.050000 +v -1.000000 2.650000 2.950000 +v -1.000000 0.850000 3.950000 +v -1.000000 0.850000 3.050000 +v -1.000000 2.650000 3.050000 +v -1.000000 2.650000 3.950000 +v -1.000000 0.850000 -0.050000 +v -1.000000 0.850000 -0.950000 +v -1.000000 2.650000 -0.950000 +v -1.000000 2.650000 -0.050000 +v -1.000000 0.850000 -1.050000 +v -1.000000 0.850000 -1.950000 +v -1.000000 2.650000 -1.950000 +v -1.000000 2.650000 -1.050000 +v -1.000000 0.850000 -2.050000 +v -1.000000 0.850000 -2.950000 +v -1.000000 2.650000 -2.950000 +v -1.000000 2.650000 -2.050000 +v -1.000000 0.850000 -3.950000 +v -1.000000 2.650000 -3.950000 +v -1.000000 2.650000 -3.050000 +v -1.000000 0.850000 -3.050000 +v -0.900000 0.850000 0.950000 +v -0.900000 2.650000 0.950000 +v -0.900000 2.650000 0.050000 +v -0.900000 0.850000 0.050000 +v -0.900000 0.850000 1.950000 +v -0.900000 2.650000 1.950000 +v -0.900000 2.650000 1.050000 +v -0.900000 0.850000 1.050000 +v -0.900000 0.850000 2.950000 +v -0.900000 2.650000 2.950000 +v -0.900000 2.650000 2.050000 +v -0.900000 0.850000 2.050000 +v 0.900000 0.850000 1.950000 +v 0.900000 0.850000 1.050000 +v 0.900000 2.650000 1.050000 +v 0.900000 2.650000 1.950000 +v -0.900000 0.850000 -0.050000 +v -0.900000 2.650000 -0.050000 +v -0.900000 2.650000 -0.950000 +v -0.900000 0.850000 -0.950000 +v 0.900000 0.850000 2.950000 +v 0.900000 0.850000 2.050000 +v 0.900000 2.650000 2.050000 +v 0.900000 2.650000 2.950000 +v 0.900000 0.850000 3.950000 +v 0.900000 0.850000 3.050000 +v 0.900000 2.650000 3.050000 +v 0.900000 2.650000 3.950000 +v -0.900000 0.850000 3.950000 +v -0.900000 2.650000 3.950000 +v -0.900000 2.650000 3.050000 +v -0.900000 0.850000 3.050000 +v 0.900000 0.850000 -1.050000 +v 0.900000 0.850000 -1.950000 +v 0.900000 2.650000 -1.950000 +v 0.900000 2.650000 -1.050000 +v 0.900000 0.850000 -2.050000 +v 0.900000 0.850000 -2.950000 +v 0.900000 2.650000 -2.950000 +v 0.900000 2.650000 -2.050000 +v 0.900000 0.850000 -3.950000 +v 0.900000 2.650000 -3.950000 +v 0.900000 2.650000 -3.050000 +v 0.900000 0.850000 -3.050000 +v -0.900000 0.850000 -1.050000 +v -0.900000 2.650000 -1.050000 +v -0.900000 2.650000 -1.950000 +v -0.900000 0.850000 -1.950000 +v -0.900000 0.850000 -2.050000 +v -0.900000 2.650000 -2.050000 +v -0.900000 2.650000 -2.950000 +v -0.900000 0.850000 -2.950000 +v -0.900000 0.850000 -3.950000 +v -0.900000 0.850000 -3.050000 +v -0.900000 2.650000 -3.050000 +v -0.900000 2.650000 -3.950000 +v 1.100000 0.850000 0.950000 +v 1.100000 2.650000 0.950000 +v 1.100000 2.650000 -0.950000 +v 1.100000 0.850000 -0.950000 +v 1.150000 0.775000 1.000000 +v 1.150000 0.850000 1.000000 +v 1.000000 0.775000 1.000000 +v 1.000000 2.650000 1.000000 +v 1.150000 2.725000 1.000000 +v 1.150000 2.650000 1.000000 +v 1.000000 2.725000 1.000000 +v 1.000000 0.850000 1.000000 +v 1.000000 0.775000 -3.000000 +v 1.150000 0.775000 -3.000000 +v 1.000000 0.850000 -3.000000 +v 1.150000 0.850000 -3.000000 +v 1.000000 2.725000 -3.000000 +v 1.150000 2.725000 -3.000000 +v 1.150000 2.650000 -3.000000 +v 1.000000 2.650000 -3.000000 +v 1.100000 1.750000 0.950000 +v 1.100000 1.750000 -0.950000 +v 1.100000 2.200000 0.950000 +v 1.100000 2.200000 -0.950000 +v 1.100000 1.300000 0.950000 +v 1.100000 1.300000 -0.950000 +v 1.100000 1.700000 -0.900000 +v 1.100000 1.700000 0.900000 +v 1.100000 1.350000 0.900000 +v 1.100000 1.350000 -0.900000 +v 1.100000 2.600000 -0.900000 +v 1.100000 2.600000 0.900000 +v 1.100000 2.250000 0.900000 +v 1.100000 2.250000 -0.900000 +v 1.100000 0.900000 -0.900000 +v 1.100000 1.250000 -0.900000 +v 1.100000 1.250000 0.900000 +v 1.100000 0.900000 0.900000 +v 1.100000 1.810000 -0.900000 +v 1.100000 2.150000 -0.900000 +v 1.100000 2.150000 0.900000 +v 1.100000 1.810000 0.900000 +v 1.050000 1.700000 -0.900000 +v 1.050000 1.700000 0.900000 +v 1.050000 1.350000 0.900000 +v 1.050000 1.350000 -0.900000 +v 1.050000 2.600000 -0.900000 +v 1.050000 2.600000 0.900000 +v 1.050000 2.250000 0.900000 +v 1.050000 2.250000 -0.900000 +v 1.050000 0.900000 -0.900000 +v 1.050000 1.250000 -0.900000 +v 1.050000 1.250000 0.900000 +v 1.050000 0.900000 0.900000 +v 1.050000 1.810000 -0.900000 +v 1.050000 2.150000 -0.900000 +v 1.050000 2.150000 0.900000 +v 1.050000 1.810000 0.900000 +v 1.000000 2.750000 3.500000 +v 1.000000 2.750000 2.500000 +v 1.000000 2.750000 1.500000 +v 1.000000 2.750000 0.500000 +v 1.000000 2.750000 -0.500000 +v 1.000000 2.750000 -1.500000 +v 1.000000 2.750000 -2.500000 +v 0.000000 3.000000 3.500000 +v 0.000000 3.000000 2.500000 +v 0.000000 3.000000 1.500000 +v 0.000000 3.000000 0.500000 +v 0.000000 3.000000 -0.500000 +v 0.000000 3.000000 -1.500000 +v 0.000000 3.000000 -2.500000 +v -1.000000 2.750000 3.500000 +v -1.000000 2.750000 2.500000 +v -1.000000 2.750000 1.500000 +v -1.000000 2.750000 0.500000 +v -1.000000 2.750000 -0.500000 +v -1.000000 2.750000 -1.500000 +v -1.000000 2.750000 -2.500000 +v 1.000000 2.750000 -3.500000 +v 0.000000 3.000000 -3.500000 +v -1.000000 2.750000 -3.500000 +v 1.000000 2.750000 3.000000 +v 1.000000 2.750000 2.000000 +v 1.000000 2.750000 1.000000 +v 1.000000 2.750000 0.000000 +v 1.000000 2.750000 -1.000000 +v 1.000000 2.750000 -2.000000 +v 0.000000 3.000000 3.000000 +v 0.000000 3.000000 2.000000 +v 0.000000 3.000000 1.000000 +v 0.000000 3.000000 0.000000 +v 0.000000 3.000000 -1.000000 +v 0.000000 3.000000 -2.000000 +v -1.000000 2.750000 3.000000 +v -1.000000 2.750000 2.000000 +v -1.000000 2.750000 1.000000 +v -1.000000 2.750000 0.000000 +v -1.000000 2.750000 -1.000000 +v -1.000000 2.750000 -2.000000 +v 1.000000 2.750000 -3.000000 +v 0.000000 3.000000 -3.000000 +v -1.000000 2.750000 -3.000000 +v 0.000000 3.000000 4.000000 +v 0.000000 3.000000 -4.000000 +v 0.000000 2.875000 4.000000 +v 0.000000 2.875000 -4.000000 +v -0.125000 2.775000 4.125000 +v -0.125000 3.025000 4.125000 +v -0.125000 2.775000 -4.125000 +v -0.125000 3.025000 -4.125000 +v 0.125000 2.775000 4.125000 +v 0.125000 3.025000 4.125000 +v 0.125000 2.775000 -4.125000 +v 0.125000 3.025000 -4.125000 +v 0.550000 1.275000 -4.450000 +v 0.550000 1.275000 -4.200000 +v 0.673744 1.223744 -4.450000 +v 0.673744 1.223744 -4.200000 +v 0.725000 1.100000 -4.450000 +v 0.725000 1.100000 -4.200000 +v 0.673744 0.976256 -4.450000 +v 0.673744 0.976256 -4.200000 +v 0.550000 0.925000 -4.450000 +v 0.550000 0.925000 -4.200000 +v 0.426256 0.976256 -4.450000 +v 0.426256 0.976256 -4.200000 +v 0.375000 1.100000 -4.450000 +v 0.375000 1.100000 -4.200000 +v 0.426256 1.223744 -4.450000 +v 0.426256 1.223744 -4.200000 +v 0.550000 1.362500 -4.450000 +v 0.735615 1.285615 -4.450000 +v 0.812500 1.100000 -4.450000 +v 0.735615 0.914384 -4.450000 +v 0.550000 0.837500 -4.450000 +v 0.364384 0.914385 -4.450000 +v 0.287500 1.100000 -4.450000 +v 0.364384 1.285615 -4.450000 +v 0.550000 1.362500 -4.550000 +v 0.735615 1.285615 -4.550000 +v 0.812500 1.100000 -4.550000 +v 0.735615 0.914384 -4.550000 +v 0.550000 0.837500 -4.550000 +v 0.364384 0.914384 -4.550000 +v 0.287500 1.100000 -4.550000 +v 0.364384 1.285615 -4.550000 +v -0.550000 1.275000 -4.450000 +v -0.550000 1.275000 -4.200000 +v -0.426256 1.223744 -4.450000 +v -0.426256 1.223744 -4.200000 +v -0.375000 1.100000 -4.450000 +v -0.375000 1.100000 -4.200000 +v -0.426256 0.976256 -4.450000 +v -0.426256 0.976256 -4.200000 +v -0.550000 0.925000 -4.450000 +v -0.550000 0.925000 -4.200000 +v -0.673744 0.976256 -4.450000 +v -0.673744 0.976256 -4.200000 +v -0.725000 1.100000 -4.450000 +v -0.725000 1.100000 -4.200000 +v -0.673744 1.223744 -4.450000 +v -0.673744 1.223744 -4.200000 +v -0.550000 1.362500 -4.450000 +v -0.364385 1.285615 -4.450000 +v -0.287500 1.100000 -4.450000 +v -0.364385 0.914384 -4.450000 +v -0.550000 0.837500 -4.450000 +v -0.735616 0.914385 -4.450000 +v -0.812500 1.100000 -4.450000 +v -0.735616 1.285615 -4.450000 +v -0.550000 1.362500 -4.550000 +v -0.364385 1.285615 -4.550000 +v -0.287500 1.100000 -4.550000 +v -0.364385 0.914384 -4.550000 +v -0.550000 0.837500 -4.550000 +v -0.735616 0.914384 -4.550000 +v -0.812500 1.100000 -4.550000 +v -0.735616 1.285615 -4.550000 +v -0.975000 0.775000 -4.000000 +v -0.975000 1.425000 -4.000000 +v -0.975000 0.775000 -4.200000 +v -0.975000 1.425000 -4.200000 +v 0.975000 0.775000 -4.000000 +v 0.975000 1.425000 -4.000000 +v 0.975000 0.775000 -4.200000 +v 0.975000 1.425000 -4.200000 +v 0.550000 1.275000 4.450000 +v 0.550000 1.275000 4.200000 +v 0.673744 1.223744 4.450000 +v 0.673744 1.223744 4.200000 +v 0.725000 1.100000 4.450000 +v 0.725000 1.100000 4.200000 +v 0.673744 0.976256 4.450000 +v 0.673744 0.976256 4.200000 +v 0.550000 0.925000 4.450000 +v 0.550000 0.925000 4.200000 +v 0.426256 0.976256 4.450000 +v 0.426256 0.976256 4.200000 +v 0.375000 1.100000 4.450000 +v 0.375000 1.100000 4.200000 +v 0.426256 1.223744 4.450000 +v 0.426256 1.223744 4.200000 +v 0.550000 1.362500 4.450000 +v 0.735615 1.285615 4.450000 +v 0.812500 1.100000 4.450000 +v 0.735615 0.914384 4.450000 +v 0.550000 0.837500 4.450000 +v 0.364384 0.914385 4.450000 +v 0.287500 1.100000 4.450000 +v 0.364384 1.285615 4.450000 +v 0.550000 1.362500 4.550000 +v 0.735615 1.285615 4.550000 +v 0.812500 1.100000 4.550000 +v 0.735615 0.914384 4.550000 +v 0.550000 0.837500 4.550000 +v 0.364384 0.914384 4.550000 +v 0.287500 1.100000 4.550000 +v 0.364384 1.285615 4.550000 +v -0.550000 1.275000 4.450000 +v -0.550000 1.275000 4.200000 +v -0.426256 1.223744 4.450000 +v -0.426256 1.223744 4.200000 +v -0.375000 1.100000 4.450000 +v -0.375000 1.100000 4.200000 +v -0.426256 0.976256 4.450000 +v -0.426256 0.976256 4.200000 +v -0.550000 0.925000 4.450000 +v -0.550000 0.925000 4.200000 +v -0.673744 0.976256 4.450000 +v -0.673744 0.976256 4.200000 +v -0.725000 1.100000 4.450000 +v -0.725000 1.100000 4.200000 +v -0.673744 1.223744 4.450000 +v -0.673744 1.223744 4.200000 +v -0.550000 1.362500 4.450000 +v -0.364385 1.285615 4.450000 +v -0.287500 1.100000 4.450000 +v -0.364385 0.914384 4.450000 +v -0.550000 0.837500 4.450000 +v -0.735616 0.914385 4.450000 +v -0.812500 1.100000 4.450000 +v -0.735616 1.285615 4.450000 +v -0.550000 1.362500 4.550000 +v -0.364385 1.285615 4.550000 +v -0.287500 1.100000 4.550000 +v -0.364385 0.914384 4.550000 +v -0.550000 0.837500 4.550000 +v -0.735616 0.914384 4.550000 +v -0.812500 1.100000 4.550000 +v -0.735616 1.285615 4.550000 +v -0.975000 0.775000 4.000000 +v -0.975000 1.425000 4.000000 +v -0.975000 0.775000 4.200000 +v -0.975000 1.425000 4.200000 +v 0.975000 0.775000 4.000000 +v 0.975000 1.425000 4.000000 +v 0.975000 0.775000 4.200000 +v 0.975000 1.425000 4.200000 +v 0.700000 0.375000 -3.625000 +v 0.700000 0.562500 -3.574759 +v 0.700000 0.699760 -3.437500 +v 0.700000 0.750000 -3.250000 +v 0.700000 0.699759 -3.062500 +v 0.700000 0.562500 -2.925241 +v 0.700000 0.375000 -2.875000 +v 0.700000 0.187500 -2.925241 +v 0.700000 0.050241 -3.062500 +v 0.700000 0.000000 -3.250000 +v 0.700000 0.050240 -3.437500 +v 0.700000 0.187500 -3.574759 +v 0.750000 0.562500 -3.574759 +v 0.750000 0.375000 -3.625000 +v 0.750000 0.699760 -3.437500 +v 0.750000 0.750000 -3.250000 +v 0.750000 0.699759 -3.062500 +v 0.750000 0.562500 -2.925241 +v 0.750000 0.375000 -2.875000 +v 0.750000 0.187500 -2.925241 +v 0.750000 0.050241 -3.062500 +v 0.750000 0.000000 -3.250000 +v 0.750000 0.050240 -3.437500 +v 0.750000 0.187500 -3.574759 +v 0.750000 0.506250 -3.477332 +v 0.750000 0.375000 -3.512500 +v 0.750000 0.602332 -3.381250 +v 0.750000 0.637500 -3.250000 +v 0.750000 0.602332 -3.118750 +v 0.750000 0.506250 -3.022668 +v 0.750000 0.375000 -2.987500 +v 0.750000 0.243750 -3.022668 +v 0.750000 0.147668 -3.118750 +v 0.750000 0.112500 -3.250000 +v 0.750000 0.147668 -3.381250 +v 0.750000 0.243750 -3.477332 +v 0.825000 0.506250 -3.477332 +v 0.825000 0.375000 -3.512500 +v 0.825000 0.602332 -3.381250 +v 0.825000 0.637500 -3.250000 +v 0.825000 0.602332 -3.118750 +v 0.825000 0.506250 -3.022668 +v 0.825000 0.375000 -2.987500 +v 0.825000 0.243750 -3.022668 +v 0.825000 0.147668 -3.118750 +v 0.825000 0.112500 -3.250000 +v 0.825000 0.147668 -3.381250 +v 0.825000 0.243750 -3.477332 +v -0.700000 0.375000 -3.625000 +v -0.700000 0.562500 -3.574759 +v -0.700000 0.699760 -3.437500 +v -0.700000 0.750000 -3.250000 +v -0.700000 0.699759 -3.062500 +v -0.700000 0.562500 -2.925241 +v -0.700000 0.375000 -2.875000 +v -0.700000 0.187500 -2.925241 +v -0.700000 0.050241 -3.062500 +v -0.700000 0.000000 -3.250000 +v -0.700000 0.050240 -3.437500 +v -0.700000 0.187500 -3.574759 +v -0.750000 0.562500 -3.574759 +v -0.750000 0.375000 -3.625000 +v -0.750000 0.699760 -3.437500 +v -0.750000 0.750000 -3.250000 +v -0.750000 0.699759 -3.062500 +v -0.750000 0.562500 -2.925241 +v -0.750000 0.375000 -2.875000 +v -0.750000 0.187500 -2.925241 +v -0.750000 0.050241 -3.062500 +v -0.750000 0.000000 -3.250000 +v -0.750000 0.050240 -3.437500 +v -0.750000 0.187500 -3.574759 +v -0.750000 0.506250 -3.477332 +v -0.750000 0.375000 -3.512500 +v -0.750000 0.602332 -3.381250 +v -0.750000 0.637500 -3.250000 +v -0.750000 0.602332 -3.118750 +v -0.750000 0.506250 -3.022668 +v -0.750000 0.375000 -2.987500 +v -0.750000 0.243750 -3.022668 +v -0.750000 0.147668 -3.118750 +v -0.750000 0.112500 -3.250000 +v -0.750000 0.147668 -3.381250 +v -0.750000 0.243750 -3.477332 +v -0.825000 0.506250 -3.477332 +v -0.825000 0.375000 -3.512500 +v -0.825000 0.602332 -3.381250 +v -0.825000 0.637500 -3.250000 +v -0.825000 0.602332 -3.118750 +v -0.825000 0.506250 -3.022668 +v -0.825000 0.375000 -2.987500 +v -0.825000 0.243750 -3.022668 +v -0.825000 0.147668 -3.118750 +v -0.825000 0.112500 -3.250000 +v -0.825000 0.147668 -3.381250 +v -0.825000 0.243750 -3.477332 +v 0.700000 0.440625 -3.363666 +v 0.700000 0.375000 -3.381250 +v 0.700000 0.488666 -3.315625 +v 0.700000 0.506250 -3.250000 +v 0.700000 0.488666 -3.184375 +v 0.700000 0.440625 -3.136334 +v 0.700000 0.375000 -3.118750 +v 0.700000 0.309375 -3.136334 +v 0.700000 0.261334 -3.184375 +v 0.700000 0.243750 -3.250000 +v 0.700000 0.261334 -3.315625 +v 0.700000 0.309375 -3.363666 +v -0.700000 0.440625 -3.363666 +v -0.700000 0.375000 -3.381250 +v -0.700000 0.488666 -3.315625 +v -0.700000 0.506250 -3.250000 +v -0.700000 0.488666 -3.184375 +v -0.700000 0.440625 -3.136334 +v -0.700000 0.375000 -3.118750 +v -0.700000 0.309375 -3.136334 +v -0.700000 0.261334 -3.184375 +v -0.700000 0.243750 -3.250000 +v -0.700000 0.261334 -3.315625 +v -0.700000 0.309375 -3.363666 +v -0.500000 0.200000 3.500000 +v -0.500000 0.750000 3.875000 +v -0.500000 0.200000 2.000000 +v -0.500000 0.750000 1.625000 +v 0.500000 0.200000 3.500000 +v 0.500000 0.750000 3.875000 +v 0.500000 0.200000 2.000000 +v 0.500000 0.750000 1.625000 +v -0.500000 0.200000 -2.000000 +v -0.500000 0.750000 -1.625000 +v -0.500000 0.200000 -3.500000 +v -0.500000 0.750000 -3.875000 +v 0.500000 0.200000 -2.000000 +v 0.500000 0.750000 -1.625000 +v 0.500000 0.200000 -3.500000 +v 0.500000 0.750000 -3.875000 +v 1.000000 0.500000 4.000000 +v 1.000000 0.500000 -4.000000 +v -1.000000 0.500000 -4.000000 +v -1.000000 0.500000 4.000000 +v 0.100000 0.450000 2.000000 +v 0.100000 0.550000 2.000000 +v 0.100000 0.450000 -2.000000 +v 0.100000 0.550000 -2.000000 +v 0.200000 0.450000 2.000000 +v 0.200000 0.550000 2.000000 +v 0.200000 0.450000 -2.000000 +v 0.200000 0.550000 -2.000000 +v -0.200000 0.450000 2.000000 +v -0.200000 0.550000 2.000000 +v -0.200000 0.450000 -2.000000 +v -0.200000 0.550000 -2.000000 +v -0.100000 0.450000 2.000000 +v -0.100000 0.550000 2.000000 +v -0.100000 0.450000 -2.000000 +v -0.100000 0.550000 -2.000000 +v 0.700000 0.375000 -2.625000 +v 0.700000 0.562500 -2.574759 +v 0.700000 0.699760 -2.437500 +v 0.700000 0.750000 -2.250000 +v 0.700000 0.699759 -2.062500 +v 0.700000 0.562500 -1.925241 +v 0.700000 0.375000 -1.875000 +v 0.700000 0.187500 -1.925241 +v 0.700000 0.050241 -2.062500 +v 0.700000 0.000000 -2.250000 +v 0.700000 0.050240 -2.437500 +v 0.700000 0.187500 -2.574759 +v 0.750000 0.562500 -2.574759 +v 0.750000 0.375000 -2.625000 +v 0.750000 0.699760 -2.437500 +v 0.750000 0.750000 -2.250000 +v 0.750000 0.699759 -2.062500 +v 0.750000 0.562500 -1.925241 +v 0.750000 0.375000 -1.875000 +v 0.750000 0.187500 -1.925241 +v 0.750000 0.050241 -2.062500 +v 0.750000 0.000000 -2.250000 +v 0.750000 0.050240 -2.437500 +v 0.750000 0.187500 -2.574759 +v 0.750000 0.506250 -2.477332 +v 0.750000 0.375000 -2.512500 +v 0.750000 0.602332 -2.381250 +v 0.750000 0.637500 -2.250000 +v 0.750000 0.602332 -2.118750 +v 0.750000 0.506250 -2.022668 +v 0.750000 0.375000 -1.987500 +v 0.750000 0.243750 -2.022668 +v 0.750000 0.147668 -2.118750 +v 0.750000 0.112500 -2.250000 +v 0.750000 0.147668 -2.381250 +v 0.750000 0.243750 -2.477332 +v 0.825000 0.506250 -2.477332 +v 0.825000 0.375000 -2.512500 +v 0.825000 0.602332 -2.381250 +v 0.825000 0.637500 -2.250000 +v 0.825000 0.602332 -2.118750 +v 0.825000 0.506250 -2.022668 +v 0.825000 0.375000 -1.987500 +v 0.825000 0.243750 -2.022668 +v 0.825000 0.147668 -2.118750 +v 0.825000 0.112500 -2.250000 +v 0.825000 0.147668 -2.381250 +v 0.825000 0.243750 -2.477332 +v -0.700000 0.375000 -2.625000 +v -0.700000 0.562500 -2.574759 +v -0.700000 0.699760 -2.437500 +v -0.700000 0.750000 -2.250000 +v -0.700000 0.699759 -2.062500 +v -0.700000 0.562500 -1.925241 +v -0.700000 0.375000 -1.875000 +v -0.700000 0.187500 -1.925241 +v -0.700000 0.050241 -2.062500 +v -0.700000 0.000000 -2.250000 +v -0.700000 0.050240 -2.437500 +v -0.700000 0.187500 -2.574759 +v -0.750000 0.562500 -2.574759 +v -0.750000 0.375000 -2.625000 +v -0.750000 0.699760 -2.437500 +v -0.750000 0.750000 -2.250000 +v -0.750000 0.699759 -2.062500 +v -0.750000 0.562500 -1.925241 +v -0.750000 0.375000 -1.875000 +v -0.750000 0.187500 -1.925241 +v -0.750000 0.050241 -2.062500 +v -0.750000 0.000000 -2.250000 +v -0.750000 0.050240 -2.437500 +v -0.750000 0.187500 -2.574759 +v -0.750000 0.506250 -2.477332 +v -0.750000 0.375000 -2.512500 +v -0.750000 0.602332 -2.381250 +v -0.750000 0.637500 -2.250000 +v -0.750000 0.602332 -2.118750 +v -0.750000 0.506250 -2.022668 +v -0.750000 0.375000 -1.987500 +v -0.750000 0.243750 -2.022668 +v -0.750000 0.147668 -2.118750 +v -0.750000 0.112500 -2.250000 +v -0.750000 0.147668 -2.381250 +v -0.750000 0.243750 -2.477332 +v -0.825000 0.506250 -2.477332 +v -0.825000 0.375000 -2.512500 +v -0.825000 0.602332 -2.381250 +v -0.825000 0.637500 -2.250000 +v -0.825000 0.602332 -2.118750 +v -0.825000 0.506250 -2.022668 +v -0.825000 0.375000 -1.987500 +v -0.825000 0.243750 -2.022668 +v -0.825000 0.147668 -2.118750 +v -0.825000 0.112500 -2.250000 +v -0.825000 0.147668 -2.381250 +v -0.825000 0.243750 -2.477332 +v 0.700000 0.440625 -2.363666 +v 0.700000 0.375000 -2.381250 +v 0.700000 0.488666 -2.315625 +v 0.700000 0.506250 -2.250000 +v 0.700000 0.488666 -2.184375 +v 0.700000 0.440625 -2.136334 +v 0.700000 0.375000 -2.118750 +v 0.700000 0.309375 -2.136334 +v 0.700000 0.261334 -2.184375 +v 0.700000 0.243750 -2.250000 +v 0.700000 0.261334 -2.315625 +v 0.700000 0.309375 -2.363666 +v -0.700000 0.440625 -2.363666 +v -0.700000 0.375000 -2.381250 +v -0.700000 0.488666 -2.315625 +v -0.700000 0.506250 -2.250000 +v -0.700000 0.488666 -2.184375 +v -0.700000 0.440625 -2.136334 +v -0.700000 0.375000 -2.118750 +v -0.700000 0.309375 -2.136334 +v -0.700000 0.261334 -2.184375 +v -0.700000 0.243750 -2.250000 +v -0.700000 0.261334 -2.315625 +v -0.700000 0.309375 -2.363666 +v 0.700000 0.375000 1.875000 +v 0.700000 0.562500 1.925241 +v 0.700000 0.699760 2.062500 +v 0.700000 0.750000 2.250000 +v 0.700000 0.699759 2.437500 +v 0.700000 0.562500 2.574759 +v 0.700000 0.375000 2.625000 +v 0.700000 0.187500 2.574759 +v 0.700000 0.050241 2.437500 +v 0.700000 0.000000 2.250000 +v 0.700000 0.050240 2.062500 +v 0.700000 0.187500 1.925241 +v 0.750000 0.562500 1.925241 +v 0.750000 0.375000 1.875000 +v 0.750000 0.699760 2.062500 +v 0.750000 0.750000 2.250000 +v 0.750000 0.699759 2.437500 +v 0.750000 0.562500 2.574759 +v 0.750000 0.375000 2.625000 +v 0.750000 0.187500 2.574759 +v 0.750000 0.050241 2.437500 +v 0.750000 0.000000 2.250000 +v 0.750000 0.050240 2.062500 +v 0.750000 0.187500 1.925241 +v 0.750000 0.506250 2.022668 +v 0.750000 0.375000 1.987500 +v 0.750000 0.602332 2.118750 +v 0.750000 0.637500 2.250000 +v 0.750000 0.602332 2.381250 +v 0.750000 0.506250 2.477332 +v 0.750000 0.375000 2.512500 +v 0.750000 0.243750 2.477332 +v 0.750000 0.147668 2.381250 +v 0.750000 0.112500 2.250000 +v 0.750000 0.147668 2.118750 +v 0.750000 0.243750 2.022668 +v 0.825000 0.506250 2.022668 +v 0.825000 0.375000 1.987500 +v 0.825000 0.602332 2.118750 +v 0.825000 0.637500 2.250000 +v 0.825000 0.602332 2.381250 +v 0.825000 0.506250 2.477332 +v 0.825000 0.375000 2.512500 +v 0.825000 0.243750 2.477332 +v 0.825000 0.147668 2.381250 +v 0.825000 0.112500 2.250000 +v 0.825000 0.147668 2.118750 +v 0.825000 0.243750 2.022668 +v -0.700000 0.375000 1.875000 +v -0.700000 0.562500 1.925241 +v -0.700000 0.699760 2.062500 +v -0.700000 0.750000 2.250000 +v -0.700000 0.699759 2.437500 +v -0.700000 0.562500 2.574759 +v -0.700000 0.375000 2.625000 +v -0.700000 0.187500 2.574759 +v -0.700000 0.050241 2.437500 +v -0.700000 0.000000 2.250000 +v -0.700000 0.050240 2.062500 +v -0.700000 0.187500 1.925241 +v -0.750000 0.562500 1.925241 +v -0.750000 0.375000 1.875000 +v -0.750000 0.699760 2.062500 +v -0.750000 0.750000 2.250000 +v -0.750000 0.699759 2.437500 +v -0.750000 0.562500 2.574759 +v -0.750000 0.375000 2.625000 +v -0.750000 0.187500 2.574759 +v -0.750000 0.050241 2.437500 +v -0.750000 0.000000 2.250000 +v -0.750000 0.050240 2.062500 +v -0.750000 0.187500 1.925241 +v -0.750000 0.506250 2.022668 +v -0.750000 0.375000 1.987500 +v -0.750000 0.602332 2.118750 +v -0.750000 0.637500 2.250000 +v -0.750000 0.602332 2.381250 +v -0.750000 0.506250 2.477332 +v -0.750000 0.375000 2.512500 +v -0.750000 0.243750 2.477332 +v -0.750000 0.147668 2.381250 +v -0.750000 0.112500 2.250000 +v -0.750000 0.147668 2.118750 +v -0.750000 0.243750 2.022668 +v -0.825000 0.506250 2.022668 +v -0.825000 0.375000 1.987500 +v -0.825000 0.602332 2.118750 +v -0.825000 0.637500 2.250000 +v -0.825000 0.602332 2.381250 +v -0.825000 0.506250 2.477332 +v -0.825000 0.375000 2.512500 +v -0.825000 0.243750 2.477332 +v -0.825000 0.147668 2.381250 +v -0.825000 0.112500 2.250000 +v -0.825000 0.147668 2.118750 +v -0.825000 0.243750 2.022668 +v 0.700000 0.440625 2.136334 +v 0.700000 0.375000 2.118750 +v 0.700000 0.488666 2.184375 +v 0.700000 0.506250 2.250000 +v 0.700000 0.488666 2.315625 +v 0.700000 0.440625 2.363666 +v 0.700000 0.375000 2.381250 +v 0.700000 0.309375 2.363666 +v 0.700000 0.261334 2.315625 +v 0.700000 0.243750 2.250000 +v 0.700000 0.261334 2.184375 +v 0.700000 0.309375 2.136334 +v -0.700000 0.440625 2.136334 +v -0.700000 0.375000 2.118750 +v -0.700000 0.488666 2.184375 +v -0.700000 0.506250 2.250000 +v -0.700000 0.488666 2.315625 +v -0.700000 0.440625 2.363666 +v -0.700000 0.375000 2.381250 +v -0.700000 0.309375 2.363666 +v -0.700000 0.261334 2.315625 +v -0.700000 0.243750 2.250000 +v -0.700000 0.261334 2.184375 +v -0.700000 0.309375 2.136334 +v 0.700000 0.375000 2.875000 +v 0.700000 0.562500 2.925241 +v 0.700000 0.699760 3.062500 +v 0.700000 0.750000 3.250000 +v 0.700000 0.699759 3.437500 +v 0.700000 0.562500 3.574759 +v 0.700000 0.375000 3.625000 +v 0.700000 0.187500 3.574759 +v 0.700000 0.050241 3.437500 +v 0.700000 0.000000 3.250000 +v 0.700000 0.050240 3.062500 +v 0.700000 0.187500 2.925241 +v 0.750000 0.562500 2.925241 +v 0.750000 0.375000 2.875000 +v 0.750000 0.699760 3.062500 +v 0.750000 0.750000 3.250000 +v 0.750000 0.699759 3.437500 +v 0.750000 0.562500 3.574759 +v 0.750000 0.375000 3.625000 +v 0.750000 0.187500 3.574759 +v 0.750000 0.050241 3.437500 +v 0.750000 0.000000 3.250000 +v 0.750000 0.050240 3.062500 +v 0.750000 0.187500 2.925241 +v 0.750000 0.506250 3.022668 +v 0.750000 0.375000 2.987500 +v 0.750000 0.602332 3.118750 +v 0.750000 0.637500 3.250000 +v 0.750000 0.602332 3.381250 +v 0.750000 0.506250 3.477332 +v 0.750000 0.375000 3.512500 +v 0.750000 0.243750 3.477332 +v 0.750000 0.147668 3.381250 +v 0.750000 0.112500 3.250000 +v 0.750000 0.147668 3.118750 +v 0.750000 0.243750 3.022668 +v 0.825000 0.506250 3.022668 +v 0.825000 0.375000 2.987500 +v 0.825000 0.602332 3.118750 +v 0.825000 0.637500 3.250000 +v 0.825000 0.602332 3.381250 +v 0.825000 0.506250 3.477332 +v 0.825000 0.375000 3.512500 +v 0.825000 0.243750 3.477332 +v 0.825000 0.147668 3.381250 +v 0.825000 0.112500 3.250000 +v 0.825000 0.147668 3.118750 +v 0.825000 0.243750 3.022668 +v -0.700000 0.375000 2.875000 +v -0.700000 0.562500 2.925241 +v -0.700000 0.699760 3.062500 +v -0.700000 0.750000 3.250000 +v -0.700000 0.699759 3.437500 +v -0.700000 0.562500 3.574759 +v -0.700000 0.375000 3.625000 +v -0.700000 0.187500 3.574759 +v -0.700000 0.050241 3.437500 +v -0.700000 0.000000 3.250000 +v -0.700000 0.050240 3.062500 +v -0.700000 0.187500 2.925241 +v -0.750000 0.562500 2.925241 +v -0.750000 0.375000 2.875000 +v -0.750000 0.699760 3.062500 +v -0.750000 0.750000 3.250000 +v -0.750000 0.699759 3.437500 +v -0.750000 0.562500 3.574759 +v -0.750000 0.375000 3.625000 +v -0.750000 0.187500 3.574759 +v -0.750000 0.050241 3.437500 +v -0.750000 0.000000 3.250000 +v -0.750000 0.050240 3.062500 +v -0.750000 0.187500 2.925241 +v -0.750000 0.506250 3.022668 +v -0.750000 0.375000 2.987500 +v -0.750000 0.602332 3.118750 +v -0.750000 0.637500 3.250000 +v -0.750000 0.602332 3.381250 +v -0.750000 0.506250 3.477332 +v -0.750000 0.375000 3.512500 +v -0.750000 0.243750 3.477332 +v -0.750000 0.147668 3.381250 +v -0.750000 0.112500 3.250000 +v -0.750000 0.147668 3.118750 +v -0.750000 0.243750 3.022668 +v -0.825000 0.506250 3.022668 +v -0.825000 0.375000 2.987500 +v -0.825000 0.602332 3.118750 +v -0.825000 0.637500 3.250000 +v -0.825000 0.602332 3.381250 +v -0.825000 0.506250 3.477332 +v -0.825000 0.375000 3.512500 +v -0.825000 0.243750 3.477332 +v -0.825000 0.147668 3.381250 +v -0.825000 0.112500 3.250000 +v -0.825000 0.147668 3.118750 +v -0.825000 0.243750 3.022668 +v 0.700000 0.440625 3.136334 +v 0.700000 0.375000 3.118750 +v 0.700000 0.488666 3.184375 +v 0.700000 0.506250 3.250000 +v 0.700000 0.488666 3.315625 +v 0.700000 0.440625 3.363666 +v 0.700000 0.375000 3.381250 +v 0.700000 0.309375 3.363666 +v 0.700000 0.261334 3.315625 +v 0.700000 0.243750 3.250000 +v 0.700000 0.261334 3.184375 +v 0.700000 0.309375 3.136334 +v -0.700000 0.440625 3.136334 +v -0.700000 0.375000 3.118750 +v -0.700000 0.488666 3.184375 +v -0.700000 0.506250 3.250000 +v -0.700000 0.488666 3.315625 +v -0.700000 0.440625 3.363666 +v -0.700000 0.375000 3.381250 +v -0.700000 0.309375 3.363666 +v -0.700000 0.261334 3.315625 +v -0.700000 0.243750 3.250000 +v -0.700000 0.261334 3.184375 +v -0.700000 0.309375 3.136334 +v -1.000000 0.500000 -3.000000 +v -1.000000 0.500000 -2.000000 +v -1.000000 0.500000 -1.000000 +v -1.000000 0.500000 0.000000 +v -1.000000 0.500000 1.000000 +v -1.000000 0.500000 2.000000 +v -1.000000 0.500000 3.000000 +v 1.000000 0.500000 3.000000 +v 1.000000 0.500000 2.000000 +v 1.000000 0.500000 1.000000 +v 1.000000 0.500000 0.000000 +v 1.000000 0.500000 -1.000000 +v 1.000000 0.500000 -2.000000 +v 1.000000 0.500000 -3.000000 +vt 0.015179 0.024143 +vt 0.015179 0.131714 +vt 0.012190 0.137690 +vt 0.582916 0.131714 +vt 0.582916 0.024143 +vt 0.585904 0.018167 +vt 0.089881 0.143666 +vt 0.092869 0.137690 +vt 0.146654 0.137690 +vt 0.293071 0.012190 +vt 0.290083 0.018166 +vt 0.236297 0.018166 +vt 0.233309 0.143666 +vt 0.236297 0.137690 +vt 0.290083 0.137690 +vt 0.221357 0.012190 +vt 0.218369 0.018166 +vt 0.164583 0.018166 +vt 0.161595 0.143666 +vt 0.164583 0.137690 +vt 0.218369 0.137690 +vt 0.149643 0.012190 +vt 0.146654 0.018166 +vt 0.092869 0.018166 +vt 0.810323 0.540928 +vt 0.810323 0.660451 +vt 0.750562 0.667921 +vt 0.460880 0.546904 +vt 0.407094 0.546904 +vt 0.404106 0.540928 +vt 0.364785 0.012190 +vt 0.361797 0.018166 +vt 0.308012 0.018166 +vt 0.407095 0.666427 +vt 0.460880 0.666427 +vt 0.463868 0.672403 +vt 0.517178 0.024143 +vt 0.517178 0.131714 +vt 0.511202 0.131714 +vt 0.305023 0.143666 +vt 0.308012 0.137690 +vt 0.361797 0.137690 +vt 0.389166 0.546904 +vt 0.335380 0.546904 +vt 0.332392 0.540928 +vt 0.077928 0.012190 +vt 0.074940 0.018166 +vt 0.021155 0.018166 +vt 0.335380 0.666427 +vt 0.389166 0.666427 +vt 0.392154 0.672403 +vt 0.018167 0.143666 +vt 0.021155 0.137690 +vt 0.074940 0.137690 +vt 0.177011 0.710231 +vt 0.177011 0.705748 +vt 0.185975 0.705748 +vt 0.317452 0.546904 +vt 0.263666 0.546904 +vt 0.260678 0.540928 +vt 0.263666 0.666427 +vt 0.317452 0.666427 +vt 0.320440 0.672403 +vt 0.257690 0.552880 +vt 0.257690 0.660451 +vt 0.254702 0.666427 +vt 0.155619 0.552880 +vt 0.161595 0.660451 +vt 0.155618 0.660451 +vt 0.083905 0.552880 +vt 0.089880 0.660451 +vt 0.083904 0.660451 +vt 0.077928 0.546904 +vt 0.024143 0.546904 +vt 0.021155 0.540928 +vt 0.012190 0.552880 +vt 0.018167 0.552880 +vt 0.012190 0.660451 +vt 0.024143 0.666427 +vt 0.077928 0.666427 +vt 0.080916 0.672403 +vt 0.149642 0.546904 +vt 0.095857 0.546904 +vt 0.092869 0.540928 +vt 0.095857 0.666427 +vt 0.149642 0.666427 +vt 0.152630 0.672403 +vt 0.401118 0.660451 +vt 0.395142 0.552880 +vt 0.401118 0.552880 +vt 0.648587 0.717698 +vt 0.648587 0.690808 +vt 0.654563 0.690808 +vt 0.227333 0.660451 +vt 0.227333 0.552880 +vt 0.230321 0.546904 +vt 0.167571 0.666427 +vt 0.221356 0.666427 +vt 0.224344 0.672404 +vt 0.329404 0.660451 +vt 0.323428 0.552880 +vt 0.329404 0.552880 +vt 0.221357 0.546904 +vt 0.167571 0.546904 +vt 0.164583 0.540928 +vt 0.445464 0.024143 +vt 0.445464 0.131714 +vt 0.439487 0.131714 +vt 0.376738 0.143666 +vt 0.379726 0.137690 +vt 0.433511 0.137690 +vt 0.373750 0.024143 +vt 0.373750 0.131714 +vt 0.367773 0.131714 +vt 0.436499 0.012190 +vt 0.433511 0.018166 +vt 0.379726 0.018166 +vt 0.302035 0.024143 +vt 0.302035 0.131714 +vt 0.296059 0.131714 +vt 0.128725 0.941198 +vt 0.131713 0.947174 +vt 0.071952 0.947174 +vt 0.448452 0.143666 +vt 0.451440 0.137690 +vt 0.505225 0.137690 +vt 0.230321 0.024143 +vt 0.230321 0.131714 +vt 0.224345 0.131714 +vt 0.508214 0.012190 +vt 0.505225 0.018166 +vt 0.451440 0.018166 +vt 0.152631 0.131714 +vt 0.152631 0.024143 +vt 0.158607 0.024143 +vt 0.676019 0.511046 +vt 0.562472 0.511046 +vt 0.619245 0.505070 +vt 0.579928 0.012190 +vt 0.576940 0.018166 +vt 0.523154 0.018166 +vt 0.080916 0.131714 +vt 0.080917 0.024143 +vt 0.086893 0.024143 +vt 0.520166 0.143666 +vt 0.523154 0.137690 +vt 0.576940 0.137690 +vt 0.624207 0.750569 +vt 0.616736 0.810331 +vt 0.497213 0.810331 +vt 0.251236 0.168046 +vt 0.310998 0.168046 +vt 0.490283 0.228273 +vt 0.370760 0.312881 +vt 0.370761 0.432404 +vt 0.310999 0.432404 +vt 0.236297 0.024143 +vt 0.290083 0.024143 +vt 0.290083 0.131714 +vt 0.236297 0.131714 +vt 0.296059 0.024143 +vt 0.164583 0.024143 +vt 0.218369 0.024143 +vt 0.218369 0.131714 +vt 0.164583 0.131714 +vt 0.158607 0.131714 +vt 0.224345 0.024143 +vt 0.092869 0.024143 +vt 0.146654 0.024143 +vt 0.146654 0.131714 +vt 0.092869 0.131714 +vt 0.086893 0.131714 +vt 0.460880 0.552880 +vt 0.460880 0.660451 +vt 0.407095 0.660451 +vt 0.407094 0.552880 +vt 0.466856 0.552880 +vt 0.308012 0.024143 +vt 0.361797 0.024143 +vt 0.361797 0.131714 +vt 0.308012 0.131714 +vt 0.367773 0.024143 +vt 0.389166 0.552880 +vt 0.389166 0.660451 +vt 0.335380 0.660451 +vt 0.335380 0.552880 +vt 0.317452 0.552880 +vt 0.317452 0.660451 +vt 0.263666 0.660451 +vt 0.263666 0.552880 +vt 0.021155 0.024143 +vt 0.074940 0.024143 +vt 0.074940 0.131714 +vt 0.021155 0.131714 +vt 0.077928 0.552880 +vt 0.077928 0.660451 +vt 0.024143 0.660451 +vt 0.024143 0.552880 +vt 0.018166 0.660451 +vt 0.149642 0.552880 +vt 0.149642 0.660451 +vt 0.095857 0.660451 +vt 0.095857 0.552880 +vt 0.221356 0.660451 +vt 0.167571 0.660451 +vt 0.167571 0.552880 +vt 0.221357 0.552880 +vt 0.379726 0.024143 +vt 0.433511 0.024143 +vt 0.433511 0.131714 +vt 0.379726 0.131714 +vt 0.439488 0.024143 +vt 0.451440 0.024143 +vt 0.505225 0.024143 +vt 0.505225 0.131714 +vt 0.451440 0.131714 +vt 0.511202 0.024143 +vt 0.523154 0.131714 +vt 0.523154 0.024143 +vt 0.576940 0.024143 +vt 0.576940 0.131714 +vt 0.472832 0.552880 +vt 0.466856 0.660451 +vt 0.177011 0.757022 +vt 0.177011 0.752540 +vt 0.185975 0.752540 +vt 0.425025 0.705749 +vt 0.433987 0.705749 +vt 0.433987 0.710230 +vt 0.425025 0.752541 +vt 0.433987 0.752541 +vt 0.433987 0.757022 +vt 0.185975 0.696784 +vt 0.425025 0.696785 +vt 0.185975 0.743576 +vt 0.425025 0.743577 +vt 0.425025 0.757022 +vt 0.185975 0.710231 +vt 0.425025 0.710230 +vt 0.425025 0.719195 +vt 0.185975 0.757022 +vt 0.425025 0.765986 +vt 0.464344 0.723686 +vt 0.464344 0.750577 +vt 0.458368 0.696784 +vt 0.012190 0.916818 +vt 0.071952 0.901877 +vt 0.131714 0.916818 +vt 0.616261 0.074940 +vt 0.723832 0.074940 +vt 0.726820 0.077928 +vt 0.613273 0.051036 +vt 0.613273 0.071952 +vt 0.610285 0.074940 +vt 0.723831 0.048047 +vt 0.616261 0.048048 +vt 0.613273 0.045059 +vt 0.726820 0.071952 +vt 0.726820 0.051035 +vt 0.729808 0.048047 +vt 0.798847 0.707242 +vt 0.858608 0.692302 +vt 0.918370 0.707242 +vt 0.616261 0.140678 +vt 0.723832 0.140678 +vt 0.726820 0.143667 +vt 0.613273 0.116773 +vt 0.613273 0.137690 +vt 0.610285 0.140678 +vt 0.723832 0.113786 +vt 0.616261 0.113785 +vt 0.613273 0.110797 +vt 0.726820 0.137690 +vt 0.726820 0.116774 +vt 0.729808 0.113786 +vt 0.787531 0.274036 +vt 0.847293 0.259095 +vt 0.907055 0.274036 +vt 0.729807 0.042071 +vt 0.726819 0.039083 +vt 0.726819 0.018166 +vt 0.616261 0.042071 +vt 0.723831 0.042071 +vt 0.726820 0.045059 +vt 0.613273 0.018167 +vt 0.613273 0.039083 +vt 0.610285 0.042071 +vt 0.723831 0.015178 +vt 0.616261 0.015179 +vt 0.613272 0.012190 +vt 0.787531 0.234715 +vt 0.847293 0.219774 +vt 0.907055 0.234715 +vt 0.729808 0.107809 +vt 0.726820 0.104821 +vt 0.726820 0.084502 +vt 0.616261 0.107809 +vt 0.723832 0.107809 +vt 0.726820 0.110797 +vt 0.613273 0.084502 +vt 0.613273 0.104821 +vt 0.610285 0.107809 +vt 0.723832 0.081514 +vt 0.616261 0.081514 +vt 0.613273 0.077928 +vt 0.616261 0.071952 +vt 0.616261 0.051036 +vt 0.723831 0.051035 +vt 0.723832 0.071952 +vt 0.616261 0.137690 +vt 0.616261 0.116773 +vt 0.723832 0.116774 +vt 0.723832 0.137690 +vt 0.723831 0.039083 +vt 0.616261 0.039083 +vt 0.616261 0.018167 +vt 0.723831 0.018166 +vt 0.723832 0.104821 +vt 0.616261 0.104821 +vt 0.616261 0.084502 +vt 0.723832 0.084502 +vt 0.785021 0.888973 +vt 0.844782 0.874033 +vt 0.904544 0.888973 +vt 0.837856 0.171489 +vt 0.897618 0.186429 +vt 0.778094 0.186429 +vt 0.700878 0.874033 +vt 0.760640 0.888973 +vt 0.641117 0.888973 +vt 0.556975 0.874033 +vt 0.616736 0.888973 +vt 0.497213 0.888973 +vt 0.760640 0.849652 +vt 0.820402 0.834712 +vt 0.880164 0.849652 +vt 0.012190 0.877497 +vt 0.071952 0.862556 +vt 0.131714 0.877497 +vt 0.754189 0.145093 +vt 0.813950 0.130153 +vt 0.873712 0.145093 +vt 0.754189 0.105773 +vt 0.813950 0.090832 +vt 0.873712 0.105773 +vt 0.813950 0.051511 +vt 0.873712 0.066452 +vt 0.754189 0.066452 +vt 0.813950 0.012190 +vt 0.873712 0.027131 +vt 0.754189 0.027131 +vt 0.071952 0.823235 +vt 0.131714 0.838176 +vt 0.012190 0.838176 +vt 0.750562 0.765405 +vt 0.750562 0.772876 +vt 0.690800 0.780346 +vt 0.810323 0.780346 +vt 0.012190 0.228274 +vt 0.191476 0.288500 +vt 0.131715 0.288500 +vt 0.071952 0.791385 +vt 0.071952 0.783914 +vt 0.131714 0.798855 +vt 0.012190 0.798855 +vt 0.520163 0.501607 +vt 0.520163 0.516547 +vt 0.027131 0.516547 +vt 0.520163 0.486666 +vt 0.535103 0.486666 +vt 0.535103 0.501607 +vt 0.027131 0.486666 +vt 0.027131 0.471725 +vt 0.520163 0.471726 +vt 0.027131 0.501606 +vt 0.012190 0.501606 +vt 0.012190 0.486666 +vt 0.520163 0.456785 +vt 0.972869 0.475361 +vt 0.972869 0.467356 +vt 0.987810 0.467356 +vt 0.972869 0.459352 +vt 0.972869 0.451348 +vt 0.987810 0.451348 +vt 0.972869 0.443343 +vt 0.987810 0.443343 +vt 0.972869 0.507379 +vt 0.972869 0.499374 +vt 0.987810 0.499374 +vt 0.972869 0.491370 +vt 0.987810 0.491370 +vt 0.966254 0.338922 +vt 0.966254 0.330918 +vt 0.981194 0.330918 +vt 0.972869 0.483365 +vt 0.987810 0.475361 +vt 0.987810 0.483365 +vt 0.856659 0.311485 +vt 0.862319 0.317145 +vt 0.860318 0.321976 +vt 0.822880 0.342434 +vt 0.827105 0.338209 +vt 0.835595 0.346699 +vt 0.837596 0.357506 +vt 0.835595 0.352675 +vt 0.847602 0.352675 +vt 0.820878 0.347266 +vt 0.831370 0.350924 +vt 0.826538 0.311485 +vt 0.831370 0.313486 +vt 0.822880 0.321976 +vt 0.866899 0.336208 +vt 0.862068 0.338209 +vt 0.862068 0.326202 +vt 0.845601 0.306905 +vt 0.847602 0.311736 +vt 0.835595 0.311736 +vt 0.862319 0.347266 +vt 0.856659 0.352925 +vt 0.851828 0.350924 +vt 0.816298 0.336208 +vt 0.816298 0.328203 +vt 0.821129 0.326202 +vt 0.835595 0.317712 +vt 0.856092 0.326202 +vt 0.847602 0.346699 +vt 0.856092 0.338209 +vt 0.847602 0.317712 +vt 0.827105 0.326202 +vt 0.851828 0.313486 +vt 0.966254 0.322914 +vt 0.966254 0.314909 +vt 0.981194 0.314909 +vt 0.966254 0.306905 +vt 0.981194 0.306905 +vt 0.966254 0.370940 +vt 0.966254 0.362936 +vt 0.981195 0.362936 +vt 0.966254 0.354931 +vt 0.981194 0.354931 +vt 0.966254 0.346927 +vt 0.981194 0.338922 +vt 0.981194 0.346927 +vt 0.875065 0.545508 +vt 0.880725 0.551168 +vt 0.878723 0.555999 +vt 0.841285 0.576457 +vt 0.845511 0.572231 +vt 0.854001 0.580721 +vt 0.864007 0.591529 +vt 0.856002 0.591529 +vt 0.854001 0.586698 +vt 0.839284 0.581288 +vt 0.849775 0.584947 +vt 0.839284 0.551168 +vt 0.844944 0.545508 +vt 0.849775 0.547509 +vt 0.885305 0.570230 +vt 0.880474 0.572232 +vt 0.880474 0.560225 +vt 0.864007 0.540928 +vt 0.866008 0.545759 +vt 0.854001 0.545759 +vt 0.880724 0.581288 +vt 0.875064 0.586948 +vt 0.870233 0.584947 +vt 0.834704 0.562226 +vt 0.839535 0.560225 +vt 0.839535 0.572231 +vt 0.854001 0.551735 +vt 0.874498 0.560225 +vt 0.866008 0.580722 +vt 0.874498 0.572232 +vt 0.866008 0.551735 +vt 0.845511 0.560225 +vt 0.878723 0.576457 +vt 0.526617 0.231727 +vt 0.526617 0.270572 +vt 0.514664 0.270572 +vt 0.643152 0.231727 +vt 0.643152 0.270572 +vt 0.655104 0.231727 +vt 0.655104 0.270572 +vt 0.643152 0.282524 +vt 0.526617 0.219774 +vt 0.967674 0.937367 +vt 0.982615 0.937367 +vt 0.982615 0.945371 +vt 0.967674 0.929362 +vt 0.982615 0.929362 +vt 0.967674 0.921358 +vt 0.982615 0.921358 +vt 0.967674 0.913354 +vt 0.982615 0.913354 +vt 0.967674 0.969385 +vt 0.982615 0.969385 +vt 0.982615 0.977389 +vt 0.967674 0.961380 +vt 0.982615 0.961380 +vt 0.971743 0.111178 +vt 0.986684 0.111178 +vt 0.986684 0.119182 +vt 0.967674 0.945371 +vt 0.982615 0.953376 +vt 0.967674 0.953376 +vt 0.833154 0.461365 +vt 0.837985 0.463366 +vt 0.829495 0.471856 +vt 0.854217 0.496579 +vt 0.862707 0.488089 +vt 0.866933 0.492315 +vt 0.842210 0.502555 +vt 0.854217 0.502555 +vt 0.852216 0.507386 +vt 0.858443 0.500805 +vt 0.868934 0.497146 +vt 0.866933 0.471856 +vt 0.858443 0.463366 +vt 0.863274 0.461365 +vt 0.827744 0.476082 +vt 0.827744 0.488089 +vt 0.822913 0.486088 +vt 0.854217 0.461616 +vt 0.842210 0.461616 +vt 0.844212 0.456785 +vt 0.827494 0.497146 +vt 0.829495 0.492315 +vt 0.837985 0.500805 +vt 0.873514 0.486088 +vt 0.868683 0.488089 +vt 0.868683 0.476082 +vt 0.833720 0.476082 +vt 0.854217 0.467592 +vt 0.842210 0.496579 +vt 0.833721 0.488089 +vt 0.842210 0.467592 +vt 0.862707 0.476082 +vt 0.971743 0.103173 +vt 0.986684 0.103173 +vt 0.971743 0.095169 +vt 0.986684 0.095169 +vt 0.971743 0.087165 +vt 0.986684 0.087165 +vt 0.971743 0.143196 +vt 0.986684 0.143196 +vt 0.986684 0.151200 +vt 0.971743 0.135191 +vt 0.986684 0.135191 +vt 0.971743 0.119182 +vt 0.986684 0.127187 +vt 0.971743 0.127187 +vt 0.835220 0.381886 +vt 0.838917 0.385584 +vt 0.827825 0.390179 +vt 0.841204 0.422480 +vt 0.852297 0.417885 +vt 0.854584 0.423407 +vt 0.827825 0.428636 +vt 0.827825 0.423407 +vt 0.838917 0.428001 +vt 0.843491 0.428001 +vt 0.854584 0.428636 +vt 0.862413 0.404506 +vt 0.857818 0.393413 +vt 0.863047 0.393413 +vt 0.824590 0.393413 +vt 0.819996 0.404506 +vt 0.816298 0.400808 +vt 0.854584 0.390179 +vt 0.843491 0.385584 +vt 0.847189 0.381886 +vt 0.816298 0.412777 +vt 0.819996 0.409080 +vt 0.824590 0.420172 +vt 0.857818 0.420172 +vt 0.862413 0.409080 +vt 0.866111 0.412777 +vt 0.830112 0.395700 +vt 0.852297 0.395700 +vt 0.830112 0.417885 +vt 0.825517 0.406793 +vt 0.841204 0.391105 +vt 0.856892 0.406793 +vt 0.012190 0.708737 +vt 0.024143 0.708737 +vt 0.024143 0.747582 +vt 0.140678 0.708736 +vt 0.140678 0.747581 +vt 0.152630 0.708736 +vt 0.152630 0.747581 +vt 0.140678 0.696784 +vt 0.024143 0.759534 +vt 0.872198 0.802899 +vt 0.861897 0.792599 +vt 0.863927 0.789083 +vt 0.901081 0.105999 +vt 0.907575 0.107739 +vt 0.907575 0.115860 +vt 0.946962 0.104505 +vt 0.944375 0.105999 +vt 0.938574 0.095953 +vt 0.915433 0.087565 +vt 0.916927 0.090153 +vt 0.906881 0.095953 +vt 0.898493 0.119094 +vt 0.901081 0.117600 +vt 0.906881 0.127646 +vt 0.947363 0.117600 +vt 0.944375 0.117600 +vt 0.930022 0.136034 +vt 0.928528 0.133447 +vt 0.938574 0.127646 +vt 0.928528 0.087165 +vt 0.928528 0.090153 +vt 0.898092 0.105999 +vt 0.941162 0.129140 +vt 0.916927 0.136435 +vt 0.916927 0.133447 +vt 0.940068 0.093365 +vt 0.904293 0.094459 +vt 0.905387 0.130234 +vt 0.308973 0.953952 +vt 0.312854 0.956193 +vt 0.308794 0.963226 +vt 0.933820 0.122892 +vt 0.918667 0.126953 +vt 0.926788 0.126953 +vt 0.933820 0.100707 +vt 0.926788 0.096647 +vt 0.911635 0.100707 +vt 0.911635 0.122892 +vt 0.937881 0.107739 +vt 0.918667 0.096647 +vt 0.937881 0.115860 +vt 0.319887 0.982439 +vt 0.339100 0.963226 +vt 0.310613 0.982260 +vt 0.312854 0.978379 +vt 0.342981 0.960985 +vt 0.335040 0.956193 +vt 0.338921 0.980620 +vt 0.335040 0.978379 +vt 0.339100 0.971346 +vt 0.317646 0.948251 +vt 0.319887 0.952133 +vt 0.304912 0.973587 +vt 0.308794 0.971346 +vt 0.330248 0.986321 +vt 0.328007 0.982439 +vt 0.328007 0.947651 +vt 0.328007 0.952133 +vt 0.304312 0.963226 +vt 0.319887 0.986921 +vt 0.337281 0.952312 +vt 0.343582 0.971346 +vt 0.675856 0.929200 +vt 0.661785 0.932970 +vt 0.659755 0.929454 +vt 0.903981 0.026282 +vt 0.909804 0.029643 +vt 0.907702 0.037487 +vt 0.936708 0.059008 +vt 0.934595 0.056895 +vt 0.942798 0.048692 +vt 0.948686 0.036714 +vt 0.945800 0.037487 +vt 0.942798 0.026282 +vt 0.901868 0.050805 +vt 0.903981 0.048692 +vt 0.912184 0.056895 +vt 0.910071 0.015966 +vt 0.912184 0.018079 +vt 0.945684 0.049466 +vt 0.944910 0.024169 +vt 0.934595 0.018079 +vt 0.911411 0.059782 +vt 0.923389 0.059898 +vt 0.901095 0.025508 +vt 0.900979 0.037487 +vt 0.935368 0.015193 +vt 0.923389 0.015077 +vt 0.924163 0.062784 +vt 0.898092 0.038261 +vt 0.922616 0.012190 +vt 0.914273 0.951286 +vt 0.915433 0.946956 +vt 0.923277 0.949058 +vt 0.931233 0.023901 +vt 0.923389 0.053175 +vt 0.931233 0.051073 +vt 0.923389 0.021800 +vt 0.936975 0.045331 +vt 0.939077 0.037487 +vt 0.909804 0.045331 +vt 0.915546 0.051073 +vt 0.915546 0.023901 +vt 0.936975 0.029643 +vt 0.931121 0.946956 +vt 0.907590 0.933370 +vt 0.931121 0.919785 +vt 0.905362 0.924367 +vt 0.909691 0.925527 +vt 0.932281 0.915455 +vt 0.923277 0.917683 +vt 0.924437 0.953387 +vt 0.903260 0.934530 +vt 0.909691 0.941214 +vt 0.922117 0.913354 +vt 0.915433 0.919785 +vt 0.934290 0.950125 +vt 0.936863 0.941214 +vt 0.943294 0.932210 +vt 0.938964 0.933370 +vt 0.936863 0.925527 +vt 0.906522 0.944383 +vt 0.912264 0.916615 +vt 0.941192 0.942374 +vt 0.940032 0.922357 +vt 0.690800 0.720724 +vt 0.690800 0.716664 +vt 0.774466 0.716663 +vt 0.850550 0.808699 +vt 0.840504 0.802899 +vt 0.850804 0.792599 +vt 0.840504 0.771206 +vt 0.850804 0.781506 +vt 0.848774 0.785022 +vt 0.877998 0.792853 +vt 0.863927 0.785022 +vt 0.872198 0.771206 +vt 0.861897 0.781506 +vt 0.858381 0.779476 +vt 0.854321 0.794629 +vt 0.858381 0.794629 +vt 0.834704 0.781252 +vt 0.848774 0.789083 +vt 0.877998 0.781252 +vt 0.850550 0.765405 +vt 0.862151 0.765405 +vt 0.862151 0.808699 +vt 0.834704 0.792853 +vt 0.854321 0.779476 +vt 0.690800 0.712604 +vt 0.774466 0.712603 +vt 0.675856 0.940801 +vt 0.670056 0.950847 +vt 0.659755 0.940547 +vt 0.638362 0.919154 +vt 0.648409 0.913354 +vt 0.652179 0.927424 +vt 0.638362 0.950847 +vt 0.632562 0.940801 +vt 0.646633 0.937031 +vt 0.661785 0.937031 +vt 0.660009 0.956648 +vt 0.656239 0.942577 +vt 0.660009 0.913354 +vt 0.656239 0.927424 +vt 0.632562 0.929200 +vt 0.646633 0.932970 +vt 0.648409 0.956648 +vt 0.652179 0.942577 +vt 0.670056 0.919154 +vt 0.648663 0.929454 +vt 0.648663 0.940547 +vt 0.690800 0.708543 +vt 0.774466 0.708543 +vt 0.690800 0.704483 +vt 0.774466 0.704483 +vt 0.690800 0.700423 +vt 0.774466 0.700422 +vt 0.690800 0.696363 +vt 0.774466 0.696362 +vt 0.690800 0.692303 +vt 0.774466 0.692302 +vt 0.690800 0.741025 +vt 0.690800 0.736965 +vt 0.774466 0.736965 +vt 0.690800 0.724784 +vt 0.774466 0.720724 +vt 0.690800 0.728844 +vt 0.774466 0.724784 +vt 0.690800 0.732905 +vt 0.774466 0.728844 +vt 0.774466 0.732904 +vt 0.532036 0.306905 +vt 0.666500 0.306905 +vt 0.644089 0.339774 +vt 0.683871 0.399535 +vt 0.644089 0.399535 +vt 0.666500 0.432404 +vt 0.532036 0.432404 +vt 0.554446 0.399535 +vt 0.514664 0.339774 +vt 0.554446 0.339774 +vt 0.514584 0.540928 +vt 0.649048 0.540928 +vt 0.626637 0.573797 +vt 0.666419 0.633558 +vt 0.626637 0.633558 +vt 0.649048 0.666427 +vt 0.514584 0.666427 +vt 0.536995 0.633558 +vt 0.497213 0.573797 +vt 0.536995 0.573797 +vt 0.616736 0.834712 +vt 0.616736 0.849652 +vt 0.556975 0.849652 +vt 0.356296 0.869009 +vt 0.296534 0.883950 +vt 0.296534 0.869009 +vt 0.296534 0.923270 +vt 0.177011 0.923270 +vt 0.177011 0.908330 +vt 0.440438 0.923270 +vt 0.320915 0.923270 +vt 0.320915 0.908330 +vt 0.753714 0.189417 +vt 0.753714 0.195394 +vt 0.514664 0.195394 +vt 0.514664 0.183442 +vt 0.514664 0.177465 +vt 0.753714 0.177465 +vt 0.753714 0.171489 +vt 0.753714 0.183441 +vt 0.514664 0.189418 +vt 0.798533 0.468737 +vt 0.798533 0.474713 +vt 0.559484 0.474714 +vt 0.559483 0.462762 +vt 0.559483 0.456785 +vt 0.798533 0.456785 +vt 0.798533 0.480690 +vt 0.559484 0.480690 +vt 0.798533 0.462761 +vt 0.559484 0.468738 +vt 0.580734 0.956648 +vt 0.584504 0.942577 +vt 0.588565 0.942577 +vt 0.907532 0.791496 +vt 0.914026 0.789756 +vt 0.918087 0.796789 +vt 0.946520 0.767262 +vt 0.945026 0.769849 +vt 0.934979 0.764049 +vt 0.910745 0.768355 +vt 0.913333 0.769849 +vt 0.907532 0.779896 +vt 0.911838 0.804130 +vt 0.913332 0.801543 +vt 0.923379 0.807343 +vt 0.953414 0.778402 +vt 0.950826 0.779896 +vt 0.947614 0.803037 +vt 0.945026 0.801543 +vt 0.950826 0.791496 +vt 0.921885 0.761461 +vt 0.923379 0.764049 +vt 0.904944 0.792990 +vt 0.953814 0.791496 +vt 0.936474 0.809931 +vt 0.934979 0.807343 +vt 0.934979 0.761061 +vt 0.904544 0.779896 +vt 0.923379 0.810331 +vt 0.253995 0.948251 +vt 0.256236 0.952133 +vt 0.249204 0.956193 +vt 0.944332 0.789756 +vt 0.933239 0.800849 +vt 0.940272 0.796789 +vt 0.933239 0.770543 +vt 0.925119 0.770543 +vt 0.914026 0.781636 +vt 0.925119 0.800849 +vt 0.940272 0.774603 +vt 0.918087 0.774603 +vt 0.944332 0.781636 +vt 0.249204 0.978379 +vt 0.275449 0.971346 +vt 0.241262 0.973587 +vt 0.245143 0.971346 +vt 0.279931 0.971346 +vt 0.275449 0.963226 +vt 0.266598 0.986321 +vt 0.264357 0.982439 +vt 0.271389 0.978379 +vt 0.264356 0.947651 +vt 0.264356 0.952133 +vt 0.240661 0.963226 +vt 0.245143 0.963226 +vt 0.256236 0.986921 +vt 0.256236 0.982439 +vt 0.273630 0.952312 +vt 0.271389 0.956193 +vt 0.245322 0.953952 +vt 0.246963 0.982260 +vt 0.279331 0.960985 +vt 0.275271 0.980620 +vt 0.743531 0.929200 +vt 0.729460 0.932970 +vt 0.727430 0.929454 +vt 0.903784 0.470876 +vt 0.909606 0.474238 +vt 0.907504 0.482082 +vt 0.936510 0.503603 +vt 0.934397 0.501490 +vt 0.942600 0.493287 +vt 0.948489 0.481308 +vt 0.945602 0.482082 +vt 0.942600 0.470876 +vt 0.901671 0.495400 +vt 0.903784 0.493287 +vt 0.911986 0.501490 +vt 0.909874 0.460561 +vt 0.911986 0.462674 +vt 0.945486 0.494060 +vt 0.944713 0.468764 +vt 0.934397 0.462674 +vt 0.911213 0.504376 +vt 0.923192 0.504492 +vt 0.900897 0.470103 +vt 0.900781 0.482082 +vt 0.935170 0.459787 +vt 0.923192 0.459671 +vt 0.923965 0.507379 +vt 0.897895 0.482855 +vt 0.922418 0.456785 +vt 0.368563 0.973587 +vt 0.372445 0.971346 +vt 0.376505 0.978379 +vt 0.931036 0.468496 +vt 0.923192 0.497769 +vt 0.931036 0.495668 +vt 0.923192 0.466394 +vt 0.936778 0.489926 +vt 0.938879 0.482082 +vt 0.909606 0.489926 +vt 0.915348 0.495667 +vt 0.915348 0.468496 +vt 0.936778 0.474238 +vt 0.383537 0.982439 +vt 0.376505 0.956193 +vt 0.402750 0.963226 +vt 0.381296 0.948251 +vt 0.383537 0.952133 +vt 0.406632 0.960985 +vt 0.398690 0.956193 +vt 0.374264 0.982260 +vt 0.372623 0.953952 +vt 0.372445 0.963226 +vt 0.400931 0.952312 +vt 0.391658 0.952133 +vt 0.383537 0.986921 +vt 0.391658 0.982439 +vt 0.402572 0.980620 +vt 0.398690 0.978379 +vt 0.402750 0.971346 +vt 0.367962 0.963226 +vt 0.391658 0.947651 +vt 0.393899 0.986321 +vt 0.407232 0.971346 +vt 0.708252 0.408431 +vt 0.708252 0.404371 +vt 0.791918 0.404370 +vt 0.564887 0.940801 +vt 0.564887 0.929200 +vt 0.578958 0.932970 +vt 0.592335 0.913354 +vt 0.588565 0.927424 +vt 0.584504 0.927424 +vt 0.592335 0.956648 +vt 0.592081 0.940547 +vt 0.608181 0.940801 +vt 0.594111 0.937031 +vt 0.594111 0.932970 +vt 0.578958 0.937031 +vt 0.580988 0.940547 +vt 0.580734 0.913354 +vt 0.580988 0.929454 +vt 0.602381 0.950847 +vt 0.602381 0.919154 +vt 0.608181 0.929200 +vt 0.570688 0.950847 +vt 0.570688 0.919154 +vt 0.592081 0.929454 +vt 0.708252 0.400310 +vt 0.791918 0.400310 +vt 0.743531 0.940801 +vt 0.737730 0.950847 +vt 0.727430 0.940547 +vt 0.706037 0.919154 +vt 0.716083 0.913354 +vt 0.719853 0.927424 +vt 0.700237 0.940801 +vt 0.714307 0.937031 +vt 0.716337 0.940547 +vt 0.729460 0.937031 +vt 0.727684 0.956648 +vt 0.723914 0.942577 +vt 0.727684 0.913354 +vt 0.723914 0.927424 +vt 0.700237 0.929200 +vt 0.714307 0.932970 +vt 0.716083 0.956648 +vt 0.719853 0.942577 +vt 0.737730 0.919154 +vt 0.716337 0.929454 +vt 0.706037 0.950847 +vt 0.708252 0.396250 +vt 0.791918 0.396250 +vt 0.708252 0.392190 +vt 0.791917 0.392189 +vt 0.708251 0.388130 +vt 0.791917 0.388129 +vt 0.708251 0.384070 +vt 0.791917 0.384069 +vt 0.708251 0.380009 +vt 0.791917 0.380008 +vt 0.708252 0.428732 +vt 0.708252 0.424671 +vt 0.791918 0.424671 +vt 0.708252 0.412491 +vt 0.791918 0.408430 +vt 0.708252 0.416551 +vt 0.791918 0.412491 +vt 0.708252 0.420611 +vt 0.791918 0.416551 +vt 0.791918 0.420611 +vt 0.841386 0.950847 +vt 0.851686 0.940547 +vt 0.855202 0.942577 +vt 0.840593 0.652412 +vt 0.846415 0.649050 +vt 0.852157 0.654792 +vt 0.871979 0.618912 +vt 0.871206 0.621798 +vt 0.860001 0.618796 +vt 0.837706 0.629228 +vt 0.840592 0.630001 +vt 0.837590 0.641206 +vt 0.848022 0.663501 +vt 0.848795 0.660614 +vt 0.860001 0.663617 +vt 0.881522 0.627888 +vt 0.879409 0.630001 +vt 0.882295 0.653185 +vt 0.879409 0.652412 +vt 0.882411 0.641206 +vt 0.846682 0.619685 +vt 0.848795 0.621798 +vt 0.838480 0.654524 +vt 0.885298 0.640433 +vt 0.873319 0.662727 +vt 0.871206 0.660614 +vt 0.859227 0.615909 +vt 0.834704 0.641980 +vt 0.860774 0.666503 +vt 0.190344 0.948251 +vt 0.192585 0.952133 +vt 0.185553 0.956193 +vt 0.875688 0.641206 +vt 0.867844 0.654792 +vt 0.873586 0.649050 +vt 0.860001 0.625519 +vt 0.852157 0.627620 +vt 0.844313 0.641206 +vt 0.860001 0.656894 +vt 0.867844 0.627620 +vt 0.846415 0.633362 +vt 0.873586 0.633362 +vt 0.185553 0.978379 +vt 0.211799 0.971346 +vt 0.177611 0.973587 +vt 0.181493 0.971346 +vt 0.216281 0.971346 +vt 0.211799 0.963226 +vt 0.202947 0.986321 +vt 0.200706 0.982439 +vt 0.207738 0.978379 +vt 0.200706 0.947651 +vt 0.200706 0.952133 +vt 0.177011 0.963226 +vt 0.181493 0.963226 +vt 0.192586 0.986921 +vt 0.192586 0.982439 +vt 0.209980 0.952312 +vt 0.207738 0.956193 +vt 0.181671 0.953952 +vt 0.183312 0.982260 +vt 0.215680 0.960985 +vt 0.211620 0.980620 +vt 0.540507 0.929200 +vt 0.526436 0.932970 +vt 0.524406 0.929454 +vt 0.909326 0.384874 +vt 0.911066 0.391369 +vt 0.904034 0.395429 +vt 0.909326 0.431157 +vt 0.909326 0.428169 +vt 0.920927 0.428169 +vt 0.933561 0.423862 +vt 0.930973 0.422368 +vt 0.936773 0.412322 +vt 0.890491 0.400721 +vt 0.893479 0.400721 +vt 0.893479 0.412322 +vt 0.920927 0.381886 +vt 0.920927 0.384874 +vt 0.922421 0.430756 +vt 0.939761 0.412322 +vt 0.936773 0.400721 +vt 0.890891 0.413816 +vt 0.899279 0.422368 +vt 0.907832 0.382287 +vt 0.899279 0.390675 +vt 0.939361 0.399227 +vt 0.930973 0.390675 +vt 0.897785 0.424956 +vt 0.896692 0.389181 +vt 0.932467 0.388087 +vt 0.942448 0.257706 +vt 0.943608 0.253377 +vt 0.951452 0.255478 +vt 0.930279 0.402461 +vt 0.904034 0.417614 +vt 0.911066 0.421674 +vt 0.926219 0.395429 +vt 0.919186 0.421674 +vt 0.926219 0.417614 +vt 0.899973 0.402461 +vt 0.899973 0.410582 +vt 0.919186 0.391369 +vt 0.930279 0.410582 +vt 0.959296 0.253377 +vt 0.935765 0.239791 +vt 0.967140 0.239791 +vt 0.933537 0.230787 +vt 0.937866 0.231947 +vt 0.960456 0.221876 +vt 0.959296 0.226205 +vt 0.951452 0.224104 +vt 0.952612 0.259808 +vt 0.931435 0.240951 +vt 0.937866 0.247635 +vt 0.950292 0.219774 +vt 0.943608 0.226205 +vt 0.962465 0.256546 +vt 0.965038 0.247635 +vt 0.971469 0.238631 +vt 0.965038 0.231947 +vt 0.934697 0.250804 +vt 0.940439 0.223036 +vt 0.969367 0.248795 +vt 0.968207 0.228778 +vt 0.679485 0.248196 +vt 0.679485 0.244136 +vt 0.763151 0.244136 +vt 0.835586 0.929200 +vt 0.841386 0.919154 +vt 0.851686 0.929454 +vt 0.873079 0.919154 +vt 0.862779 0.929454 +vt 0.859263 0.927424 +vt 0.863033 0.956648 +vt 0.851432 0.956648 +vt 0.873079 0.950847 +vt 0.862779 0.940547 +vt 0.864809 0.937031 +vt 0.849656 0.932970 +vt 0.849656 0.937031 +vt 0.863033 0.913354 +vt 0.855203 0.927424 +vt 0.859263 0.942577 +vt 0.878880 0.940801 +vt 0.864809 0.932970 +vt 0.835586 0.940801 +vt 0.851432 0.913354 +vt 0.878880 0.929200 +vt 0.679485 0.240076 +vt 0.763151 0.240075 +vt 0.540507 0.940801 +vt 0.534707 0.950847 +vt 0.524406 0.940547 +vt 0.503013 0.919154 +vt 0.513060 0.913354 +vt 0.516830 0.927424 +vt 0.503013 0.950847 +vt 0.497213 0.940801 +vt 0.511283 0.937031 +vt 0.526436 0.937031 +vt 0.524660 0.956648 +vt 0.520890 0.942577 +vt 0.524660 0.913354 +vt 0.520890 0.927424 +vt 0.497213 0.929200 +vt 0.511283 0.932970 +vt 0.513060 0.956648 +vt 0.516830 0.942577 +vt 0.534707 0.919154 +vt 0.513314 0.929454 +vt 0.513314 0.940547 +vt 0.679485 0.236016 +vt 0.763151 0.236015 +vt 0.679485 0.231956 +vt 0.763151 0.231955 +vt 0.679485 0.227895 +vt 0.763151 0.227895 +vt 0.679485 0.223835 +vt 0.763151 0.223835 +vt 0.679485 0.219775 +vt 0.763151 0.219774 +vt 0.679485 0.268497 +vt 0.679485 0.264437 +vt 0.763151 0.264437 +vt 0.679485 0.252257 +vt 0.763151 0.248196 +vt 0.679485 0.256317 +vt 0.763151 0.252256 +vt 0.679485 0.260377 +vt 0.763151 0.256317 +vt 0.763151 0.260377 +vt 0.937133 0.584222 +vt 0.933363 0.570151 +vt 0.936879 0.568121 +vt 0.918466 0.656391 +vt 0.923221 0.651637 +vt 0.930253 0.655697 +vt 0.940113 0.615909 +vt 0.940113 0.618897 +vt 0.928513 0.618897 +vt 0.909678 0.634744 +vt 0.912666 0.634744 +vt 0.912666 0.646345 +vt 0.928513 0.665179 +vt 0.928513 0.662191 +vt 0.940113 0.662191 +vt 0.951654 0.622110 +vt 0.950160 0.624698 +vt 0.958948 0.646345 +vt 0.955960 0.646345 +vt 0.955960 0.634744 +vt 0.915879 0.623204 +vt 0.918466 0.624698 +vt 0.916972 0.658979 +vt 0.958548 0.633250 +vt 0.952748 0.657885 +vt 0.950160 0.656391 +vt 0.927019 0.616310 +vt 0.910078 0.647839 +vt 0.941607 0.664779 +vt 0.956084 0.692902 +vt 0.958325 0.696784 +vt 0.951293 0.700844 +vt 0.949466 0.636484 +vt 0.945406 0.651637 +vt 0.949466 0.644605 +vt 0.930253 0.625391 +vt 0.923221 0.629452 +vt 0.919160 0.644605 +vt 0.938373 0.655697 +vt 0.938373 0.625391 +vt 0.919160 0.636484 +vt 0.945406 0.629452 +vt 0.951293 0.723029 +vt 0.977538 0.715997 +vt 0.943351 0.718238 +vt 0.947233 0.715997 +vt 0.982020 0.715997 +vt 0.977538 0.707877 +vt 0.968687 0.730971 +vt 0.966446 0.727090 +vt 0.973478 0.723029 +vt 0.966446 0.692302 +vt 0.966446 0.696784 +vt 0.942750 0.707877 +vt 0.947233 0.707877 +vt 0.958325 0.731572 +vt 0.958325 0.727090 +vt 0.975719 0.696962 +vt 0.973478 0.700844 +vt 0.947411 0.698603 +vt 0.949052 0.726911 +vt 0.981420 0.705635 +vt 0.977360 0.725271 +vt 0.811205 0.929200 +vt 0.797135 0.932970 +vt 0.795104 0.929454 +vt 0.897168 0.320996 +vt 0.902991 0.324358 +vt 0.900889 0.332202 +vt 0.929895 0.353723 +vt 0.927782 0.351610 +vt 0.935985 0.343407 +vt 0.941874 0.331428 +vt 0.938987 0.332202 +vt 0.935985 0.320996 +vt 0.895056 0.345520 +vt 0.897168 0.343407 +vt 0.905371 0.351610 +vt 0.903258 0.310681 +vt 0.905371 0.312793 +vt 0.938871 0.344180 +vt 0.938098 0.318883 +vt 0.927782 0.312793 +vt 0.904598 0.354496 +vt 0.916577 0.354612 +vt 0.894282 0.320223 +vt 0.894166 0.332202 +vt 0.928555 0.309907 +vt 0.916577 0.309791 +vt 0.917350 0.357499 +vt 0.891280 0.332975 +vt 0.915803 0.306905 +vt 0.939938 0.886871 +vt 0.941098 0.882542 +vt 0.948941 0.884644 +vt 0.924420 0.318616 +vt 0.916577 0.347889 +vt 0.924420 0.345787 +vt 0.916577 0.316514 +vt 0.930162 0.340045 +vt 0.932264 0.332202 +vt 0.902991 0.340045 +vt 0.908733 0.345787 +vt 0.908733 0.318616 +vt 0.930162 0.324358 +vt 0.956785 0.882542 +vt 0.933254 0.868956 +vt 0.956785 0.855370 +vt 0.931026 0.859952 +vt 0.935356 0.861112 +vt 0.957945 0.851041 +vt 0.948941 0.853269 +vt 0.950101 0.888973 +vt 0.928925 0.870116 +vt 0.935356 0.876800 +vt 0.947781 0.848939 +vt 0.941098 0.855370 +vt 0.959954 0.885711 +vt 0.962527 0.876800 +vt 0.968958 0.867796 +vt 0.964629 0.868956 +vt 0.962527 0.861112 +vt 0.932186 0.879969 +vt 0.937928 0.852201 +vt 0.966857 0.877960 +vt 0.965696 0.857943 +vt 0.708252 0.335327 +vt 0.708252 0.331267 +vt 0.791918 0.331266 +vt 0.915486 0.578421 +vt 0.909685 0.568375 +vt 0.923756 0.564605 +vt 0.925532 0.540928 +vt 0.929302 0.554998 +vt 0.925786 0.557028 +vt 0.947179 0.578421 +vt 0.938909 0.564605 +vt 0.952979 0.556774 +vt 0.938909 0.560545 +vt 0.936879 0.557028 +vt 0.925786 0.568121 +vt 0.929302 0.570151 +vt 0.915486 0.546728 +vt 0.923756 0.560545 +vt 0.952980 0.568375 +vt 0.937133 0.540928 +vt 0.947179 0.546728 +vt 0.925532 0.584222 +vt 0.909685 0.556774 +vt 0.933363 0.554998 +vt 0.708252 0.327207 +vt 0.791918 0.327206 +vt 0.811205 0.940801 +vt 0.805405 0.950847 +vt 0.795104 0.940547 +vt 0.773711 0.919154 +vt 0.783758 0.913354 +vt 0.787528 0.927424 +vt 0.773711 0.950847 +vt 0.767911 0.940801 +vt 0.781982 0.937031 +vt 0.797135 0.937031 +vt 0.795358 0.956648 +vt 0.791588 0.942577 +vt 0.795358 0.913354 +vt 0.791588 0.927424 +vt 0.767911 0.929200 +vt 0.781982 0.932970 +vt 0.783758 0.956648 +vt 0.787528 0.942577 +vt 0.805405 0.919154 +vt 0.784012 0.929454 +vt 0.784012 0.940547 +vt 0.708252 0.323146 +vt 0.791918 0.323146 +vt 0.708252 0.319086 +vt 0.791917 0.319086 +vt 0.708251 0.315026 +vt 0.791917 0.315025 +vt 0.708251 0.310966 +vt 0.791917 0.310965 +vt 0.708251 0.306906 +vt 0.791917 0.306905 +vt 0.708252 0.355628 +vt 0.708252 0.351568 +vt 0.791918 0.351568 +vt 0.708252 0.339387 +vt 0.791918 0.335327 +vt 0.708252 0.343447 +vt 0.791918 0.339387 +vt 0.708252 0.347508 +vt 0.791918 0.343447 +vt 0.791918 0.347507 +vt 0.296534 0.790367 +vt 0.296534 0.805308 +vt 0.236772 0.805308 +vt 0.296534 0.844629 +vt 0.296534 0.829688 +vt 0.356296 0.829688 +vt 0.012190 0.018166 +vt 0.585904 0.137690 +vt 0.149643 0.143666 +vt 0.233309 0.012190 +vt 0.293071 0.143666 +vt 0.161595 0.012190 +vt 0.221357 0.143666 +vt 0.089881 0.012190 +vt 0.690800 0.660451 +vt 0.690800 0.540928 +vt 0.463868 0.540928 +vt 0.305023 0.012190 +vt 0.404106 0.672403 +vt 0.514190 0.018166 +vt 0.514190 0.137690 +vt 0.364785 0.143666 +vt 0.392154 0.540928 +vt 0.018167 0.012190 +vt 0.332392 0.672403 +vt 0.077928 0.143666 +vt 0.320440 0.540928 +vt 0.260678 0.672403 +vt 0.254702 0.546904 +vt 0.158606 0.666427 +vt 0.158607 0.546904 +vt 0.161595 0.552880 +vt 0.086892 0.666427 +vt 0.086893 0.546904 +vt 0.089881 0.552880 +vt 0.080916 0.540928 +vt 0.015178 0.666427 +vt 0.015178 0.546904 +vt 0.021155 0.672403 +vt 0.152631 0.540928 +vt 0.092869 0.672403 +vt 0.398130 0.546904 +vt 0.398130 0.666427 +vt 0.395142 0.660451 +vt 0.654564 0.798380 +vt 0.648587 0.744588 +vt 0.648587 0.798380 +vt 0.648587 0.771479 +vt 0.230321 0.666427 +vt 0.164583 0.672403 +vt 0.326416 0.546904 +vt 0.326416 0.666427 +vt 0.323428 0.660451 +vt 0.224345 0.540928 +vt 0.442476 0.018166 +vt 0.442476 0.137690 +vt 0.436499 0.143666 +vt 0.370761 0.018166 +vt 0.370761 0.137690 +vt 0.376738 0.012190 +vt 0.299047 0.018166 +vt 0.299047 0.137690 +vt 0.012190 0.947174 +vt 0.015178 0.941198 +vt 0.508214 0.143666 +vt 0.227333 0.018166 +vt 0.227333 0.137690 +vt 0.448452 0.012190 +vt 0.155619 0.137690 +vt 0.155619 0.018166 +vt 0.559483 0.505070 +vt 0.679007 0.505070 +vt 0.520166 0.012190 +vt 0.083905 0.137690 +vt 0.083905 0.018166 +vt 0.579928 0.143666 +vt 0.497213 0.690808 +vt 0.616736 0.690808 +vt 0.071940 0.168047 +vt 0.131711 0.168047 +vt 0.012190 0.168047 +vt 0.430522 0.168046 +vt 0.490283 0.168046 +vt 0.370760 0.168046 +vt 0.191475 0.168046 +vt 0.191475 0.432404 +vt 0.131714 0.432404 +vt 0.131714 0.312881 +vt 0.071952 0.432404 +vt 0.012190 0.432404 +vt 0.012190 0.312881 +vt 0.071952 0.312881 +vt 0.191475 0.312881 +vt 0.251237 0.312881 +vt 0.310999 0.312881 +vt 0.430522 0.312881 +vt 0.430522 0.432404 +vt 0.490284 0.312881 +vt 0.490284 0.432404 +vt 0.251237 0.432404 +vt 0.469844 0.666427 +vt 0.472832 0.660451 +vt 0.469844 0.546904 +vt 0.185975 0.719195 +vt 0.185975 0.765986 +vt 0.458369 0.804357 +vt 0.464344 0.696784 +vt 0.464344 0.777467 +vt 0.464344 0.804357 +vt 0.610285 0.048048 +vt 0.729808 0.074940 +vt 0.613273 0.143666 +vt 0.610285 0.113785 +vt 0.729808 0.140678 +vt 0.729807 0.015178 +vt 0.610285 0.015179 +vt 0.726819 0.012190 +vt 0.729808 0.080916 +vt 0.610285 0.080916 +vt 0.071952 0.288500 +vt 0.012190 0.288500 +vt 0.251237 0.288500 +vt 0.430522 0.288500 +vt 0.370760 0.288500 +vt 0.490283 0.288500 +vt 0.310999 0.288500 +vt 0.027131 0.456785 +vt 0.987810 0.459352 +vt 0.987810 0.507379 +vt 0.845601 0.357506 +vt 0.826538 0.352925 +vt 0.820878 0.317145 +vt 0.866899 0.328203 +vt 0.837596 0.306905 +vt 0.860318 0.342434 +vt 0.821129 0.338209 +vt 0.981194 0.322914 +vt 0.981195 0.370940 +vt 0.870234 0.547509 +vt 0.866008 0.586698 +vt 0.844944 0.586948 +vt 0.841285 0.555999 +vt 0.885305 0.562226 +vt 0.856002 0.540928 +vt 0.834704 0.570230 +vt 0.514664 0.231727 +vt 0.526617 0.282524 +vt 0.643152 0.219774 +vt 0.967674 0.977389 +vt 0.827494 0.467025 +vt 0.844212 0.507386 +vt 0.863274 0.502806 +vt 0.868934 0.467025 +vt 0.822913 0.478083 +vt 0.852216 0.456785 +vt 0.833154 0.502806 +vt 0.873514 0.478083 +vt 0.971743 0.151200 +vt 0.827825 0.384950 +vt 0.835220 0.431699 +vt 0.847189 0.431699 +vt 0.866111 0.400808 +vt 0.819361 0.393413 +vt 0.854584 0.384950 +vt 0.819361 0.420172 +vt 0.863047 0.420172 +vt 0.012190 0.747582 +vt 0.024143 0.696784 +vt 0.140678 0.759534 +vt 0.941162 0.094459 +vt 0.905387 0.093365 +vt 0.904293 0.129140 +vt 0.947363 0.105999 +vt 0.940068 0.130234 +vt 0.916927 0.087165 +vt 0.898092 0.117600 +vt 0.946962 0.119094 +vt 0.928528 0.136435 +vt 0.930022 0.087565 +vt 0.898493 0.104505 +vt 0.915433 0.136034 +vt 0.304912 0.960985 +vt 0.317646 0.986321 +vt 0.338921 0.953952 +vt 0.342981 0.973587 +vt 0.310613 0.952312 +vt 0.308973 0.980620 +vt 0.337281 0.982260 +vt 0.319887 0.947651 +vt 0.304312 0.971346 +vt 0.328007 0.986921 +vt 0.330248 0.948251 +vt 0.343582 0.963226 +vt 0.944910 0.050805 +vt 0.945684 0.025508 +vt 0.910071 0.059008 +vt 0.901868 0.024169 +vt 0.948686 0.038261 +vt 0.936708 0.015966 +vt 0.922616 0.062784 +vt 0.898092 0.036714 +vt 0.924163 0.012190 +vt 0.935368 0.059782 +vt 0.901095 0.049466 +vt 0.911411 0.015193 +vt 0.922117 0.953387 +vt 0.903260 0.932210 +vt 0.924437 0.913354 +vt 0.932281 0.951286 +vt 0.905362 0.942374 +vt 0.914273 0.915455 +vt 0.940032 0.944383 +vt 0.941192 0.924367 +vt 0.912264 0.950125 +vt 0.906522 0.922357 +vt 0.943294 0.934530 +vt 0.934290 0.916615 +vt 0.774466 0.741025 +vt 0.683871 0.339774 +vt 0.514664 0.399535 +vt 0.666419 0.573797 +vt 0.497213 0.633558 +vt 0.497213 0.849652 +vt 0.497213 0.834712 +vt 0.556975 0.834712 +vt 0.676498 0.834712 +vt 0.676498 0.849652 +vt 0.736260 0.834712 +vt 0.736260 0.849652 +vt 0.177011 0.883950 +vt 0.177011 0.869009 +vt 0.236772 0.869009 +vt 0.416058 0.869009 +vt 0.416058 0.883949 +vt 0.356296 0.883949 +vt 0.236772 0.883950 +vt 0.296534 0.908330 +vt 0.440438 0.908330 +vt 0.514664 0.171490 +vt 0.936474 0.761461 +vt 0.904944 0.778402 +vt 0.921885 0.809931 +vt 0.947614 0.768355 +vt 0.953414 0.792990 +vt 0.911838 0.767262 +vt 0.910745 0.803037 +vt 0.953814 0.779896 +vt 0.946520 0.804130 +vt 0.923379 0.761061 +vt 0.904544 0.791496 +vt 0.934979 0.810331 +vt 0.246963 0.952312 +vt 0.245322 0.980620 +vt 0.279931 0.963226 +vt 0.273630 0.982260 +vt 0.256236 0.947651 +vt 0.240661 0.971346 +vt 0.264357 0.986921 +vt 0.266598 0.948251 +vt 0.241262 0.960985 +vt 0.253995 0.986321 +vt 0.275271 0.953952 +vt 0.279331 0.973587 +vt 0.944713 0.495400 +vt 0.945486 0.470103 +vt 0.909874 0.503603 +vt 0.901671 0.468764 +vt 0.948489 0.482855 +vt 0.936510 0.460561 +vt 0.922418 0.507379 +vt 0.897895 0.481308 +vt 0.923965 0.456785 +vt 0.935170 0.504376 +vt 0.900897 0.494060 +vt 0.911213 0.459787 +vt 0.372623 0.980620 +vt 0.374264 0.952312 +vt 0.402572 0.953952 +vt 0.381296 0.986321 +vt 0.368563 0.960985 +vt 0.393899 0.948251 +vt 0.391658 0.986921 +vt 0.406632 0.973587 +vt 0.367962 0.971346 +vt 0.383537 0.947651 +vt 0.400931 0.982260 +vt 0.407232 0.963226 +vt 0.791918 0.428732 +vt 0.860774 0.615909 +vt 0.834704 0.640433 +vt 0.859227 0.666503 +vt 0.873319 0.619685 +vt 0.885298 0.641980 +vt 0.838480 0.627888 +vt 0.846682 0.662727 +vt 0.882295 0.629228 +vt 0.881522 0.654524 +vt 0.848022 0.618912 +vt 0.837706 0.653185 +vt 0.871979 0.663501 +vt 0.183312 0.952312 +vt 0.181671 0.980620 +vt 0.216281 0.963226 +vt 0.209979 0.982260 +vt 0.192585 0.947651 +vt 0.177011 0.971346 +vt 0.200706 0.986921 +vt 0.202947 0.948251 +vt 0.177611 0.960985 +vt 0.190344 0.986321 +vt 0.211620 0.953952 +vt 0.215680 0.973587 +vt 0.920927 0.431157 +vt 0.939361 0.413816 +vt 0.890491 0.412322 +vt 0.909326 0.381886 +vt 0.932467 0.424956 +vt 0.939761 0.400721 +vt 0.896692 0.423862 +vt 0.897785 0.388087 +vt 0.933561 0.389181 +vt 0.907832 0.430756 +vt 0.890891 0.399227 +vt 0.922421 0.382287 +vt 0.950292 0.259808 +vt 0.931435 0.238631 +vt 0.952612 0.219774 +vt 0.960456 0.257706 +vt 0.933537 0.248795 +vt 0.942448 0.221876 +vt 0.968207 0.250804 +vt 0.969367 0.230787 +vt 0.940439 0.256546 +vt 0.934697 0.228778 +vt 0.971469 0.240951 +vt 0.962465 0.223036 +vt 0.763151 0.268497 +vt 0.928513 0.615909 +vt 0.909678 0.646345 +vt 0.940113 0.665179 +vt 0.941608 0.616310 +vt 0.958948 0.634744 +vt 0.910078 0.633250 +vt 0.927019 0.664779 +vt 0.952748 0.623204 +vt 0.958548 0.647839 +vt 0.916972 0.622110 +vt 0.915879 0.657885 +vt 0.951654 0.658979 +vt 0.949052 0.696962 +vt 0.947411 0.725271 +vt 0.982020 0.707877 +vt 0.975719 0.726911 +vt 0.958325 0.692302 +vt 0.942750 0.715997 +vt 0.966446 0.731572 +vt 0.968687 0.692902 +vt 0.943351 0.705635 +vt 0.956084 0.730971 +vt 0.977360 0.698603 +vt 0.981420 0.718238 +vt 0.938098 0.345520 +vt 0.938871 0.320223 +vt 0.903258 0.353723 +vt 0.895056 0.318883 +vt 0.941874 0.332975 +vt 0.929895 0.310681 +vt 0.915803 0.357499 +vt 0.891280 0.331428 +vt 0.917350 0.306905 +vt 0.928555 0.354496 +vt 0.894282 0.344180 +vt 0.904598 0.309907 +vt 0.947781 0.888973 +vt 0.928925 0.867796 +vt 0.950101 0.848939 +vt 0.957945 0.886871 +vt 0.931026 0.877960 +vt 0.939938 0.851041 +vt 0.965696 0.879969 +vt 0.966857 0.859952 +vt 0.937928 0.885711 +vt 0.932186 0.857943 +vt 0.968958 0.870116 +vt 0.959954 0.852201 +vt 0.791918 0.355628 +vt 0.177011 0.805308 +vt 0.177011 0.790367 +vt 0.236772 0.790367 +vt 0.356296 0.790367 +vt 0.356296 0.805307 +vt 0.416058 0.790367 +vt 0.416058 0.805307 +vt 0.416058 0.829688 +vt 0.416058 0.844629 +vt 0.356296 0.844629 +vt 0.236772 0.844629 +vt 0.236772 0.829688 +vt 0.177011 0.844629 +vt 0.177011 0.829688 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.124000 0.992300 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn -0.124000 0.992300 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.382700 -0.923900 0.000000 +vn -0.923900 -0.382700 0.000000 +vn -0.382700 0.923900 -0.000000 +vn -0.923900 0.382700 0.000000 +vn 0.000000 -0.965900 -0.258800 +vn 0.000000 -0.258800 0.965900 +vn 0.000000 0.965900 0.258800 +vn 0.000000 -0.707100 -0.707100 +vn 0.000000 0.258800 -0.965900 +vn 0.000000 -0.707100 0.707100 +vn 0.000000 0.707100 0.707100 +vn 0.000000 -0.258800 -0.965900 +vn 0.000000 0.707100 -0.707100 +vn 0.000000 -0.965900 0.258800 +vn 0.000000 0.258800 0.965900 +vn 0.000000 0.965900 -0.258800 +vn 0.000000 -0.563300 -0.826200 +vn 0.000000 -0.563300 0.826200 +s off +f 80/1/1 77/2/1 25/3/1 +f 93/4/1 94/5/1 22/6/1 +f 21/7/1 73/8/1 74/9/1 +f 58/10/1 71/11/1 72/12/1 +f 55/13/1 69/14/1 70/15/1 +f 56/16/1 67/17/1 68/18/1 +f 19/19/1 65/20/1 66/21/1 +f 54/22/1 75/23/1 76/24/1 +f 1/25/2 2/26/2 258/27/2 +f 27/28/3 26/29/3 7/30/3 +f 60/31/1 83/32/1 84/33/1 +f 29/34/3 28/35/3 10/36/3 +f 95/37/1 96/38/1 90/39/1 +f 57/40/1 81/41/1 82/42/1 +f 33/43/3 32/44/3 5/45/3 +f 20/46/1 79/47/1 80/48/1 +f 35/49/3 34/50/3 8/51/3 +f 25/52/1 77/53/1 78/54/1 +f 164/55/2 159/56/2 157/57/2 +f 37/58/3 36/59/3 1/60/3 +f 39/61/3 38/62/3 6/63/3 +f 36/64/3 39/65/3 2/66/3 +f 47/67/3 52/68/3 48/69/3 +f 43/70/3 49/71/3 44/72/3 +f 43/73/3 42/74/3 13/75/3 +f 40/76/3 42/77/3 41/78/3 +f 45/79/3 44/80/3 16/81/3 +f 47/82/3 46/83/3 15/84/3 +f 49/85/3 48/86/3 18/87/3 +f 29/88/3 33/89/3 26/90/3 +f 178/91/4 156/92/4 40/93/4 +f 51/94/3 50/95/3 3/96/3 +f 52/97/3 51/98/3 4/99/3 +f 35/100/3 37/101/3 32/102/3 +f 50/103/3 53/104/3 17/105/3 +f 92/106/1 89/107/1 86/108/1 +f 59/109/1 85/110/1 86/111/1 +f 88/112/1 85/113/1 82/114/1 +f 62/115/1 87/116/1 88/117/1 +f 84/118/1 81/119/1 70/120/1 +f 41/121/3 14/122/3 12/123/3 +f 61/124/1 89/125/1 90/126/1 +f 72/127/1 69/128/1 66/129/1 +f 64/130/1 91/131/1 92/132/1 +f 74/133/1 75/134/1 68/135/1 +f 40/136/3 30/137/3 11/138/3 +f 22/139/1 94/140/1 95/141/1 +f 78/142/1 79/143/1 76/144/1 +f 63/145/1 96/146/1 93/147/1 +f 259/148/4 4/149/4 3/150/4 +f 12/151/5 14/152/5 259/153/5 +f 61/154/6 15/155/6 13/156/6 +f 98/157/1 99/158/1 100/159/1 +f 98/157/4 97/160/4 69/128/4 +f 99/158/6 98/157/6 72/12/6 +f 100/159/2 99/158/2 71/161/2 +f 97/160/7 100/159/7 70/15/7 +f 102/162/1 103/163/1 104/164/1 +f 102/162/4 101/165/4 65/166/4 +f 103/163/6 102/162/6 68/18/6 +f 104/164/2 103/163/2 67/167/2 +f 101/165/7 104/164/7 66/21/7 +f 106/168/1 107/169/1 108/170/1 +f 106/168/4 105/171/4 73/172/4 +f 107/169/6 106/168/6 76/24/6 +f 108/170/2 107/169/2 75/134/2 +f 105/171/7 108/170/7 74/9/7 +f 110/173/3 111/174/3 112/175/3 +f 110/173/7 109/176/7 26/29/7 +f 111/174/2 110/173/2 27/177/2 +f 112/175/6 111/174/6 28/35/6 +f 109/176/4 112/175/4 29/88/4 +f 114/178/1 115/179/1 116/180/1 +f 114/178/4 113/181/4 81/119/4 +f 115/179/6 114/178/6 84/33/6 +f 116/180/2 115/179/2 83/182/2 +f 113/181/7 116/180/7 82/42/7 +f 118/183/3 119/184/3 120/185/3 +f 118/183/7 117/186/7 32/44/7 +f 119/184/2 118/183/2 33/89/2 +f 120/185/6 119/184/6 34/50/6 +f 117/186/4 120/185/4 35/100/4 +f 122/187/3 123/188/3 124/189/3 +f 122/187/7 121/190/7 36/59/7 +f 123/188/2 122/187/2 37/101/2 +f 124/189/6 123/188/6 38/62/6 +f 121/190/4 124/189/4 39/65/4 +f 126/191/1 127/192/1 128/193/1 +f 126/191/4 125/194/4 77/2/4 +f 127/192/6 126/191/6 80/48/6 +f 128/193/2 127/192/2 79/143/2 +f 125/194/7 128/193/7 78/54/7 +f 130/195/3 131/196/3 132/197/3 +f 130/195/7 129/198/7 42/74/7 +f 131/196/2 130/195/2 43/70/2 +f 132/197/6 131/196/6 44/80/6 +f 129/198/4 132/197/4 45/199/4 +f 134/200/3 135/201/3 136/202/3 +f 134/200/7 133/203/7 46/83/7 +f 135/201/2 134/200/2 47/67/2 +f 136/202/6 135/201/6 48/86/6 +f 133/203/4 136/202/4 49/71/4 +f 138/204/3 139/205/3 140/206/3 +f 138/204/2 137/207/2 50/95/2 +f 139/205/6 138/204/6 51/98/6 +f 140/206/4 139/205/4 52/68/4 +f 137/207/7 140/206/7 53/104/7 +f 142/208/1 143/209/1 144/210/1 +f 142/208/4 141/211/4 85/113/4 +f 143/209/6 142/208/6 88/117/6 +f 144/210/2 143/209/2 87/212/2 +f 141/211/7 144/210/7 86/111/7 +f 146/213/1 147/214/1 148/215/1 +f 146/213/4 145/216/4 89/107/4 +f 147/214/6 146/213/6 92/132/6 +f 148/215/2 147/214/2 91/217/2 +f 145/216/7 148/215/7 90/126/7 +f 150/218/1 151/219/1 152/220/1 +f 150/218/7 149/221/7 93/147/7 +f 151/219/4 150/218/4 96/38/4 +f 152/220/6 151/219/6 95/141/6 +f 149/221/2 152/220/2 94/5/2 +f 27/177/3 30/222/3 28/223/3 +f 163/224/2 160/225/2 162/226/2 +f 166/227/4 165/228/4 167/229/4 +f 171/230/4 172/231/4 169/232/4 +f 159/233/6 165/234/6 166/227/6 +f 160/235/6 172/236/6 171/230/6 +f 162/226/3 171/230/3 170/237/3 +f 158/238/7 168/239/7 167/240/7 +f 161/241/7 170/237/7 169/242/7 +f 157/57/3 166/227/3 168/239/3 +f 177/243/2 173/244/2 30/245/2 +f 228/246/4 221/247/4 214/248/4 +f 180/249/3 179/250/3 174/251/3 +f 181/252/3 180/253/3 173/254/3 +f 182/255/3 181/256/3 177/257/3 +f 179/258/3 182/259/3 178/260/3 +f 227/261/4 220/262/4 213/263/4 +f 184/264/3 183/265/3 155/266/3 +f 185/267/3 184/268/3 154/269/3 +f 186/270/3 185/271/3 175/272/3 +f 183/273/3 186/274/3 176/275/3 +f 226/276/4 219/277/4 212/278/4 +f 178/279/3 188/280/3 187/281/3 +f 189/282/3 188/283/3 178/284/3 +f 190/285/3 189/286/3 177/287/3 +f 187/288/3 190/289/3 153/290/3 +f 225/291/4 218/292/4 211/293/4 +f 176/294/3 192/295/3 191/296/3 +f 193/297/3 192/298/3 176/299/3 +f 194/300/3 193/301/3 175/302/3 +f 191/303/3 194/304/3 173/305/3 +f 196/306/3 197/307/3 198/308/3 +f 196/306/6 195/309/6 179/250/6 +f 197/307/4 196/306/4 180/253/4 +f 198/308/7 197/307/7 181/256/7 +f 195/309/2 198/308/2 182/259/2 +f 200/310/3 201/311/3 202/312/3 +f 200/310/6 199/313/6 183/265/6 +f 201/311/4 200/310/4 184/268/4 +f 202/312/7 201/311/7 185/271/7 +f 199/313/2 202/312/2 186/274/2 +f 204/314/3 205/315/3 206/316/3 +f 204/314/2 203/317/2 187/281/2 +f 205/315/6 204/314/6 188/283/6 +f 206/316/4 205/315/4 189/286/4 +f 203/317/7 206/316/7 190/289/7 +f 208/318/3 209/319/3 210/320/3 +f 208/318/2 207/321/2 191/296/2 +f 209/319/6 208/318/6 192/298/6 +f 210/320/4 209/319/4 193/301/4 +f 207/321/7 210/320/7 194/304/7 +f 229/322/4 222/323/4 215/324/4 +f 223/325/4 216/326/4 230/327/4 +f 224/328/4 217/329/4 231/330/4 +f 233/331/4 232/332/4 234/333/4 +f 249/334/4 243/335/4 237/336/4 +f 248/337/4 242/338/4 236/339/4 +f 247/340/4 241/341/4 235/342/4 +f 250/343/4 244/344/4 238/345/4 +f 245/346/4 239/347/4 251/348/4 +f 246/349/4 240/350/4 252/351/4 +f 254/352/4 253/353/4 255/354/4 +f 257/355/4 259/356/4 22/357/4 +f 259/356/4 257/355/4 4/358/4 +f 258/359/8 56/360/8 54/361/8 +f 258/362/4 256/363/4 2/364/4 +f 256/363/4 258/362/4 24/365/4 +f 263/366/1 262/367/1 260/368/1 +f 267/369/4 266/370/4 262/371/4 +f 265/372/3 264/373/3 266/374/3 +f 261/375/2 260/376/2 264/377/2 +f 262/378/6 266/374/6 264/373/6 +f 267/369/7 263/366/7 261/375/7 +f 269/379/9 271/380/9 270/381/9 +f 270/381/10 271/380/10 273/382/10 +f 273/382/11 275/383/11 274/384/11 +f 275/383/12 277/385/12 276/386/12 +f 277/387/13 279/388/13 278/389/13 +f 279/388/14 281/390/14 280/391/14 +f 301/392/9 303/393/9 302/394/9 +f 283/395/15 269/379/15 268/396/15 +f 281/390/16 283/395/16 282/397/16 +f 276/398/2 278/399/2 289/400/2 +f 285/401/9 293/402/9 292/403/9 +f 268/404/2 284/405/2 291/406/2 +f 270/407/2 285/401/2 284/408/2 +f 274/409/2 287/410/2 286/411/2 +f 280/412/2 290/413/2 289/414/2 +f 276/415/2 288/416/2 287/417/2 +f 280/418/2 282/419/2 291/420/2 +f 270/421/2 272/422/2 286/423/2 +f 295/424/4 297/425/4 293/402/4 +f 284/405/15 292/403/15 299/426/15 +f 289/414/14 290/413/14 298/427/14 +f 288/416/12 296/428/12 295/424/12 +f 286/423/10 294/429/10 293/402/10 +f 291/420/16 299/426/16 298/427/16 +f 288/430/13 289/400/13 297/425/13 +f 287/410/11 295/424/11 294/429/11 +f 302/394/10 303/393/10 305/431/10 +f 305/431/11 307/432/11 306/433/11 +f 307/432/12 309/434/12 308/435/12 +f 309/436/13 311/437/13 310/438/13 +f 311/437/14 313/439/14 312/440/14 +f 315/441/15 301/392/15 300/442/15 +f 313/439/16 315/441/16 314/443/16 +f 308/444/2 310/445/2 321/446/2 +f 317/447/9 325/448/9 324/449/9 +f 314/450/2 300/451/2 316/452/2 +f 302/453/2 317/447/2 316/454/2 +f 304/455/2 306/456/2 319/457/2 +f 312/458/2 322/459/2 321/460/2 +f 308/461/2 320/462/2 319/463/2 +f 312/464/2 314/465/2 323/466/2 +f 304/467/2 318/468/2 317/469/2 +f 327/470/4 329/471/4 331/472/4 +f 316/452/15 324/449/15 331/472/15 +f 321/460/14 322/459/14 330/473/14 +f 320/462/12 328/474/12 327/470/12 +f 318/468/10 326/475/10 325/448/10 +f 322/476/16 323/466/16 331/472/16 +f 321/446/13 329/471/13 328/474/13 +f 319/457/11 327/470/11 326/475/11 +f 335/477/1 334/478/1 332/479/1 +f 339/480/4 338/481/4 334/478/4 +f 337/482/3 336/483/3 338/481/3 +f 334/478/6 338/481/6 336/484/6 +f 339/480/7 335/477/7 333/485/7 +f 342/486/9 343/487/9 341/488/9 +f 342/486/10 344/489/10 345/490/10 +f 346/491/11 347/492/11 345/490/11 +f 348/493/12 349/494/12 347/492/12 +f 350/495/13 351/496/13 349/497/13 +f 352/498/14 353/499/14 351/496/14 +f 374/500/9 375/501/9 373/502/9 +f 340/503/15 341/488/15 355/504/15 +f 354/505/16 355/504/16 353/499/16 +f 348/506/4 360/507/4 361/508/4 +f 364/509/9 365/510/9 357/511/9 +f 363/512/4 356/513/4 340/514/4 +f 356/515/4 357/511/4 342/516/4 +f 358/517/4 359/518/4 346/519/4 +f 361/520/4 362/521/4 352/522/4 +f 359/523/4 360/524/4 348/525/4 +f 352/526/4 362/527/4 363/528/4 +f 342/529/4 357/530/4 358/531/4 +f 369/532/2 367/533/2 365/510/2 +f 371/534/15 364/509/15 356/513/15 +f 361/520/14 369/532/14 370/535/14 +f 367/533/12 368/536/12 360/524/12 +f 365/510/10 366/537/10 358/531/10 +f 362/527/16 370/535/16 371/534/16 +f 360/507/13 368/536/13 369/532/13 +f 366/537/11 367/533/11 359/518/11 +f 374/500/10 376/538/10 377/539/10 +f 378/540/11 379/541/11 377/539/11 +f 380/542/12 381/543/12 379/541/12 +f 382/544/13 383/545/13 381/546/13 +f 384/547/14 385/548/14 383/545/14 +f 372/549/15 373/502/15 387/550/15 +f 386/551/16 387/550/16 385/548/16 +f 380/552/4 392/553/4 393/554/4 +f 396/555/9 397/556/9 389/557/9 +f 386/558/4 395/559/4 388/560/4 +f 388/561/4 389/557/4 374/562/4 +f 390/563/4 391/564/4 378/565/4 +f 393/566/4 394/567/4 384/568/4 +f 391/569/4 392/570/4 380/571/4 +f 384/572/4 394/573/4 395/574/4 +f 389/575/4 390/576/4 376/577/4 +f 401/578/2 399/579/2 397/556/2 +f 403/580/15 396/555/15 388/560/15 +f 393/566/14 401/578/14 402/581/14 +f 399/579/12 400/582/12 392/570/12 +f 397/556/10 398/583/10 390/576/10 +f 394/573/16 402/581/16 403/580/16 +f 400/582/13 401/578/13 393/554/13 +f 398/583/11 399/579/11 391/564/11 +f 404/584/1 406/585/1 407/586/1 +f 406/585/2 410/587/2 411/588/2 +f 410/587/3 408/589/3 409/590/3 +f 408/591/6 410/587/6 406/585/6 +f 405/592/7 407/586/7 411/588/7 +f 421/593/1 517/594/1 518/595/1 +f 429/596/3 441/597/3 440/598/3 +f 422/599/17 434/600/17 433/601/17 +f 419/602/18 431/603/18 430/604/18 +f 416/605/19 428/606/19 427/607/19 +f 423/608/20 435/609/20 434/600/20 +f 413/610/21 424/611/21 425/612/21 +f 420/613/22 432/614/22 431/603/22 +f 417/615/23 429/596/23 428/606/23 +f 412/616/24 425/612/24 435/609/24 +f 414/617/25 426/618/25 424/611/25 +f 421/619/26 433/601/26 432/614/26 +f 418/620/27 430/604/27 429/596/27 +f 415/621/28 427/607/28 426/618/28 +f 444/622/22 456/623/22 455/624/22 +f 435/609/3 425/612/3 437/625/3 +f 426/618/3 438/626/3 436/627/3 +f 433/601/3 445/628/3 444/629/3 +f 429/596/3 430/604/3 442/630/3 +f 427/607/3 439/631/3 438/626/3 +f 433/601/3 434/600/3 446/632/3 +f 431/603/3 443/633/3 442/630/3 +f 428/606/3 440/598/3 439/631/3 +f 435/609/3 447/634/3 446/632/3 +f 424/611/3 436/627/3 437/625/3 +f 432/614/3 444/629/3 443/633/3 +f 452/635/3 456/623/3 449/636/3 +f 441/637/23 453/638/23 452/635/23 +f 437/639/24 449/636/24 459/640/24 +f 438/641/25 450/642/25 448/643/25 +f 445/644/26 457/645/26 456/623/26 +f 442/646/27 454/647/27 453/638/27 +f 439/648/28 451/649/28 450/642/28 +f 446/650/17 458/651/17 457/645/17 +f 443/652/18 455/624/18 454/647/18 +f 440/653/19 452/635/19 451/649/19 +f 447/654/20 459/640/20 458/651/20 +f 436/655/21 448/643/21 449/636/21 +f 471/656/3 531/657/3 530/658/3 +f 477/659/1 489/660/1 490/661/1 +f 470/662/20 482/663/20 483/664/20 +f 460/665/21 473/666/21 472/667/21 +f 467/668/22 479/669/22 480/670/22 +f 464/671/23 476/672/23 477/659/23 +f 471/673/24 483/664/24 473/666/24 +f 461/674/25 472/667/25 474/675/25 +f 468/676/26 480/670/26 481/677/26 +f 465/678/27 477/659/27 478/679/27 +f 462/680/28 474/675/28 475/681/28 +f 469/682/17 481/677/17 482/663/17 +f 466/683/18 478/679/18 479/669/18 +f 463/684/19 475/681/19 476/672/19 +f 492/685/26 504/686/26 505/687/26 +f 475/681/1 474/675/1 486/688/1 +f 481/677/1 493/689/1 494/690/1 +f 479/669/1 478/679/1 490/661/1 +f 476/672/1 475/681/1 487/691/1 +f 482/663/1 494/690/1 495/692/1 +f 472/667/1 473/666/1 485/693/1 +f 479/669/1 491/694/1 492/695/1 +f 477/659/1 476/672/1 488/696/1 +f 483/664/1 495/692/1 485/693/1 +f 474/675/1 472/667/1 484/697/1 +f 480/670/1 492/695/1 493/689/1 +f 506/698/1 502/699/1 498/700/1 +f 489/701/27 501/702/27 502/699/27 +f 486/703/28 498/700/28 499/704/28 +f 493/705/17 505/687/17 506/698/17 +f 490/706/18 502/699/18 503/707/18 +f 487/708/19 499/704/19 500/709/19 +f 494/710/20 506/698/20 507/711/20 +f 485/712/21 497/713/21 496/714/21 +f 491/715/22 503/707/22 504/686/22 +f 488/716/23 500/709/23 501/702/23 +f 495/717/24 507/711/24 497/713/24 +f 484/718/25 496/714/25 498/700/25 +f 522/719/28 523/720/28 511/721/28 +f 419/722/1 418/723/1 514/724/1 +f 415/725/1 511/726/1 512/727/1 +f 422/728/1 518/595/1 519/729/1 +f 412/730/1 509/731/1 508/732/1 +f 419/722/1 515/733/1 516/734/1 +f 416/735/1 512/727/1 513/736/1 +f 412/730/1 423/737/1 519/729/1 +f 414/738/1 413/739/1 508/732/1 +f 421/593/1 420/740/1 516/734/1 +f 417/741/1 513/736/1 514/724/1 +f 414/738/1 510/742/1 511/726/1 +f 523/720/19 524/743/19 512/744/19 +f 460/745/3 461/746/3 520/747/3 +f 467/748/3 468/749/3 528/750/3 +f 464/751/3 465/752/3 525/753/3 +f 460/745/3 521/754/3 531/657/3 +f 462/755/3 522/756/3 520/747/3 +f 469/757/3 529/758/3 528/750/3 +f 465/752/3 466/759/3 526/760/3 +f 462/755/3 463/761/3 523/762/3 +f 470/763/3 530/658/3 529/758/3 +f 467/748/3 527/764/3 526/760/3 +f 464/751/3 524/765/3 523/762/3 +f 524/743/23 525/766/23 513/767/23 +f 525/766/27 526/768/27 514/769/27 +f 526/768/18 527/770/18 515/771/18 +f 527/770/22 528/772/22 516/773/22 +f 528/772/26 529/774/26 517/775/26 +f 529/776/17 530/777/17 518/778/17 +f 520/779/25 522/719/25 510/780/25 +f 521/781/21 520/779/21 508/782/21 +f 531/783/24 521/781/24 509/784/24 +f 530/777/20 531/783/20 519/785/20 +f 533/786/1 535/787/1 534/788/1 +f 539/789/29 538/790/29 534/788/29 +f 539/791/3 537/792/3 536/793/3 +f 533/794/30 532/795/30 536/793/30 +f 534/788/6 538/790/6 536/793/6 +f 541/796/1 543/797/1 542/798/1 +f 547/799/29 546/800/29 542/798/29 +f 547/801/3 545/802/3 544/803/3 +f 541/804/30 540/805/30 544/803/30 +f 542/798/6 546/800/6 544/803/6 +f 936/806/3 7/807/3 5/808/3 +f 930/809/1 61/810/1 929/811/1 +f 549/812/4 550/813/4 23/814/4 +f 1/815/2 25/816/2 551/817/2 +f 555/818/1 554/819/1 552/820/1 +f 557/821/3 556/822/3 558/823/3 +f 554/824/6 558/823/6 556/822/6 +f 559/825/7 555/818/7 553/826/7 +f 563/827/1 562/828/1 560/829/1 +f 565/830/3 564/831/3 566/832/3 +f 562/828/6 566/833/6 564/834/6 +f 567/835/7 563/827/7 561/836/7 +f 577/837/1 673/838/1 674/839/1 +f 585/840/3 597/841/3 596/842/3 +f 578/843/17 590/844/17 589/845/17 +f 575/846/18 587/847/18 586/848/18 +f 572/849/19 584/850/19 583/851/19 +f 579/852/20 591/853/20 590/844/20 +f 569/854/21 580/855/21 581/856/21 +f 576/857/22 588/858/22 587/847/22 +f 573/859/23 585/840/23 584/850/23 +f 568/860/24 581/856/24 591/853/24 +f 570/861/25 582/862/25 580/855/25 +f 577/863/26 589/845/26 588/858/26 +f 574/864/27 586/848/27 585/840/27 +f 571/865/28 583/851/28 582/862/28 +f 600/866/22 612/867/22 611/868/22 +f 591/853/3 581/856/3 593/869/3 +f 582/862/3 594/870/3 592/871/3 +f 589/845/3 601/872/3 600/873/3 +f 585/840/3 586/848/3 598/874/3 +f 583/851/3 595/875/3 594/870/3 +f 589/845/3 590/844/3 602/876/3 +f 587/847/3 599/877/3 598/874/3 +f 584/850/3 596/842/3 595/875/3 +f 591/853/3 603/878/3 602/876/3 +f 580/855/3 592/871/3 593/869/3 +f 588/858/3 600/873/3 599/877/3 +f 608/879/3 612/867/3 605/880/3 +f 597/881/23 609/882/23 608/879/23 +f 593/883/24 605/880/24 615/884/24 +f 594/885/25 606/886/25 604/887/25 +f 601/888/26 613/889/26 612/867/26 +f 598/890/27 610/891/27 609/882/27 +f 595/892/28 607/893/28 606/886/28 +f 602/894/17 614/895/17 613/889/17 +f 599/896/18 611/868/18 610/891/18 +f 596/897/19 608/879/19 607/893/19 +f 603/898/20 615/884/20 614/895/20 +f 592/899/21 604/887/21 605/880/21 +f 627/900/3 687/901/3 686/902/3 +f 633/903/1 645/904/1 646/905/1 +f 626/906/20 638/907/20 639/908/20 +f 616/909/21 629/910/21 628/911/21 +f 623/912/22 635/913/22 636/914/22 +f 620/915/23 632/916/23 633/903/23 +f 627/917/24 639/908/24 629/910/24 +f 617/918/25 628/911/25 630/919/25 +f 624/920/26 636/914/26 637/921/26 +f 621/922/27 633/903/27 634/923/27 +f 618/924/28 630/919/28 631/925/28 +f 625/926/17 637/921/17 638/907/17 +f 622/927/18 634/923/18 635/913/18 +f 619/928/19 631/925/19 632/916/19 +f 648/929/26 660/930/26 661/931/26 +f 631/925/1 630/919/1 642/932/1 +f 637/921/1 649/933/1 650/934/1 +f 635/913/1 634/923/1 646/905/1 +f 632/916/1 631/925/1 643/935/1 +f 638/907/1 650/934/1 651/936/1 +f 628/911/1 629/910/1 641/937/1 +f 635/913/1 647/938/1 648/939/1 +f 633/903/1 632/916/1 644/940/1 +f 639/908/1 651/936/1 641/937/1 +f 630/919/1 628/911/1 640/941/1 +f 636/914/1 648/939/1 649/933/1 +f 662/942/1 658/943/1 654/944/1 +f 645/945/27 657/946/27 658/943/27 +f 642/947/28 654/944/28 655/948/28 +f 649/949/17 661/931/17 662/942/17 +f 646/950/18 658/943/18 659/951/18 +f 643/952/19 655/948/19 656/953/19 +f 650/954/20 662/942/20 663/955/20 +f 641/956/21 653/957/21 652/958/21 +f 647/959/22 659/951/22 660/930/22 +f 644/960/23 656/953/23 657/946/23 +f 651/961/24 663/955/24 653/957/24 +f 640/962/25 652/958/25 654/944/25 +f 678/963/28 679/964/28 667/965/28 +f 575/966/1 574/967/1 670/968/1 +f 571/969/1 667/970/1 668/971/1 +f 578/972/1 674/839/1 675/973/1 +f 568/974/1 665/975/1 664/976/1 +f 575/966/1 671/977/1 672/978/1 +f 572/979/1 668/971/1 669/980/1 +f 568/974/1 579/981/1 675/973/1 +f 570/982/1 569/983/1 664/976/1 +f 577/837/1 576/984/1 672/978/1 +f 573/985/1 669/980/1 670/968/1 +f 570/982/1 666/986/1 667/970/1 +f 679/964/19 680/987/19 668/988/19 +f 616/989/3 617/990/3 676/991/3 +f 623/992/3 624/993/3 684/994/3 +f 621/995/3 681/996/3 680/997/3 +f 616/989/3 677/998/3 687/901/3 +f 618/999/3 678/1000/3 676/991/3 +f 625/1001/3 685/1002/3 684/994/3 +f 621/995/3 622/1003/3 682/1004/3 +f 618/999/3 619/1005/3 679/1006/3 +f 626/1007/3 686/902/3 685/1002/3 +f 623/992/3 683/1008/3 682/1004/3 +f 620/1009/3 680/997/3 679/1006/3 +f 680/987/23 681/1010/23 669/1011/23 +f 681/1010/27 682/1012/27 670/1013/27 +f 682/1012/18 683/1014/18 671/1015/18 +f 683/1014/22 684/1016/22 672/1017/22 +f 684/1016/26 685/1018/26 673/1019/26 +f 685/1020/17 686/1021/17 674/1022/17 +f 676/1023/25 678/963/25 666/1024/25 +f 677/1025/21 676/1023/21 664/1026/21 +f 687/1027/24 677/1025/24 665/1028/24 +f 686/1021/20 687/1027/20 675/1029/20 +f 697/1030/1 793/1031/1 794/1032/1 +f 705/1033/3 717/1034/3 716/1035/3 +f 698/1036/17 710/1037/17 709/1038/17 +f 695/1039/18 707/1040/18 706/1041/18 +f 692/1042/19 704/1043/19 703/1044/19 +f 699/1045/20 711/1046/20 710/1037/20 +f 689/1047/21 700/1048/21 701/1049/21 +f 696/1050/22 708/1051/22 707/1040/22 +f 693/1052/23 705/1033/23 704/1043/23 +f 688/1053/24 701/1049/24 711/1046/24 +f 690/1054/25 702/1055/25 700/1048/25 +f 697/1056/26 709/1038/26 708/1051/26 +f 694/1057/27 706/1041/27 705/1033/27 +f 691/1058/28 703/1044/28 702/1055/28 +f 720/1059/22 732/1060/22 731/1061/22 +f 711/1046/3 701/1049/3 713/1062/3 +f 702/1055/3 714/1063/3 712/1064/3 +f 709/1038/3 721/1065/3 720/1066/3 +f 705/1033/3 706/1041/3 718/1067/3 +f 703/1044/3 715/1068/3 714/1063/3 +f 709/1038/3 710/1037/3 722/1069/3 +f 707/1040/3 719/1070/3 718/1067/3 +f 704/1043/3 716/1035/3 715/1068/3 +f 711/1046/3 723/1071/3 722/1069/3 +f 700/1048/3 712/1064/3 713/1062/3 +f 708/1051/3 720/1066/3 719/1070/3 +f 728/1072/3 732/1060/3 725/1073/3 +f 717/1074/23 729/1075/23 728/1072/23 +f 713/1076/24 725/1073/24 735/1077/24 +f 714/1078/25 726/1079/25 724/1080/25 +f 721/1081/26 733/1082/26 732/1060/26 +f 718/1083/27 730/1084/27 729/1075/27 +f 715/1085/28 727/1086/28 726/1079/28 +f 722/1087/17 734/1088/17 733/1082/17 +f 719/1089/18 731/1061/18 730/1084/18 +f 716/1090/19 728/1072/19 727/1086/19 +f 723/1091/20 735/1077/20 734/1088/20 +f 712/1092/21 724/1080/21 725/1073/21 +f 747/1093/3 807/1094/3 806/1095/3 +f 753/1096/1 765/1097/1 766/1098/1 +f 746/1099/20 758/1100/20 759/1101/20 +f 736/1102/21 749/1103/21 748/1104/21 +f 743/1105/22 755/1106/22 756/1107/22 +f 740/1108/23 752/1109/23 753/1096/23 +f 747/1110/24 759/1101/24 749/1103/24 +f 737/1111/25 748/1104/25 750/1112/25 +f 744/1113/26 756/1107/26 757/1114/26 +f 741/1115/27 753/1096/27 754/1116/27 +f 738/1117/28 750/1112/28 751/1118/28 +f 745/1119/17 757/1114/17 758/1100/17 +f 742/1120/18 754/1116/18 755/1106/18 +f 739/1121/19 751/1118/19 752/1109/19 +f 768/1122/26 780/1123/26 781/1124/26 +f 751/1118/1 750/1112/1 762/1125/1 +f 757/1114/1 769/1126/1 770/1127/1 +f 755/1106/1 754/1116/1 766/1098/1 +f 752/1109/1 751/1118/1 763/1128/1 +f 758/1100/1 770/1127/1 771/1129/1 +f 748/1104/1 749/1103/1 761/1130/1 +f 755/1106/1 767/1131/1 768/1132/1 +f 753/1096/1 752/1109/1 764/1133/1 +f 759/1101/1 771/1129/1 761/1130/1 +f 750/1112/1 748/1104/1 760/1134/1 +f 756/1107/1 768/1132/1 769/1126/1 +f 782/1135/1 778/1136/1 773/1137/1 +f 765/1138/27 777/1139/27 778/1136/27 +f 762/1140/28 774/1141/28 775/1142/28 +f 769/1143/17 781/1124/17 782/1135/17 +f 766/1144/18 778/1136/18 779/1145/18 +f 763/1146/19 775/1142/19 776/1147/19 +f 770/1148/20 782/1135/20 783/1149/20 +f 761/1150/21 773/1137/21 772/1151/21 +f 767/1152/22 779/1145/22 780/1123/22 +f 764/1153/23 776/1147/23 777/1139/23 +f 771/1154/24 783/1149/24 773/1137/24 +f 760/1155/25 772/1151/25 774/1141/25 +f 798/1156/28 799/1157/28 787/1158/28 +f 695/1159/1 694/1160/1 790/1161/1 +f 691/1162/1 787/1163/1 788/1164/1 +f 699/1165/1 698/1166/1 794/1032/1 +f 688/1167/1 785/1168/1 784/1169/1 +f 695/1159/1 791/1170/1 792/1171/1 +f 692/1172/1 788/1164/1 789/1173/1 +f 688/1167/1 699/1165/1 795/1174/1 +f 689/1175/1 784/1169/1 786/1176/1 +f 697/1030/1 696/1177/1 792/1171/1 +f 693/1178/1 789/1173/1 790/1161/1 +f 690/1179/1 786/1176/1 787/1163/1 +f 799/1157/19 800/1180/19 788/1181/19 +f 736/1182/3 737/1183/3 796/1184/3 +f 743/1185/3 744/1186/3 804/1187/3 +f 740/1188/3 741/1189/3 801/1190/3 +f 736/1182/3 797/1191/3 807/1094/3 +f 738/1192/3 798/1193/3 796/1184/3 +f 745/1194/3 805/1195/3 804/1187/3 +f 741/1189/3 742/1196/3 802/1197/3 +f 738/1192/3 739/1198/3 799/1199/3 +f 746/1200/3 806/1095/3 805/1195/3 +f 743/1185/3 803/1201/3 802/1197/3 +f 740/1188/3 800/1202/3 799/1199/3 +f 800/1180/23 801/1203/23 789/1204/23 +f 801/1203/27 802/1205/27 790/1206/27 +f 802/1205/18 803/1207/18 791/1208/18 +f 803/1207/22 804/1209/22 792/1210/22 +f 804/1209/26 805/1211/26 793/1212/26 +f 805/1213/17 806/1214/17 794/1215/17 +f 796/1216/25 798/1156/25 786/1217/25 +f 797/1218/21 796/1216/21 784/1219/21 +f 807/1220/24 797/1218/24 785/1221/24 +f 806/1214/20 807/1220/20 795/1222/20 +f 817/1223/1 913/1224/1 914/1225/1 +f 825/1226/3 837/1227/3 836/1228/3 +f 818/1229/17 830/1230/17 829/1231/17 +f 815/1232/18 827/1233/18 826/1234/18 +f 812/1235/19 824/1236/19 823/1237/19 +f 819/1238/20 831/1239/20 830/1230/20 +f 809/1240/21 820/1241/21 821/1242/21 +f 816/1243/22 828/1244/22 827/1233/22 +f 813/1245/23 825/1226/23 824/1236/23 +f 808/1246/24 821/1242/24 831/1239/24 +f 810/1247/25 822/1248/25 820/1241/25 +f 817/1249/26 829/1231/26 828/1244/26 +f 814/1250/27 826/1234/27 825/1226/27 +f 811/1251/28 823/1237/28 822/1248/28 +f 840/1252/22 852/1253/22 851/1254/22 +f 831/1239/3 821/1242/3 833/1255/3 +f 822/1248/3 834/1256/3 832/1257/3 +f 829/1231/3 841/1258/3 840/1259/3 +f 825/1226/3 826/1234/3 838/1260/3 +f 823/1237/3 835/1261/3 834/1256/3 +f 829/1231/3 830/1230/3 842/1262/3 +f 827/1233/3 839/1263/3 838/1260/3 +f 824/1236/3 836/1228/3 835/1261/3 +f 831/1239/3 843/1264/3 842/1262/3 +f 820/1241/3 832/1257/3 833/1255/3 +f 828/1244/3 840/1259/3 839/1263/3 +f 848/1265/3 852/1253/3 845/1266/3 +f 837/1267/23 849/1268/23 848/1265/23 +f 833/1269/24 845/1266/24 855/1270/24 +f 834/1271/25 846/1272/25 844/1273/25 +f 841/1274/26 853/1275/26 852/1253/26 +f 838/1276/27 850/1277/27 849/1268/27 +f 835/1278/28 847/1279/28 846/1272/28 +f 842/1280/17 854/1281/17 853/1275/17 +f 839/1282/18 851/1254/18 850/1277/18 +f 836/1283/19 848/1265/19 847/1279/19 +f 843/1284/20 855/1270/20 854/1281/20 +f 832/1285/21 844/1273/21 845/1266/21 +f 867/1286/3 927/1287/3 926/1288/3 +f 873/1289/1 885/1290/1 886/1291/1 +f 866/1292/20 878/1293/20 879/1294/20 +f 856/1295/21 869/1296/21 868/1297/21 +f 863/1298/22 875/1299/22 876/1300/22 +f 860/1301/23 872/1302/23 873/1289/23 +f 867/1303/24 879/1294/24 869/1296/24 +f 857/1304/25 868/1297/25 870/1305/25 +f 864/1306/26 876/1300/26 877/1307/26 +f 861/1308/27 873/1289/27 874/1309/27 +f 858/1310/28 870/1305/28 871/1311/28 +f 865/1312/17 877/1307/17 878/1293/17 +f 862/1313/18 874/1309/18 875/1299/18 +f 859/1314/19 871/1311/19 872/1302/19 +f 888/1315/26 900/1316/26 901/1317/26 +f 871/1311/1 870/1305/1 882/1318/1 +f 877/1307/1 889/1319/1 890/1320/1 +f 875/1299/1 874/1309/1 886/1291/1 +f 872/1302/1 871/1311/1 883/1321/1 +f 878/1293/1 890/1320/1 891/1322/1 +f 868/1297/1 869/1296/1 881/1323/1 +f 875/1299/1 887/1324/1 888/1325/1 +f 873/1289/1 872/1302/1 884/1326/1 +f 879/1294/1 891/1322/1 881/1323/1 +f 870/1305/1 868/1297/1 880/1327/1 +f 876/1300/1 888/1325/1 889/1319/1 +f 902/1328/1 898/1329/1 894/1330/1 +f 885/1331/27 897/1332/27 898/1329/27 +f 882/1333/28 894/1330/28 895/1334/28 +f 889/1335/17 901/1317/17 902/1328/17 +f 886/1336/18 898/1329/18 899/1337/18 +f 883/1338/19 895/1334/19 896/1339/19 +f 890/1340/20 902/1328/20 903/1341/20 +f 881/1342/21 893/1343/21 892/1344/21 +f 887/1345/22 899/1337/22 900/1316/22 +f 884/1346/23 896/1339/23 897/1332/23 +f 891/1347/24 903/1341/24 893/1343/24 +f 880/1348/25 892/1344/25 894/1330/25 +f 918/1349/28 919/1350/28 907/1351/28 +f 815/1352/1 814/1353/1 910/1354/1 +f 811/1355/1 907/1356/1 908/1357/1 +f 818/1358/1 914/1225/1 915/1359/1 +f 808/1360/1 905/1361/1 904/1362/1 +f 815/1352/1 911/1363/1 912/1364/1 +f 812/1365/1 908/1357/1 909/1366/1 +f 808/1360/1 819/1367/1 915/1359/1 +f 810/1368/1 809/1369/1 904/1362/1 +f 817/1223/1 816/1370/1 912/1364/1 +f 813/1371/1 909/1366/1 910/1354/1 +f 810/1368/1 906/1372/1 907/1356/1 +f 919/1350/19 920/1373/19 908/1374/19 +f 856/1375/3 857/1376/3 916/1377/3 +f 863/1378/3 864/1379/3 924/1380/3 +f 860/1381/3 861/1382/3 921/1383/3 +f 856/1375/3 917/1384/3 927/1287/3 +f 858/1385/3 918/1386/3 916/1377/3 +f 865/1387/3 925/1388/3 924/1380/3 +f 861/1382/3 862/1389/3 922/1390/3 +f 858/1385/3 859/1391/3 919/1392/3 +f 866/1393/3 926/1288/3 925/1388/3 +f 863/1378/3 923/1394/3 922/1390/3 +f 860/1381/3 920/1395/3 919/1392/3 +f 920/1373/23 921/1396/23 909/1397/23 +f 921/1396/27 922/1398/27 910/1399/27 +f 922/1398/18 923/1400/18 911/1401/18 +f 923/1400/22 924/1402/22 912/1403/22 +f 924/1402/26 925/1404/26 913/1405/26 +f 925/1406/17 926/1407/17 914/1408/17 +f 916/1409/25 918/1349/25 906/1410/25 +f 917/1411/21 916/1409/21 904/1412/21 +f 927/1413/24 917/1411/24 905/1414/24 +f 926/1407/20 927/1413/20 915/1415/20 +f 940/1416/3 15/1417/3 13/1418/3 +f 933/1419/1 19/1420/1 55/1421/1 +f 24/1422/1 80/1/1 25/3/1 +f 23/1423/1 93/4/1 22/6/1 +f 19/1424/1 21/7/1 74/9/1 +f 56/1425/1 58/10/1 72/12/1 +f 57/1426/1 55/13/1 70/15/1 +f 54/1427/1 56/16/1 68/18/1 +f 55/1428/1 19/19/1 66/21/1 +f 20/1429/1 54/22/1 76/24/1 +f 258/27/2 24/1430/2 25/1431/2 +f 25/1431/2 1/25/2 258/27/2 +f 9/1432/3 27/28/3 7/30/3 +f 58/1433/1 60/31/1 84/33/1 +f 8/1434/3 29/34/3 10/36/3 +f 90/39/1 91/217/1 95/37/1 +f 64/1435/1 95/37/1 91/217/1 +f 96/38/1 63/1436/1 90/39/1 +f 59/1437/1 57/40/1 82/42/1 +f 7/1438/3 33/43/3 5/45/3 +f 24/1439/1 20/46/1 80/48/1 +f 6/1440/3 35/49/3 8/51/3 +f 21/1441/1 25/52/1 78/54/1 +f 158/238/2 164/55/2 157/57/2 +f 5/1442/3 37/58/3 1/60/3 +f 2/1443/3 39/61/3 6/63/3 +f 1/1444/3 36/64/3 2/66/3 +f 18/1445/3 48/69/3 52/68/3 +f 47/67/3 17/1446/3 53/1447/3 +f 53/1447/3 52/68/3 47/67/3 +f 16/1448/3 44/72/3 49/71/3 +f 43/70/3 15/1449/3 46/1450/3 +f 46/1450/3 49/71/3 43/70/3 +f 15/1451/3 43/73/3 13/75/3 +f 14/1452/3 41/78/3 45/199/3 +f 40/76/3 13/1453/3 42/77/3 +f 42/77/3 45/199/3 41/78/3 +f 14/1454/3 45/79/3 16/81/3 +f 17/1455/3 47/82/3 15/84/3 +f 16/1456/3 49/85/3 18/87/3 +f 7/1457/3 26/90/3 33/89/3 +f 29/88/3 8/1458/3 34/1459/3 +f 34/1459/3 33/89/3 29/88/3 +f 40/93/4 41/1460/4 174/1461/4 +f 155/1462/4 176/1463/4 41/1460/4 +f 174/1461/4 178/91/4 40/93/4 +f 41/1460/4 176/1463/4 174/1461/4 +f 4/1464/3 51/94/3 3/96/3 +f 18/1465/3 52/97/3 4/99/3 +f 5/1466/3 32/102/3 37/101/3 +f 35/100/3 6/1467/3 38/1468/3 +f 38/1468/3 37/101/3 35/100/3 +f 3/1469/3 50/103/3 17/105/3 +f 86/108/1 87/212/1 92/106/1 +f 62/1470/1 92/106/1 87/212/1 +f 89/107/1 61/1471/1 86/108/1 +f 61/1472/1 59/109/1 86/111/1 +f 82/114/1 83/182/1 88/112/1 +f 60/1473/1 88/112/1 83/182/1 +f 85/113/1 59/1474/1 82/114/1 +f 60/1475/1 62/115/1 88/117/1 +f 70/120/1 71/161/1 84/118/1 +f 58/1476/1 84/118/1 71/161/1 +f 81/119/1 57/1477/1 70/120/1 +f 12/123/3 10/1478/3 31/1479/3 +f 31/1479/3 41/121/3 12/123/3 +f 63/1480/1 61/124/1 90/126/1 +f 66/129/1 67/167/1 72/127/1 +f 56/1481/1 72/127/1 67/167/1 +f 69/128/1 55/1482/1 66/129/1 +f 62/1483/1 64/130/1 92/132/1 +f 68/135/1 65/166/1 74/133/1 +f 19/1484/1 74/133/1 65/166/1 +f 75/134/1 54/1485/1 68/135/1 +f 9/1486/3 11/138/3 30/137/3 +f 13/1487/3 40/136/3 11/138/3 +f 64/1488/1 22/139/1 95/141/1 +f 76/144/1 73/172/1 78/142/1 +f 21/1489/1 78/142/1 73/172/1 +f 79/143/1 20/1490/1 76/144/1 +f 23/1491/1 63/145/1 93/147/1 +f 3/150/4 23/1492/4 259/148/4 +f 22/1493/4 259/148/4 23/1492/4 +f 259/153/5 258/359/5 12/151/5 +f 6/1494/5 8/1495/5 258/359/5 +f 258/359/5 2/1496/5 6/1494/5 +f 18/1497/5 4/1498/5 259/153/5 +f 14/152/5 16/1499/5 259/153/5 +f 10/1500/5 12/151/5 258/359/5 +f 258/359/5 8/1495/5 10/1500/5 +f 16/1499/5 18/1497/5 259/153/5 +f 9/1501/6 7/1502/6 19/1503/6 +f 5/1504/6 1/1505/6 25/1506/6 +f 25/1506/6 21/1507/6 5/1504/6 +f 19/1503/6 55/1508/6 9/1501/6 +f 57/1509/6 59/1510/6 13/156/6 +f 61/154/6 63/1511/6 17/1512/6 +f 23/1513/6 3/1514/6 17/1512/6 +f 17/1512/6 15/155/6 61/154/6 +f 13/156/6 11/1515/6 57/1509/6 +f 7/1502/6 5/1504/6 19/1503/6 +f 21/1507/6 19/1503/6 5/1504/6 +f 59/1510/6 61/154/6 13/156/6 +f 23/1513/6 17/1512/6 63/1511/6 +f 11/1515/6 9/1501/6 57/1509/6 +f 55/1508/6 57/1509/6 9/1501/6 +f 97/160/1 98/157/1 100/159/1 +f 72/127/4 98/157/4 69/128/4 +f 71/11/6 99/158/6 72/12/6 +f 70/120/2 100/159/2 71/161/2 +f 69/14/7 97/160/7 70/15/7 +f 101/165/1 102/162/1 104/164/1 +f 68/135/4 102/162/4 65/166/4 +f 67/17/6 103/163/6 68/18/6 +f 66/129/2 104/164/2 67/167/2 +f 65/20/7 101/165/7 66/21/7 +f 105/171/1 106/168/1 108/170/1 +f 76/144/4 106/168/4 73/172/4 +f 75/23/6 107/169/6 76/24/6 +f 74/133/2 108/170/2 75/134/2 +f 73/8/7 105/171/7 74/9/7 +f 109/176/3 110/173/3 112/175/3 +f 27/28/7 110/173/7 26/29/7 +f 28/223/2 111/174/2 27/177/2 +f 29/34/6 112/175/6 28/35/6 +f 26/90/4 109/176/4 29/88/4 +f 113/181/1 114/178/1 116/180/1 +f 84/118/4 114/178/4 81/119/4 +f 83/32/6 115/179/6 84/33/6 +f 82/114/2 116/180/2 83/182/2 +f 81/41/7 113/181/7 82/42/7 +f 117/186/3 118/183/3 120/185/3 +f 33/43/7 118/183/7 32/44/7 +f 34/1459/2 119/184/2 33/89/2 +f 35/49/6 120/185/6 34/50/6 +f 32/102/4 117/186/4 35/100/4 +f 121/190/3 122/187/3 124/189/3 +f 37/58/7 122/187/7 36/59/7 +f 38/1468/2 123/188/2 37/101/2 +f 39/61/6 124/189/6 38/62/6 +f 36/64/4 121/190/4 39/65/4 +f 125/194/1 126/191/1 128/193/1 +f 80/1/4 126/191/4 77/2/4 +f 79/47/6 127/192/6 80/48/6 +f 78/142/2 128/193/2 79/143/2 +f 77/53/7 125/194/7 78/54/7 +f 129/198/3 130/195/3 132/197/3 +f 43/73/7 130/195/7 42/74/7 +f 44/72/2 131/196/2 43/70/2 +f 45/79/6 132/197/6 44/80/6 +f 42/77/4 129/198/4 45/199/4 +f 133/203/3 134/200/3 136/202/3 +f 47/82/7 134/200/7 46/83/7 +f 48/69/2 135/201/2 47/67/2 +f 49/85/6 136/202/6 48/86/6 +f 46/1450/4 133/203/4 49/71/4 +f 137/207/3 138/204/3 140/206/3 +f 51/94/2 138/204/2 50/95/2 +f 52/97/6 139/205/6 51/98/6 +f 53/1447/4 140/206/4 52/68/4 +f 50/103/7 137/207/7 53/104/7 +f 141/211/1 142/208/1 144/210/1 +f 88/112/4 142/208/4 85/113/4 +f 87/116/6 143/209/6 88/117/6 +f 86/108/2 144/210/2 87/212/2 +f 85/110/7 141/211/7 86/111/7 +f 145/216/1 146/213/1 148/215/1 +f 92/106/4 146/213/4 89/107/4 +f 91/131/6 147/214/6 92/132/6 +f 90/39/2 148/215/2 91/217/2 +f 89/125/7 145/216/7 90/126/7 +f 149/221/1 150/218/1 152/220/1 +f 96/146/7 150/218/7 93/147/7 +f 95/37/4 151/219/4 96/38/4 +f 94/140/6 152/220/6 95/141/6 +f 93/4/2 149/221/2 94/5/2 +f 10/1516/3 28/223/3 31/1517/3 +f 27/177/3 9/1518/3 30/222/3 +f 30/222/3 31/1517/3 28/223/3 +f 161/241/2 163/224/2 162/226/2 +f 168/239/4 166/227/4 167/229/4 +f 170/237/4 171/230/4 169/232/4 +f 157/57/6 159/233/6 166/227/6 +f 162/226/6 160/235/6 171/230/6 +f 161/241/3 162/226/3 170/237/3 +f 164/1519/7 158/238/7 167/240/7 +f 163/1520/7 161/241/7 169/242/7 +f 158/238/3 157/57/3 168/239/3 +f 31/1521/2 30/245/2 173/244/2 +f 153/1522/2 177/243/2 30/245/2 +f 173/244/2 175/1523/2 31/1521/2 +f 154/1524/2 31/1521/2 175/1523/2 +f 173/305/3 180/249/3 174/251/3 +f 177/1525/3 181/252/3 173/254/3 +f 178/284/3 182/255/3 177/257/3 +f 174/1526/3 179/258/3 178/260/3 +f 154/1527/3 184/264/3 155/266/3 +f 175/1528/3 185/267/3 154/269/3 +f 176/299/3 186/270/3 175/272/3 +f 155/1529/3 183/273/3 176/275/3 +f 156/1530/3 178/279/3 187/281/3 +f 177/257/3 189/282/3 178/284/3 +f 153/1531/3 190/285/3 177/287/3 +f 156/1532/3 187/288/3 153/290/3 +f 174/1533/3 176/294/3 191/296/3 +f 175/272/3 193/297/3 176/299/3 +f 173/1534/3 194/300/3 175/302/3 +f 174/251/3 191/303/3 173/305/3 +f 195/309/3 196/306/3 198/308/3 +f 180/249/6 196/306/6 179/250/6 +f 181/252/4 197/307/4 180/253/4 +f 182/255/7 198/308/7 181/256/7 +f 179/258/2 195/309/2 182/259/2 +f 199/313/3 200/310/3 202/312/3 +f 184/264/6 200/310/6 183/265/6 +f 185/267/4 201/311/4 184/268/4 +f 186/270/7 202/312/7 185/271/7 +f 183/273/2 199/313/2 186/274/2 +f 203/317/3 204/314/3 206/316/3 +f 188/280/2 204/314/2 187/281/2 +f 189/282/6 205/315/6 188/283/6 +f 190/285/4 206/316/4 189/286/4 +f 187/288/7 203/317/7 190/289/7 +f 207/321/3 208/318/3 210/320/3 +f 192/295/2 208/318/2 191/296/2 +f 193/297/6 209/319/6 192/298/6 +f 194/300/4 210/320/4 193/301/4 +f 191/303/7 207/321/7 194/304/7 +f 20/1535/8 24/1536/8 258/359/8 +f 258/359/8 259/153/8 58/1537/8 +f 64/1538/8 62/1539/8 259/153/8 +f 259/153/8 22/1540/8 64/1538/8 +f 54/361/8 20/1535/8 258/359/8 +f 58/1537/8 56/360/8 258/359/8 +f 259/153/8 62/1539/8 60/1541/8 +f 60/1541/8 58/1537/8 259/153/8 +f 261/375/1 263/366/1 260/368/1 +f 263/366/4 267/369/4 262/371/4 +f 267/369/3 265/372/3 266/374/3 +f 265/372/2 261/375/2 264/377/2 +f 260/1542/6 262/378/6 264/373/6 +f 265/372/7 267/369/7 261/375/7 +f 268/396/9 269/379/9 270/381/9 +f 272/1543/10 270/381/10 273/382/10 +f 272/1543/11 273/382/11 274/384/11 +f 274/384/12 275/383/12 276/386/12 +f 276/1544/13 277/387/13 278/389/13 +f 278/389/14 279/388/14 280/391/14 +f 300/442/9 301/392/9 302/394/9 +f 282/397/15 283/395/15 268/396/15 +f 280/391/16 281/390/16 282/397/16 +f 288/430/2 276/398/2 289/400/2 +f 284/408/9 285/401/9 292/403/9 +f 282/1545/2 268/404/2 291/406/2 +f 268/1546/2 270/407/2 284/408/2 +f 272/1547/2 274/409/2 286/411/2 +f 278/1548/2 280/412/2 289/414/2 +f 274/1549/2 276/415/2 287/417/2 +f 290/1550/2 280/418/2 291/420/2 +f 285/1551/2 270/421/2 286/423/2 +f 299/426/4 292/403/4 293/402/4 +f 293/402/4 294/429/4 295/424/4 +f 295/424/4 296/428/4 297/425/4 +f 297/425/4 298/427/4 299/426/4 +f 299/426/4 293/402/4 297/425/4 +f 291/406/15 284/405/15 299/426/15 +f 297/425/14 289/414/14 298/427/14 +f 287/417/12 288/416/12 295/424/12 +f 285/1551/10 286/423/10 293/402/10 +f 290/1550/16 291/420/16 298/427/16 +f 296/428/13 288/430/13 297/425/13 +f 286/411/11 287/410/11 294/429/11 +f 304/1552/10 302/394/10 305/431/10 +f 304/1552/11 305/431/11 306/433/11 +f 306/433/12 307/432/12 308/435/12 +f 308/1553/13 309/436/13 310/438/13 +f 310/438/14 311/437/14 312/440/14 +f 314/443/15 315/441/15 300/442/15 +f 312/440/16 313/439/16 314/443/16 +f 320/1554/2 308/444/2 321/446/2 +f 316/454/9 317/447/9 324/449/9 +f 323/1555/2 314/450/2 316/452/2 +f 300/1556/2 302/453/2 316/454/2 +f 318/1557/2 304/455/2 319/457/2 +f 310/1558/2 312/458/2 321/460/2 +f 306/1559/2 308/461/2 319/463/2 +f 322/476/2 312/464/2 323/466/2 +f 302/1560/2 304/467/2 317/469/2 +f 331/472/4 324/449/4 325/448/4 +f 325/448/4 326/475/4 327/470/4 +f 327/470/4 328/474/4 329/471/4 +f 329/471/4 330/473/4 331/472/4 +f 331/472/4 325/448/4 327/470/4 +f 323/1555/15 316/452/15 331/472/15 +f 329/471/14 321/460/14 330/473/14 +f 319/463/12 320/462/12 327/470/12 +f 317/469/10 318/468/10 325/448/10 +f 330/473/16 322/476/16 331/472/16 +f 320/1554/13 321/446/13 328/474/13 +f 318/1557/11 319/457/11 326/475/11 +f 333/1561/1 335/477/1 332/479/1 +f 335/477/4 339/480/4 334/478/4 +f 339/480/3 337/482/3 338/481/3 +f 332/1562/6 334/478/6 336/484/6 +f 337/1563/7 339/480/7 333/485/7 +f 340/503/9 342/486/9 341/488/9 +f 343/487/10 342/486/10 345/490/10 +f 344/489/11 346/491/11 345/490/11 +f 346/491/12 348/493/12 347/492/12 +f 348/1564/13 350/495/13 349/497/13 +f 350/495/14 352/498/14 351/496/14 +f 372/549/9 374/500/9 373/502/9 +f 354/505/15 340/503/15 355/504/15 +f 352/498/16 354/505/16 353/499/16 +f 350/1565/4 348/506/4 361/508/4 +f 356/515/9 364/509/9 357/511/9 +f 354/1566/4 363/512/4 340/514/4 +f 340/1567/4 356/515/4 342/516/4 +f 344/1568/4 358/517/4 346/519/4 +f 350/1569/4 361/520/4 352/522/4 +f 346/1570/4 359/523/4 348/525/4 +f 354/1571/4 352/526/4 363/528/4 +f 344/1572/4 342/529/4 358/531/4 +f 365/510/2 364/509/2 371/534/2 +f 371/534/2 370/535/2 369/532/2 +f 369/532/2 368/536/2 367/533/2 +f 367/533/2 366/537/2 365/510/2 +f 365/510/2 371/534/2 369/532/2 +f 363/512/15 371/534/15 356/513/15 +f 362/521/14 361/520/14 370/535/14 +f 359/523/12 367/533/12 360/524/12 +f 357/530/10 365/510/10 358/531/10 +f 363/528/16 362/527/16 371/534/16 +f 361/508/13 360/507/13 369/532/13 +f 358/517/11 366/537/11 359/518/11 +f 375/501/10 374/500/10 377/539/10 +f 376/538/11 378/540/11 377/539/11 +f 378/540/12 380/542/12 379/541/12 +f 380/1573/13 382/544/13 381/546/13 +f 382/544/14 384/547/14 383/545/14 +f 386/551/15 372/549/15 387/550/15 +f 384/547/16 386/551/16 385/548/16 +f 382/1574/4 380/552/4 393/554/4 +f 388/561/9 396/555/9 389/557/9 +f 372/1575/4 386/558/4 388/560/4 +f 372/1576/4 388/561/4 374/562/4 +f 376/1577/4 390/563/4 378/565/4 +f 382/1578/4 393/566/4 384/568/4 +f 378/1579/4 391/569/4 380/571/4 +f 386/1580/4 384/572/4 395/574/4 +f 374/1581/4 389/575/4 376/577/4 +f 397/556/2 396/555/2 403/580/2 +f 403/580/2 402/581/2 397/556/2 +f 401/578/2 400/582/2 399/579/2 +f 399/579/2 398/583/2 397/556/2 +f 397/556/2 402/581/2 401/578/2 +f 395/559/15 403/580/15 388/560/15 +f 394/567/14 393/566/14 402/581/14 +f 391/569/12 399/579/12 392/570/12 +f 389/575/10 397/556/10 390/576/10 +f 395/574/16 394/573/16 403/580/16 +f 392/553/13 400/582/13 393/554/13 +f 390/563/11 398/583/11 391/564/11 +f 405/1582/1 404/584/1 407/586/1 +f 407/586/2 406/585/2 411/588/2 +f 411/588/3 410/587/3 409/590/3 +f 404/1583/6 408/591/6 406/585/6 +f 409/1584/7 405/592/7 411/588/7 +f 422/728/1 421/593/1 518/595/1 +f 428/606/3 429/596/3 440/598/3 +f 421/1585/17 422/599/17 433/601/17 +f 418/1586/18 419/602/18 430/604/18 +f 415/1587/19 416/605/19 427/607/19 +f 422/1588/20 423/608/20 434/600/20 +f 412/1589/21 413/610/21 425/612/21 +f 419/1590/22 420/613/22 431/603/22 +f 416/1591/23 417/615/23 428/606/23 +f 423/1592/24 412/616/24 435/609/24 +f 413/1593/25 414/617/25 424/611/25 +f 420/1594/26 421/619/26 432/614/26 +f 417/1595/27 418/620/27 429/596/27 +f 414/1596/28 415/621/28 426/618/28 +f 443/1597/22 444/622/22 455/624/22 +f 447/634/3 435/609/3 437/625/3 +f 424/611/3 426/618/3 436/627/3 +f 432/614/3 433/601/3 444/629/3 +f 441/597/3 429/596/3 442/630/3 +f 426/618/3 427/607/3 438/626/3 +f 445/628/3 433/601/3 446/632/3 +f 430/604/3 431/603/3 442/630/3 +f 427/607/3 428/606/3 439/631/3 +f 434/600/3 435/609/3 446/632/3 +f 425/612/3 424/611/3 437/625/3 +f 431/603/3 432/614/3 443/633/3 +f 449/636/3 448/643/3 452/635/3 +f 450/642/3 451/649/3 452/635/3 +f 452/635/3 453/638/3 456/623/3 +f 454/647/3 455/624/3 456/623/3 +f 456/623/3 457/645/3 449/636/3 +f 458/651/3 459/640/3 449/636/3 +f 448/643/3 450/642/3 452/635/3 +f 453/638/3 454/647/3 456/623/3 +f 457/645/3 458/651/3 449/636/3 +f 440/1598/23 441/637/23 452/635/23 +f 447/1599/24 437/639/24 459/640/24 +f 436/1600/25 438/641/25 448/643/25 +f 444/1601/26 445/644/26 456/623/26 +f 441/1602/27 442/646/27 453/638/27 +f 438/1603/28 439/648/28 450/642/28 +f 445/1604/17 446/650/17 457/645/17 +f 442/1605/18 443/652/18 454/647/18 +f 439/1606/19 440/653/19 451/649/19 +f 446/1607/20 447/654/20 458/651/20 +f 437/1608/21 436/655/21 449/636/21 +f 470/763/3 471/656/3 530/658/3 +f 478/679/1 477/659/1 490/661/1 +f 471/1609/20 470/662/20 483/664/20 +f 461/1610/21 460/665/21 472/667/21 +f 468/1611/22 467/668/22 480/670/22 +f 465/1612/23 464/671/23 477/659/23 +f 460/1613/24 471/673/24 473/666/24 +f 462/1614/25 461/674/25 474/675/25 +f 469/1615/26 468/676/26 481/677/26 +f 466/1616/27 465/678/27 478/679/27 +f 463/1617/28 462/680/28 475/681/28 +f 470/1618/17 469/682/17 482/663/17 +f 467/1619/18 466/683/18 479/669/18 +f 464/1620/19 463/684/19 476/672/19 +f 493/1621/26 492/685/26 505/687/26 +f 487/691/1 475/681/1 486/688/1 +f 482/663/1 481/677/1 494/690/1 +f 491/694/1 479/669/1 490/661/1 +f 488/696/1 476/672/1 487/691/1 +f 483/664/1 482/663/1 495/692/1 +f 484/697/1 472/667/1 485/693/1 +f 480/670/1 479/669/1 492/695/1 +f 489/660/1 477/659/1 488/696/1 +f 473/666/1 483/664/1 485/693/1 +f 486/688/1 474/675/1 484/697/1 +f 481/677/1 480/670/1 493/689/1 +f 498/700/1 496/714/1 506/698/1 +f 497/713/1 507/711/1 506/698/1 +f 506/698/1 505/687/1 504/686/1 +f 504/686/1 503/707/1 506/698/1 +f 502/699/1 501/702/1 498/700/1 +f 500/709/1 499/704/1 498/700/1 +f 496/714/1 497/713/1 506/698/1 +f 506/698/1 503/707/1 502/699/1 +f 501/702/1 500/709/1 498/700/1 +f 490/1622/27 489/701/27 502/699/27 +f 487/1623/28 486/703/28 499/704/28 +f 494/1624/17 493/705/17 506/698/17 +f 491/1625/18 490/706/18 503/707/18 +f 488/1626/19 487/708/19 500/709/19 +f 495/1627/20 494/710/20 507/711/20 +f 484/1628/21 485/712/21 496/714/21 +f 492/1629/22 491/715/22 504/686/22 +f 489/1630/23 488/716/23 501/702/23 +f 485/1631/24 495/717/24 497/713/24 +f 486/1632/25 484/718/25 498/700/25 +f 510/780/28 522/719/28 511/721/28 +f 515/733/1 419/722/1 514/724/1 +f 416/735/1 415/725/1 512/727/1 +f 423/737/1 422/728/1 519/729/1 +f 413/739/1 412/730/1 508/732/1 +f 420/740/1 419/722/1 516/734/1 +f 417/741/1 416/735/1 513/736/1 +f 509/731/1 412/730/1 519/729/1 +f 510/742/1 414/738/1 508/732/1 +f 517/594/1 421/593/1 516/734/1 +f 418/723/1 417/741/1 514/724/1 +f 415/725/1 414/738/1 511/726/1 +f 511/721/19 523/720/19 512/744/19 +f 521/754/3 460/745/3 520/747/3 +f 527/764/3 467/748/3 528/750/3 +f 524/765/3 464/751/3 525/753/3 +f 471/656/3 460/745/3 531/657/3 +f 461/746/3 462/755/3 520/747/3 +f 468/749/3 469/757/3 528/750/3 +f 525/753/3 465/752/3 526/760/3 +f 522/756/3 462/755/3 523/762/3 +f 469/757/3 470/763/3 529/758/3 +f 466/759/3 467/748/3 526/760/3 +f 463/761/3 464/751/3 523/762/3 +f 512/744/23 524/743/23 513/767/23 +f 513/767/27 525/766/27 514/769/27 +f 514/769/18 526/768/18 515/771/18 +f 515/771/22 527/770/22 516/773/22 +f 516/773/26 528/772/26 517/775/26 +f 517/1633/17 529/776/17 518/778/17 +f 508/782/25 520/779/25 510/780/25 +f 509/784/21 521/781/21 508/782/21 +f 519/785/24 531/783/24 509/784/24 +f 518/778/20 530/777/20 519/785/20 +f 532/795/1 533/786/1 534/788/1 +f 535/1634/29 539/789/29 534/788/29 +f 538/790/3 539/791/3 536/793/3 +f 537/1635/30 533/794/30 536/793/30 +f 532/795/6 534/788/6 536/793/6 +f 540/805/1 541/796/1 542/798/1 +f 543/1636/29 547/799/29 542/798/29 +f 546/800/3 547/801/3 544/803/3 +f 545/1637/30 541/804/30 544/803/30 +f 540/805/6 542/798/6 544/803/6 +f 5/808/3 1/1638/3 548/1639/3 +f 548/1639/3 935/1640/3 5/808/3 +f 936/806/3 937/1641/3 9/1642/3 +f 938/1643/3 11/1644/3 9/1642/3 +f 9/1642/3 7/807/3 936/806/3 +f 5/808/3 935/1640/3 936/806/3 +f 937/1641/3 938/1643/3 9/1642/3 +f 23/1645/1 550/1646/1 928/1647/1 +f 928/1647/1 929/811/1 61/810/1 +f 930/809/1 931/1648/1 57/1649/1 +f 57/1649/1 59/1650/1 930/809/1 +f 61/810/1 63/1651/1 928/1647/1 +f 23/1645/1 928/1647/1 63/1651/1 +f 930/809/1 59/1650/1 61/810/1 +f 3/1652/4 549/812/4 23/814/4 +f 548/1653/2 1/815/2 551/817/2 +f 553/826/1 555/818/1 552/820/1 +f 559/825/3 557/821/3 558/823/3 +f 552/1654/6 554/824/6 556/822/6 +f 557/821/7 559/825/7 553/826/7 +f 561/836/1 563/827/1 560/829/1 +f 567/835/3 565/830/3 566/832/3 +f 560/829/6 562/828/6 564/834/6 +f 565/830/7 567/835/7 561/836/7 +f 578/972/1 577/837/1 674/839/1 +f 584/850/3 585/840/3 596/842/3 +f 577/1655/17 578/843/17 589/845/17 +f 574/1656/18 575/846/18 586/848/18 +f 571/1657/19 572/849/19 583/851/19 +f 578/1658/20 579/852/20 590/844/20 +f 568/1659/21 569/854/21 581/856/21 +f 575/1660/22 576/857/22 587/847/22 +f 572/1661/23 573/859/23 584/850/23 +f 579/1662/24 568/860/24 591/853/24 +f 569/1663/25 570/861/25 580/855/25 +f 576/1664/26 577/863/26 588/858/26 +f 573/1665/27 574/864/27 585/840/27 +f 570/1666/28 571/865/28 582/862/28 +f 599/1667/22 600/866/22 611/868/22 +f 603/878/3 591/853/3 593/869/3 +f 580/855/3 582/862/3 592/871/3 +f 588/858/3 589/845/3 600/873/3 +f 597/841/3 585/840/3 598/874/3 +f 582/862/3 583/851/3 594/870/3 +f 601/872/3 589/845/3 602/876/3 +f 586/848/3 587/847/3 598/874/3 +f 583/851/3 584/850/3 595/875/3 +f 590/844/3 591/853/3 602/876/3 +f 581/856/3 580/855/3 593/869/3 +f 587/847/3 588/858/3 599/877/3 +f 605/880/3 604/887/3 608/879/3 +f 606/886/3 607/893/3 608/879/3 +f 608/879/3 609/882/3 612/867/3 +f 610/891/3 611/868/3 612/867/3 +f 612/867/3 613/889/3 605/880/3 +f 614/895/3 615/884/3 605/880/3 +f 604/887/3 606/886/3 608/879/3 +f 609/882/3 610/891/3 612/867/3 +f 613/889/3 614/895/3 605/880/3 +f 596/1668/23 597/881/23 608/879/23 +f 603/1669/24 593/883/24 615/884/24 +f 592/1670/25 594/885/25 604/887/25 +f 600/1671/26 601/888/26 612/867/26 +f 597/1672/27 598/890/27 609/882/27 +f 594/1673/28 595/892/28 606/886/28 +f 601/1674/17 602/894/17 613/889/17 +f 598/1675/18 599/896/18 610/891/18 +f 595/1676/19 596/897/19 607/893/19 +f 602/1677/20 603/898/20 614/895/20 +f 593/1678/21 592/899/21 605/880/21 +f 626/1007/3 627/900/3 686/902/3 +f 634/923/1 633/903/1 646/905/1 +f 627/1679/20 626/906/20 639/908/20 +f 617/1680/21 616/909/21 628/911/21 +f 624/1681/22 623/912/22 636/914/22 +f 621/1682/23 620/915/23 633/903/23 +f 616/1683/24 627/917/24 629/910/24 +f 618/1684/25 617/918/25 630/919/25 +f 625/1685/26 624/920/26 637/921/26 +f 622/1686/27 621/922/27 634/923/27 +f 619/1687/28 618/924/28 631/925/28 +f 626/1688/17 625/926/17 638/907/17 +f 623/1689/18 622/927/18 635/913/18 +f 620/1690/19 619/928/19 632/916/19 +f 649/1691/26 648/929/26 661/931/26 +f 643/935/1 631/925/1 642/932/1 +f 638/907/1 637/921/1 650/934/1 +f 647/938/1 635/913/1 646/905/1 +f 644/940/1 632/916/1 643/935/1 +f 639/908/1 638/907/1 651/936/1 +f 640/941/1 628/911/1 641/937/1 +f 636/914/1 635/913/1 648/939/1 +f 645/904/1 633/903/1 644/940/1 +f 629/910/1 639/908/1 641/937/1 +f 642/932/1 630/919/1 640/941/1 +f 637/921/1 636/914/1 649/933/1 +f 654/944/1 652/958/1 662/942/1 +f 653/957/1 663/955/1 662/942/1 +f 662/942/1 661/931/1 658/943/1 +f 660/930/1 659/951/1 658/943/1 +f 658/943/1 657/946/1 656/953/1 +f 656/953/1 655/948/1 658/943/1 +f 652/958/1 653/957/1 662/942/1 +f 661/931/1 660/930/1 658/943/1 +f 658/943/1 655/948/1 654/944/1 +f 646/1692/27 645/945/27 658/943/27 +f 643/1693/28 642/947/28 655/948/28 +f 650/1694/17 649/949/17 662/942/17 +f 647/1695/18 646/950/18 659/951/18 +f 644/1696/19 643/952/19 656/953/19 +f 651/1697/20 650/954/20 663/955/20 +f 640/1698/21 641/956/21 652/958/21 +f 648/1699/22 647/959/22 660/930/22 +f 645/1700/23 644/960/23 657/946/23 +f 641/1701/24 651/961/24 653/957/24 +f 642/1702/25 640/962/25 654/944/25 +f 666/1024/28 678/963/28 667/965/28 +f 671/977/1 575/966/1 670/968/1 +f 572/979/1 571/969/1 668/971/1 +f 579/981/1 578/972/1 675/973/1 +f 569/983/1 568/974/1 664/976/1 +f 576/984/1 575/966/1 672/978/1 +f 573/985/1 572/979/1 669/980/1 +f 665/975/1 568/974/1 675/973/1 +f 666/986/1 570/982/1 664/976/1 +f 673/838/1 577/837/1 672/978/1 +f 574/967/1 573/985/1 670/968/1 +f 571/969/1 570/982/1 667/970/1 +f 667/965/19 679/964/19 668/988/19 +f 677/998/3 616/989/3 676/991/3 +f 683/1008/3 623/992/3 684/994/3 +f 620/1009/3 621/995/3 680/997/3 +f 627/900/3 616/989/3 687/901/3 +f 617/990/3 618/999/3 676/991/3 +f 624/993/3 625/1001/3 684/994/3 +f 681/996/3 621/995/3 682/1004/3 +f 678/1000/3 618/999/3 679/1006/3 +f 625/1001/3 626/1007/3 685/1002/3 +f 622/1003/3 623/992/3 682/1004/3 +f 619/1005/3 620/1009/3 679/1006/3 +f 668/988/23 680/987/23 669/1011/23 +f 669/1011/27 681/1010/27 670/1013/27 +f 670/1013/18 682/1012/18 671/1015/18 +f 671/1015/22 683/1014/22 672/1017/22 +f 672/1017/26 684/1016/26 673/1019/26 +f 673/1703/17 685/1020/17 674/1022/17 +f 664/1026/25 676/1023/25 666/1024/25 +f 665/1028/21 677/1025/21 664/1026/21 +f 675/1029/24 687/1027/24 665/1028/24 +f 674/1022/20 686/1021/20 675/1029/20 +f 698/1166/1 697/1030/1 794/1032/1 +f 704/1043/3 705/1033/3 716/1035/3 +f 697/1704/17 698/1036/17 709/1038/17 +f 694/1705/18 695/1039/18 706/1041/18 +f 691/1706/19 692/1042/19 703/1044/19 +f 698/1707/20 699/1045/20 710/1037/20 +f 688/1708/21 689/1047/21 701/1049/21 +f 695/1709/22 696/1050/22 707/1040/22 +f 692/1710/23 693/1052/23 704/1043/23 +f 699/1711/24 688/1053/24 711/1046/24 +f 689/1712/25 690/1054/25 700/1048/25 +f 696/1713/26 697/1056/26 708/1051/26 +f 693/1714/27 694/1057/27 705/1033/27 +f 690/1715/28 691/1058/28 702/1055/28 +f 719/1716/22 720/1059/22 731/1061/22 +f 723/1071/3 711/1046/3 713/1062/3 +f 700/1048/3 702/1055/3 712/1064/3 +f 708/1051/3 709/1038/3 720/1066/3 +f 717/1034/3 705/1033/3 718/1067/3 +f 702/1055/3 703/1044/3 714/1063/3 +f 721/1065/3 709/1038/3 722/1069/3 +f 706/1041/3 707/1040/3 718/1067/3 +f 703/1044/3 704/1043/3 715/1068/3 +f 710/1037/3 711/1046/3 722/1069/3 +f 701/1049/3 700/1048/3 713/1062/3 +f 707/1040/3 708/1051/3 719/1070/3 +f 725/1073/3 724/1080/3 728/1072/3 +f 726/1079/3 727/1086/3 728/1072/3 +f 728/1072/3 729/1075/3 732/1060/3 +f 730/1084/3 731/1061/3 732/1060/3 +f 732/1060/3 733/1082/3 725/1073/3 +f 734/1088/3 735/1077/3 725/1073/3 +f 724/1080/3 726/1079/3 728/1072/3 +f 729/1075/3 730/1084/3 732/1060/3 +f 733/1082/3 734/1088/3 725/1073/3 +f 716/1717/23 717/1074/23 728/1072/23 +f 723/1718/24 713/1076/24 735/1077/24 +f 712/1719/25 714/1078/25 724/1080/25 +f 720/1720/26 721/1081/26 732/1060/26 +f 717/1721/27 718/1083/27 729/1075/27 +f 714/1722/28 715/1085/28 726/1079/28 +f 721/1723/17 722/1087/17 733/1082/17 +f 718/1724/18 719/1089/18 730/1084/18 +f 715/1725/19 716/1090/19 727/1086/19 +f 722/1726/20 723/1091/20 734/1088/20 +f 713/1727/21 712/1092/21 725/1073/21 +f 746/1200/3 747/1093/3 806/1095/3 +f 754/1116/1 753/1096/1 766/1098/1 +f 747/1728/20 746/1099/20 759/1101/20 +f 737/1729/21 736/1102/21 748/1104/21 +f 744/1730/22 743/1105/22 756/1107/22 +f 741/1731/23 740/1108/23 753/1096/23 +f 736/1732/24 747/1110/24 749/1103/24 +f 738/1733/25 737/1111/25 750/1112/25 +f 745/1734/26 744/1113/26 757/1114/26 +f 742/1735/27 741/1115/27 754/1116/27 +f 739/1736/28 738/1117/28 751/1118/28 +f 746/1737/17 745/1119/17 758/1100/17 +f 743/1738/18 742/1120/18 755/1106/18 +f 740/1739/19 739/1121/19 752/1109/19 +f 769/1740/26 768/1122/26 781/1124/26 +f 763/1128/1 751/1118/1 762/1125/1 +f 758/1100/1 757/1114/1 770/1127/1 +f 767/1131/1 755/1106/1 766/1098/1 +f 764/1133/1 752/1109/1 763/1128/1 +f 759/1101/1 758/1100/1 771/1129/1 +f 760/1134/1 748/1104/1 761/1130/1 +f 756/1107/1 755/1106/1 768/1132/1 +f 765/1097/1 753/1096/1 764/1133/1 +f 749/1103/1 759/1101/1 761/1130/1 +f 762/1125/1 750/1112/1 760/1134/1 +f 757/1114/1 756/1107/1 769/1126/1 +f 774/1141/1 772/1151/1 773/1137/1 +f 773/1137/1 783/1149/1 782/1135/1 +f 782/1135/1 781/1124/1 780/1123/1 +f 780/1123/1 779/1145/1 782/1135/1 +f 778/1136/1 777/1139/1 774/1141/1 +f 776/1147/1 775/1142/1 774/1141/1 +f 774/1141/1 773/1137/1 778/1136/1 +f 782/1135/1 779/1145/1 778/1136/1 +f 777/1139/1 776/1147/1 774/1141/1 +f 766/1741/27 765/1138/27 778/1136/27 +f 763/1742/28 762/1140/28 775/1142/28 +f 770/1743/17 769/1143/17 782/1135/17 +f 767/1744/18 766/1144/18 779/1145/18 +f 764/1745/19 763/1146/19 776/1147/19 +f 771/1746/20 770/1148/20 783/1149/20 +f 760/1747/21 761/1150/21 772/1151/21 +f 768/1748/22 767/1152/22 780/1123/22 +f 765/1749/23 764/1153/23 777/1139/23 +f 761/1750/24 771/1154/24 773/1137/24 +f 762/1751/25 760/1155/25 774/1141/25 +f 786/1217/28 798/1156/28 787/1158/28 +f 791/1170/1 695/1159/1 790/1161/1 +f 692/1172/1 691/1162/1 788/1164/1 +f 795/1174/1 699/1165/1 794/1032/1 +f 689/1175/1 688/1167/1 784/1169/1 +f 696/1177/1 695/1159/1 792/1171/1 +f 693/1178/1 692/1172/1 789/1173/1 +f 785/1168/1 688/1167/1 795/1174/1 +f 690/1179/1 689/1175/1 786/1176/1 +f 793/1031/1 697/1030/1 792/1171/1 +f 694/1160/1 693/1178/1 790/1161/1 +f 691/1162/1 690/1179/1 787/1163/1 +f 787/1158/19 799/1157/19 788/1181/19 +f 797/1191/3 736/1182/3 796/1184/3 +f 803/1201/3 743/1185/3 804/1187/3 +f 800/1202/3 740/1188/3 801/1190/3 +f 747/1093/3 736/1182/3 807/1094/3 +f 737/1183/3 738/1192/3 796/1184/3 +f 744/1186/3 745/1194/3 804/1187/3 +f 801/1190/3 741/1189/3 802/1197/3 +f 798/1193/3 738/1192/3 799/1199/3 +f 745/1194/3 746/1200/3 805/1195/3 +f 742/1196/3 743/1185/3 802/1197/3 +f 739/1198/3 740/1188/3 799/1199/3 +f 788/1181/23 800/1180/23 789/1204/23 +f 789/1204/27 801/1203/27 790/1206/27 +f 790/1206/18 802/1205/18 791/1208/18 +f 791/1208/22 803/1207/22 792/1210/22 +f 792/1210/26 804/1209/26 793/1212/26 +f 793/1752/17 805/1213/17 794/1215/17 +f 784/1219/25 796/1216/25 786/1217/25 +f 785/1221/21 797/1218/21 784/1219/21 +f 795/1222/24 807/1220/24 785/1221/24 +f 794/1215/20 806/1214/20 795/1222/20 +f 818/1358/1 817/1223/1 914/1225/1 +f 824/1236/3 825/1226/3 836/1228/3 +f 817/1753/17 818/1229/17 829/1231/17 +f 814/1754/18 815/1232/18 826/1234/18 +f 811/1755/19 812/1235/19 823/1237/19 +f 818/1756/20 819/1238/20 830/1230/20 +f 808/1757/21 809/1240/21 821/1242/21 +f 815/1758/22 816/1243/22 827/1233/22 +f 812/1759/23 813/1245/23 824/1236/23 +f 819/1760/24 808/1246/24 831/1239/24 +f 809/1761/25 810/1247/25 820/1241/25 +f 816/1762/26 817/1249/26 828/1244/26 +f 813/1763/27 814/1250/27 825/1226/27 +f 810/1764/28 811/1251/28 822/1248/28 +f 839/1765/22 840/1252/22 851/1254/22 +f 843/1264/3 831/1239/3 833/1255/3 +f 820/1241/3 822/1248/3 832/1257/3 +f 828/1244/3 829/1231/3 840/1259/3 +f 837/1227/3 825/1226/3 838/1260/3 +f 822/1248/3 823/1237/3 834/1256/3 +f 841/1258/3 829/1231/3 842/1262/3 +f 826/1234/3 827/1233/3 838/1260/3 +f 823/1237/3 824/1236/3 835/1261/3 +f 830/1230/3 831/1239/3 842/1262/3 +f 821/1242/3 820/1241/3 833/1255/3 +f 827/1233/3 828/1244/3 839/1263/3 +f 845/1266/3 844/1273/3 848/1265/3 +f 846/1272/3 847/1279/3 848/1265/3 +f 848/1265/3 849/1268/3 852/1253/3 +f 850/1277/3 851/1254/3 852/1253/3 +f 852/1253/3 853/1275/3 845/1266/3 +f 854/1281/3 855/1270/3 845/1266/3 +f 844/1273/3 846/1272/3 848/1265/3 +f 849/1268/3 850/1277/3 852/1253/3 +f 853/1275/3 854/1281/3 845/1266/3 +f 836/1766/23 837/1267/23 848/1265/23 +f 843/1767/24 833/1269/24 855/1270/24 +f 832/1768/25 834/1271/25 844/1273/25 +f 840/1769/26 841/1274/26 852/1253/26 +f 837/1770/27 838/1276/27 849/1268/27 +f 834/1771/28 835/1278/28 846/1272/28 +f 841/1772/17 842/1280/17 853/1275/17 +f 838/1773/18 839/1282/18 850/1277/18 +f 835/1774/19 836/1283/19 847/1279/19 +f 842/1775/20 843/1284/20 854/1281/20 +f 833/1776/21 832/1285/21 845/1266/21 +f 866/1393/3 867/1286/3 926/1288/3 +f 874/1309/1 873/1289/1 886/1291/1 +f 867/1777/20 866/1292/20 879/1294/20 +f 857/1778/21 856/1295/21 868/1297/21 +f 864/1779/22 863/1298/22 876/1300/22 +f 861/1780/23 860/1301/23 873/1289/23 +f 856/1781/24 867/1303/24 869/1296/24 +f 858/1782/25 857/1304/25 870/1305/25 +f 865/1783/26 864/1306/26 877/1307/26 +f 862/1784/27 861/1308/27 874/1309/27 +f 859/1785/28 858/1310/28 871/1311/28 +f 866/1786/17 865/1312/17 878/1293/17 +f 863/1787/18 862/1313/18 875/1299/18 +f 860/1788/19 859/1314/19 872/1302/19 +f 889/1789/26 888/1315/26 901/1317/26 +f 883/1321/1 871/1311/1 882/1318/1 +f 878/1293/1 877/1307/1 890/1320/1 +f 887/1324/1 875/1299/1 886/1291/1 +f 884/1326/1 872/1302/1 883/1321/1 +f 879/1294/1 878/1293/1 891/1322/1 +f 880/1327/1 868/1297/1 881/1323/1 +f 876/1300/1 875/1299/1 888/1325/1 +f 885/1290/1 873/1289/1 884/1326/1 +f 869/1296/1 879/1294/1 881/1323/1 +f 882/1318/1 870/1305/1 880/1327/1 +f 877/1307/1 876/1300/1 889/1319/1 +f 894/1330/1 892/1344/1 902/1328/1 +f 893/1343/1 903/1341/1 902/1328/1 +f 902/1328/1 901/1317/1 900/1316/1 +f 900/1316/1 899/1337/1 902/1328/1 +f 898/1329/1 897/1332/1 894/1330/1 +f 896/1339/1 895/1334/1 894/1330/1 +f 892/1344/1 893/1343/1 902/1328/1 +f 902/1328/1 899/1337/1 898/1329/1 +f 897/1332/1 896/1339/1 894/1330/1 +f 886/1790/27 885/1331/27 898/1329/27 +f 883/1791/28 882/1333/28 895/1334/28 +f 890/1792/17 889/1335/17 902/1328/17 +f 887/1793/18 886/1336/18 899/1337/18 +f 884/1794/19 883/1338/19 896/1339/19 +f 891/1795/20 890/1340/20 903/1341/20 +f 880/1796/21 881/1342/21 892/1344/21 +f 888/1797/22 887/1345/22 900/1316/22 +f 885/1798/23 884/1346/23 897/1332/23 +f 881/1799/24 891/1347/24 893/1343/24 +f 882/1800/25 880/1348/25 894/1330/25 +f 906/1410/28 918/1349/28 907/1351/28 +f 911/1363/1 815/1352/1 910/1354/1 +f 812/1365/1 811/1355/1 908/1357/1 +f 819/1367/1 818/1358/1 915/1359/1 +f 809/1369/1 808/1360/1 904/1362/1 +f 816/1370/1 815/1352/1 912/1364/1 +f 813/1371/1 812/1365/1 909/1366/1 +f 905/1361/1 808/1360/1 915/1359/1 +f 906/1372/1 810/1368/1 904/1362/1 +f 913/1224/1 817/1223/1 912/1364/1 +f 814/1353/1 813/1371/1 910/1354/1 +f 811/1355/1 810/1368/1 907/1356/1 +f 907/1351/19 919/1350/19 908/1374/19 +f 917/1384/3 856/1375/3 916/1377/3 +f 923/1394/3 863/1378/3 924/1380/3 +f 920/1395/3 860/1381/3 921/1383/3 +f 867/1286/3 856/1375/3 927/1287/3 +f 857/1376/3 858/1385/3 916/1377/3 +f 864/1379/3 865/1387/3 924/1380/3 +f 921/1383/3 861/1382/3 922/1390/3 +f 918/1386/3 858/1385/3 919/1392/3 +f 865/1387/3 866/1393/3 925/1388/3 +f 862/1389/3 863/1378/3 922/1390/3 +f 859/1391/3 860/1381/3 919/1392/3 +f 908/1374/23 920/1373/23 909/1397/23 +f 909/1397/27 921/1396/27 910/1399/27 +f 910/1399/18 922/1398/18 911/1401/18 +f 911/1401/22 923/1400/22 912/1403/22 +f 912/1403/26 924/1402/26 913/1405/26 +f 913/1801/17 925/1406/17 914/1408/17 +f 904/1412/25 916/1409/25 906/1410/25 +f 905/1414/21 917/1411/21 904/1412/21 +f 915/1415/24 927/1413/24 905/1414/24 +f 914/1408/20 926/1407/20 915/1415/20 +f 13/1418/3 11/1802/3 938/1803/3 +f 938/1803/3 939/1804/3 13/1418/3 +f 940/1416/3 941/1805/3 17/1806/3 +f 549/1807/3 3/1808/3 17/1806/3 +f 17/1806/3 15/1417/3 940/1416/3 +f 13/1418/3 939/1804/3 940/1416/3 +f 941/1805/3 549/1807/3 17/1806/3 +f 55/1421/1 57/1809/1 931/1810/1 +f 931/1810/1 932/1811/1 55/1421/1 +f 933/1419/1 934/1812/1 21/1813/1 +f 551/1814/1 25/1815/1 21/1813/1 +f 21/1813/1 19/1420/1 933/1419/1 +f 55/1421/1 932/1811/1 933/1419/1 +f 934/1812/1 551/1814/1 21/1813/1 diff --git a/assets/hbm/sounds.json b/assets/hbm/sounds.json index dae0311b6..214062f07 100644 --- a/assets/hbm/sounds.json +++ b/assets/hbm/sounds.json @@ -29,7 +29,8 @@ "weapon.tauShoot": {"category": "player", "sounds": [{"name": "weapon/tauShoot", "stream": false}]}, "weapon.tauChargeLoop2": {"category": "player", "sounds": [{"name": "weapon/tauChargeLoop2", "stream": true}]}, - "weapon.revolverShoot": {"category": "player", "sounds": [{"name": "weapon/revolverShoot", "stream": false}]}, + "weapon.revolverShoot": {"category": "player", "sounds": [{"name": "weapon/revolverShoot", "stream": false}]}, + "weapon.revolverShootAlt": {"category": "player", "sounds": [{"name": "weapon/revolverShootAlt", "stream": false}]}, "weapon.heavyShoot": {"category": "player", "sounds": [{"name": "weapon/heavyShoot", "stream": false}]}, "weapon.shotgunShoot": {"category": "player", "sounds": [{"name": "weapon/shotgunShoot", "stream": false}]}, "weapon.schrabidiumShoot": {"category": "player", "sounds": [{"name": "weapon/schrabidiumShoot", "stream": false}]}, @@ -62,5 +63,8 @@ "entity.chopperDamage": {"category": "hostile", "sounds": [{"name": "entity/chopperDamage", "stream": true}]}, "entity.chopperMineLoop": {"category": "hostile", "sounds": [{"name": "entity/chopperMineLoop", "stream": false}]}, "entity.chopperCrashingLoop": {"category": "hostile", "sounds": [{"name": "entity/chopperCrashingLoop", "stream": true}]}, - "entity.oldExplosion": {"category": "ambient", "sounds": [{"name": "entity/oldExplosion", "stream": false}]} + "entity.oldExplosion": {"category": "ambient", "sounds": [{"name": "entity/oldExplosion", "stream": false}]}, + + "alarm.trainHorn": {"category": "record", "sounds": [{"name": "alarm/trainHorn", "stream": false}]}, + "alarm.razortrainHorn": {"category": "record", "sounds": [{"name": "alarm/razortrainHorn", "stream": false}]} } diff --git a/assets/hbm/sounds/alarm/razortrainHorn.ogg b/assets/hbm/sounds/alarm/razortrainHorn.ogg new file mode 100644 index 000000000..16786f7ba Binary files /dev/null and b/assets/hbm/sounds/alarm/razortrainHorn.ogg differ diff --git a/assets/hbm/sounds/alarm/trainHorn.ogg b/assets/hbm/sounds/alarm/trainHorn.ogg new file mode 100644 index 000000000..b54cf2b4c Binary files /dev/null and b/assets/hbm/sounds/alarm/trainHorn.ogg differ diff --git a/assets/hbm/sounds/weapon/revolverShootAlt.ogg b/assets/hbm/sounds/weapon/revolverShootAlt.ogg new file mode 100644 index 000000000..f4990601c Binary files /dev/null and b/assets/hbm/sounds/weapon/revolverShootAlt.ogg differ diff --git a/assets/hbm/textures/blocks/boxcar.png b/assets/hbm/textures/blocks/boxcar.png new file mode 100644 index 000000000..3913c43e9 Binary files /dev/null and b/assets/hbm/textures/blocks/boxcar.png differ diff --git a/assets/hbm/textures/gui/gui_ams_base.png b/assets/hbm/textures/gui/gui_ams_base.png index 2de3c50f6..b89077159 100644 Binary files a/assets/hbm/textures/gui/gui_ams_base.png and b/assets/hbm/textures/gui/gui_ams_base.png differ diff --git a/assets/hbm/textures/items/battery_spark.png b/assets/hbm/textures/items/battery_spark.png new file mode 100644 index 000000000..411413788 Binary files /dev/null and b/assets/hbm/textures/items/battery_spark.png differ diff --git a/assets/hbm/textures/items/battery_spark_cell_25.png b/assets/hbm/textures/items/battery_spark_cell_25.png new file mode 100644 index 000000000..54cb53a86 Binary files /dev/null and b/assets/hbm/textures/items/battery_spark_cell_25.png differ diff --git a/assets/hbm/textures/items/battery_spark_cell_6.png b/assets/hbm/textures/items/battery_spark_cell_6.png new file mode 100644 index 000000000..3b525dafd Binary files /dev/null and b/assets/hbm/textures/items/battery_spark_cell_6.png differ diff --git a/assets/hbm/textures/items/battery_su.png b/assets/hbm/textures/items/battery_su.png new file mode 100644 index 000000000..82440d819 Binary files /dev/null and b/assets/hbm/textures/items/battery_su.png differ diff --git a/assets/hbm/textures/items/battery_su_l.png b/assets/hbm/textures/items/battery_su_l.png new file mode 100644 index 000000000..e78387cf0 Binary files /dev/null and b/assets/hbm/textures/items/battery_su_l.png differ diff --git a/assets/hbm/textures/items/bottle_sparkle.png b/assets/hbm/textures/items/bottle_sparkle.png new file mode 100644 index 000000000..3687eee19 Binary files /dev/null and b/assets/hbm/textures/items/bottle_sparkle.png differ diff --git a/assets/hbm/textures/items/cap_sparkle.png b/assets/hbm/textures/items/cap_sparkle.png new file mode 100644 index 000000000..796b007f4 Binary files /dev/null and b/assets/hbm/textures/items/cap_sparkle.png differ diff --git a/assets/hbm/textures/items/gun_revolver_pip.png b/assets/hbm/textures/items/gun_revolver_pip.png new file mode 100644 index 000000000..f524b1d6b Binary files /dev/null and b/assets/hbm/textures/items/gun_revolver_pip.png differ diff --git a/assets/hbm/textures/items/gun_revolver_pip_alt.png b/assets/hbm/textures/items/gun_revolver_pip_alt.png new file mode 100644 index 000000000..dd888d23b Binary files /dev/null and b/assets/hbm/textures/items/gun_revolver_pip_alt.png differ diff --git a/assets/hbm/textures/items/gun_revolver_pip_ammo.png b/assets/hbm/textures/items/gun_revolver_pip_ammo.png new file mode 100644 index 000000000..e204667a4 Binary files /dev/null and b/assets/hbm/textures/items/gun_revolver_pip_ammo.png differ diff --git a/assets/hbm/textures/items/ingot_cyrophyr.png b/assets/hbm/textures/items/ingot_dineutronium.png similarity index 100% rename from assets/hbm/textures/items/ingot_cyrophyr.png rename to assets/hbm/textures/items/ingot_dineutronium.png diff --git a/assets/hbm/textures/items/nugget_dineutronium.png b/assets/hbm/textures/items/nugget_dineutronium.png new file mode 100644 index 000000000..08caf43c4 Binary files /dev/null and b/assets/hbm/textures/items/nugget_dineutronium.png differ diff --git a/assets/hbm/textures/items/ore_cluster_bg.png b/assets/hbm/textures/items/ore_cluster_bg.png new file mode 100644 index 000000000..5611489a9 Binary files /dev/null and b/assets/hbm/textures/items/ore_cluster_bg.png differ diff --git a/assets/hbm/textures/items/ore_cluster_fg.png b/assets/hbm/textures/items/ore_cluster_fg.png new file mode 100644 index 000000000..50e732064 Binary files /dev/null and b/assets/hbm/textures/items/ore_cluster_fg.png differ diff --git a/assets/hbm/textures/items/ore_cluster_tikite.png b/assets/hbm/textures/items/ore_cluster_tikite.png new file mode 100644 index 000000000..635bc7b32 Binary files /dev/null and b/assets/hbm/textures/items/ore_cluster_tikite.png differ diff --git a/assets/hbm/textures/items/powder_euphemium.png b/assets/hbm/textures/items/powder_euphemium.png new file mode 100644 index 000000000..e5880acca Binary files /dev/null and b/assets/hbm/textures/items/powder_euphemium.png differ diff --git a/assets/hbm/textures/items/powder_meteorite.png b/assets/hbm/textures/items/powder_meteorite.png new file mode 100644 index 000000000..139b29b5c Binary files /dev/null and b/assets/hbm/textures/items/powder_meteorite.png differ diff --git a/assets/hbm/textures/items/powder_meteorite_tiny.png b/assets/hbm/textures/items/powder_meteorite_tiny.png new file mode 100644 index 000000000..b206350ad Binary files /dev/null and b/assets/hbm/textures/items/powder_meteorite_tiny.png differ diff --git a/assets/hbm/textures/items/powder_spark_mix.png b/assets/hbm/textures/items/powder_spark_mix.png new file mode 100644 index 000000000..74c3907f4 Binary files /dev/null and b/assets/hbm/textures/items/powder_spark_mix.png differ diff --git a/assets/hbm/textures/models/ModelPip.png b/assets/hbm/textures/models/ModelPip.png new file mode 100755 index 000000000..40c63f03e Binary files /dev/null and b/assets/hbm/textures/models/ModelPip.png differ diff --git a/assets/hbm/textures/models/boxcar.png b/assets/hbm/textures/models/boxcar.png new file mode 100644 index 000000000..0e7ef4b1d Binary files /dev/null and b/assets/hbm/textures/models/boxcar.png differ diff --git a/assets/hbm/textures/models/boxcar_wf.png b/assets/hbm/textures/models/boxcar_wf.png new file mode 100644 index 000000000..c8b527567 Binary files /dev/null and b/assets/hbm/textures/models/boxcar_wf.png differ diff --git a/com/hbm/blocks/ModBlocks.java b/com/hbm/blocks/ModBlocks.java index 7fc06c2c1..35a68fec7 100644 --- a/com/hbm/blocks/ModBlocks.java +++ b/com/hbm/blocks/ModBlocks.java @@ -166,6 +166,7 @@ public class ModBlocks { public static Block rejuvinator; public static Block crate; + public static Block boxcar; public static Block seal_frame; public static Block seal_controller; @@ -449,6 +450,8 @@ public class ModBlocks { public static Block dummy_port_ams_limiter; public static Block dummy_block_ams_emitter; public static Block dummy_port_ams_emitter; + public static Block dummy_block_ams_base; + public static Block dummy_port_ams_base; private static void initializeBlock() { @@ -726,6 +729,8 @@ public class ModBlocks { crate = new BlockCrate(Material.iron).setBlockName("crate").setStepSound(Block.soundTypeWood).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabNuke).setBlockTextureName(RefStrings.MODID + ":crate"); crate_iron = new BlockStorageCrate(Material.iron).setBlockName("crate_iron").setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock); crate_steel = new BlockStorageCrate(Material.iron).setBlockName("crate_steel").setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock); + + boxcar = new DecoBlock(Material.iron).setBlockName("boxcar").setStepSound(Block.soundTypeMetal).setHardness(10.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabNuke).setBlockTextureName(RefStrings.MODID + ":boxcar"); machine_well = new MachineOilWell(Material.iron).setBlockName("machine_well").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.tabBlock).setBlockTextureName(RefStrings.MODID + ":machine_well"); machine_pumpjack = new MachinePumpjack(Material.iron).setBlockName("machine_pumpjack").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.tabBlock).setBlockTextureName(RefStrings.MODID + ":machine_pumpjack"); @@ -794,6 +799,8 @@ public class ModBlocks { dummy_port_ams_limiter = new DummyBlockAMSLimiter(Material.iron).setBlockName("dummy_port_ams_limiter").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); dummy_block_ams_emitter = new DummyBlockAMSEmitter(Material.iron).setBlockName("dummy_block_ams_emitter").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); dummy_port_ams_emitter = new DummyBlockAMSEmitter(Material.iron).setBlockName("dummy_port_ams_emitter").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); + dummy_block_ams_base = new DummyBlockAMSBase(Material.iron).setBlockName("dummy_block_ams_base").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); + dummy_port_ams_base = new DummyBlockAMSBase(Material.iron).setBlockName("dummy_port_ams_base").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); } private static void registerBlock() { @@ -969,6 +976,9 @@ public class ModBlocks { GameRegistry.registerBlock(crate_iron, crate_iron.getUnlocalizedName()); GameRegistry.registerBlock(crate_steel, crate_steel.getUnlocalizedName()); + //Junk + GameRegistry.registerBlock(boxcar, boxcar.getUnlocalizedName()); + //Machines GameRegistry.registerBlock(machine_press, machine_press.getUnlocalizedName()); GameRegistry.registerBlock(machine_difurnace_off, machine_difurnace_off.getUnlocalizedName()); @@ -1131,6 +1141,8 @@ public class ModBlocks { GameRegistry.registerBlock(dummy_port_ams_limiter, dummy_port_ams_limiter.getUnlocalizedName()); GameRegistry.registerBlock(dummy_block_ams_emitter, dummy_block_ams_emitter.getUnlocalizedName()); GameRegistry.registerBlock(dummy_port_ams_emitter, dummy_port_ams_emitter.getUnlocalizedName()); + GameRegistry.registerBlock(dummy_block_ams_base, dummy_block_ams_base.getUnlocalizedName()); + GameRegistry.registerBlock(dummy_port_ams_base, dummy_port_ams_base.getUnlocalizedName()); //Other Technical Blocks GameRegistry.registerBlock(oil_pipe, oil_pipe.getUnlocalizedName()); diff --git a/com/hbm/blocks/generic/DecoBlock.java b/com/hbm/blocks/generic/DecoBlock.java index f20888cb8..93d603e0e 100644 --- a/com/hbm/blocks/generic/DecoBlock.java +++ b/com/hbm/blocks/generic/DecoBlock.java @@ -1,12 +1,23 @@ package com.hbm.blocks.generic; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + import com.hbm.blocks.ModBlocks; +import com.hbm.items.ModItems; +import com.hbm.tileentity.bomb.TileEntityNukeGadget; import com.hbm.tileentity.deco.TileEntityDecoBlock; +import net.minecraft.block.Block; 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.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MathHelper; @@ -14,6 +25,8 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; public class DecoBlock extends BlockContainer { + + Random rand = new Random(); public DecoBlock(Material p_i45386_1_) { super(p_i45386_1_); @@ -39,6 +52,14 @@ public class DecoBlock extends BlockContainer { return false; } + @Override + public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) + { + if(this == ModBlocks.boxcar) + return null; + return Item.getItemFromBlock(this); + } + @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack itemStack) { int i = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; @@ -187,4 +208,56 @@ public class DecoBlock extends BlockContainer { return AxisAlignedBB.getBoundingBox(x + this.minX, y + this.minY, z + this.minZ, x + this.maxX, y + this.maxY, z + this.maxZ); } + @Override + public void breakBlock(World world, int x, int y, int z, Block b, int i) { + + if (b == ModBlocks.boxcar) { + + List list = new ArrayList(); + list.add(new ItemStack(ModItems.ingot_steel, 5 + rand.nextInt(16))); + list.add(new ItemStack(ModItems.plate_steel, 15 + rand.nextInt(31))); + list.add(new ItemStack(Items.iron_ingot, 5 + rand.nextInt(11))); + list.add(new ItemStack(ModBlocks.block_steel, 1 + rand.nextInt(3))); + list.add(new ItemStack(ModBlocks.crate, 1 + rand.nextInt(6))); + + for (int i1 = 0; i1 < list.size(); ++i1) { + ItemStack itemstack = list.get(i1).copy(); + + if (itemstack != null) { + float f = this.rand.nextFloat() * 0.8F + 0.1F; + float f1 = this.rand.nextFloat() * 0.8F + 0.1F; + float f2 = this.rand.nextFloat() * 0.8F + 0.1F; + + while (itemstack.stackSize > 0) { + int j1 = this.rand.nextInt(21) + 10; + + if (j1 > itemstack.stackSize) { + j1 = itemstack.stackSize; + } + + itemstack.stackSize -= j1; + EntityItem entityitem = new EntityItem(world, x + f, y + f1, + z + f2, + new ItemStack(itemstack.getItem(), j1, itemstack.getItemDamage())); + + if (itemstack.hasTagCompound()) { + entityitem.getEntityItem() + .setTagCompound((NBTTagCompound) itemstack.getTagCompound().copy()); + } + + float f3 = 0.05F; + entityitem.motionX = (float) this.rand.nextGaussian() * f3; + entityitem.motionY = (float) this.rand.nextGaussian() * f3 + 0.2F; + entityitem.motionZ = (float) this.rand.nextGaussian() * f3; + world.spawnEntityInWorld(entityitem); + } + } + } + + world.func_147453_f(x, y, z, b); + } + + super.breakBlock(world, x, y, z, b, i); + } + } diff --git a/com/hbm/blocks/machine/BlockAMSBase.java b/com/hbm/blocks/machine/BlockAMSBase.java index baf5ff944..5f20487a3 100644 --- a/com/hbm/blocks/machine/BlockAMSBase.java +++ b/com/hbm/blocks/machine/BlockAMSBase.java @@ -1,18 +1,23 @@ package com.hbm.blocks.machine; import com.hbm.blocks.ModBlocks; +import com.hbm.handler.MultiblockHandler; +import com.hbm.interfaces.IMultiblock; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityAMSBase; import com.hbm.tileentity.machine.TileEntityAMSEmitter; +import com.hbm.tileentity.machine.TileEntityDummy; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -public class BlockAMSBase extends BlockContainer { +public class BlockAMSBase extends BlockContainer implements IMultiblock { public BlockAMSBase(Material p_i45386_1_) { super(p_i45386_1_); @@ -56,4 +61,49 @@ public class BlockAMSBase extends BlockContainer { return false; } + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack itemStack) { + + if(MultiblockHandler.checkSpace(world, x, y, z, MultiblockHandler.AMSBaseDimension)) { + MultiblockHandler.fillUp(world, x, y, z, MultiblockHandler.AMSBaseDimension, ModBlocks.dummy_block_ams_base); + + DummyBlockAMSBase.safeBreak = true; + world.setBlock(x + 1, y, z, ModBlocks.dummy_port_ams_base); + TileEntity te = world.getTileEntity(x + 1, y, z); + if(te instanceof TileEntityDummy) { + TileEntityDummy dummy = (TileEntityDummy)te; + dummy.targetX = x; + dummy.targetY = y; + dummy.targetZ = z; + } + world.setBlock(x, y, z - 1, ModBlocks.dummy_port_ams_base); + TileEntity te2 = world.getTileEntity(x, y, z - 1); + if(te instanceof TileEntityDummy) { + TileEntityDummy dummy = (TileEntityDummy)te2; + dummy.targetX = x; + dummy.targetY = y; + dummy.targetZ = z; + } + world.setBlock(x - 1, y, z, ModBlocks.dummy_port_ams_base); + TileEntity te3 = world.getTileEntity(x - 1, y, z); + if(te3 instanceof TileEntityDummy) { + TileEntityDummy dummy = (TileEntityDummy)te3; + dummy.targetX = x; + dummy.targetY = y; + dummy.targetZ = z; + } + world.setBlock(x, y, z + 1, ModBlocks.dummy_port_ams_base); + TileEntity te4 = world.getTileEntity(x, y , z + 1); + if(te4 instanceof TileEntityDummy) { + TileEntityDummy dummy = (TileEntityDummy)te4; + dummy.targetX = x; + dummy.targetY = y; + dummy.targetZ = z; + } + DummyBlockAMSBase.safeBreak = false; + + } else + world.func_147480_a(x, y, z, true); + } + } diff --git a/com/hbm/blocks/machine/DummyBlockAMSBase.java b/com/hbm/blocks/machine/DummyBlockAMSBase.java new file mode 100644 index 000000000..4eb3fd137 --- /dev/null +++ b/com/hbm/blocks/machine/DummyBlockAMSBase.java @@ -0,0 +1,106 @@ +package com.hbm.blocks.machine; + +import java.util.Random; + +import com.hbm.blocks.ModBlocks; +import com.hbm.interfaces.IDummy; +import com.hbm.main.MainRegistry; +import com.hbm.tileentity.machine.TileEntityAMSBase; +import com.hbm.tileentity.machine.TileEntityAMSEmitter; +import com.hbm.tileentity.machine.TileEntityDummy; + +import cpw.mods.fml.common.network.internal.FMLNetworkHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +public class DummyBlockAMSBase extends BlockContainer implements IDummy { + + public static boolean safeBreak = false; + + public DummyBlockAMSBase(Material p_i45386_1_) { + super(p_i45386_1_); + } + + @Override + public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { + return new TileEntityDummy(); + } + + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int i) + { + if(!safeBreak) { + TileEntity te = world.getTileEntity(x, y, z); + if(te != null && te instanceof TileEntityDummy) { + int a = ((TileEntityDummy)te).targetX; + int b = ((TileEntityDummy)te).targetY; + int c = ((TileEntityDummy)te).targetZ; + + //world.getBlock(a, b, c).breakBlock(world, a, b, c, block, i); + if(!world.isRemote) + world.func_147480_a(a, b, c, true); + } + } + world.removeTileEntity(x, y, z); + } + + @Override + public int getRenderType() { + return -1; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) + { + return null; + } + + @Override + @SideOnly(Side.CLIENT) + public Item getItem(World world, int x, int y, int z) + { + return Item.getItemFromBlock(ModBlocks.ams_base); + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { + if(world.isRemote) + { + return true; + } else if(!player.isSneaking()) + { + TileEntity te = world.getTileEntity(x, y, z); + if(te != null && te instanceof TileEntityDummy) { + int a = ((TileEntityDummy)te).targetX; + int b = ((TileEntityDummy)te).targetY; + int c = ((TileEntityDummy)te).targetZ; + + TileEntityAMSBase entity = (TileEntityAMSBase) world.getTileEntity(a, b, c); + if(entity != null) + { + FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_ams_base, world, a, b, c); + } + } + return true; + } else { + return false; + } + } +} diff --git a/com/hbm/entity/projectile/EntityBoxcar.java b/com/hbm/entity/projectile/EntityBoxcar.java new file mode 100644 index 000000000..2c24c3878 --- /dev/null +++ b/com/hbm/entity/projectile/EntityBoxcar.java @@ -0,0 +1,77 @@ +package com.hbm.entity.projectile; + +import java.util.List; + +import com.hbm.blocks.ModBlocks; +import com.hbm.entity.particle.EntityGasFlameFX; +import com.hbm.entity.particle.EntitySmokeFX; +import com.hbm.explosion.ExplosionLarge; +import com.hbm.lib.ModDamageSource; +import com.hbm.main.MainRegistry; +import com.hbm.world.Meteorite; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.entity.Entity; +import net.minecraft.entity.projectile.EntityThrowable; +import net.minecraft.init.Blocks; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; + +public class EntityBoxcar extends EntityThrowable { + + public EntityBoxcar(World p_i1582_1_) { + super(p_i1582_1_); + this.ignoreFrustumCheck = true; + this.isImmuneToFire = true; + } + + @Override + public void onUpdate() { + this.prevPosX = this.posX; + this.prevPosY = this.posY; + this.prevPosZ = this.posZ; + + this.posX += this.motionX; + this.posY += this.motionY; + this.posZ += this.motionZ; + + this.motionY -= 0.03; + if(motionY < -1.5) + motionY = -1.5; + + if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air) + { + this.worldObj.playSoundEffect(this.posX, this.posY, this.posZ, "hbm:entity.oldExplosion", 10000.0F, 0.5F + this.rand.nextFloat() * 0.1F); + this.setDead(); + ExplosionLarge.spawnShock(worldObj, posX, posY + 1, posZ, 24, 3); + ExplosionLarge.spawnShock(worldObj, posX, posY + 1, posZ, 24, 2.5); + ExplosionLarge.spawnShock(worldObj, posX, posY + 1, posZ, 24, 2); + ExplosionLarge.spawnShock(worldObj, posX, posY + 1, posZ, 24, 1.5); + ExplosionLarge.spawnShock(worldObj, posX, posY + 1, posZ, 24, 1); + + List list = (List)worldObj.getEntitiesWithinAABBExcludingEntity(null, + AxisAlignedBB.getBoundingBox(posX - 2, posY - 2, posZ - 2, posX + 2, posY + 2, posZ + 2)); + + for(Entity e : list) { + e.attackEntityFrom(ModDamageSource.boxcar, 1000); + } + + if(!worldObj.isRemote) + worldObj.setBlock((int)(this.posX - 0.5), (int)(this.posY + 0.5), (int)(this.posZ - 0.5), ModBlocks.boxcar); + } + } + + @Override + protected void onImpact(MovingObjectPosition p_70184_1_) { + + } + + @Override + @SideOnly(Side.CLIENT) + public boolean isInRangeToRenderDist(double distance) + { + return distance < 25000; + } +} diff --git a/com/hbm/entity/projectile/EntityBullet.java b/com/hbm/entity/projectile/EntityBullet.java index d99b9da0b..f634599e6 100644 --- a/com/hbm/entity/projectile/EntityBullet.java +++ b/com/hbm/entity/projectile/EntityBullet.java @@ -33,6 +33,7 @@ import com.hbm.blocks.ModBlocks; import com.hbm.blocks.generic.RedBarrel; import com.hbm.entity.grenade.EntityGrenadeTau; import com.hbm.entity.mob.EntityNuclearCreeper; +import com.hbm.entity.particle.EntityBSmokeFX; import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.lib.ModDamageSource; @@ -66,6 +67,7 @@ public class EntityBullet extends Entity implements IProjectile { private boolean instakill = false; private boolean rad = false; public boolean antidote = false; + public boolean pip = false; public EntityBullet(World p_i1753_1_) { super(p_i1753_1_); @@ -431,7 +433,7 @@ public class EntityBullet extends Entity implements IProjectile { if (movingobjectposition != null) { if (movingobjectposition.entityHit != null) { - //TODO: Remove test feature in retail version + //TODO: Remove test feature in release version if (!(movingobjectposition.entityHit instanceof EntityItemFrame) || movingobjectposition.entityHit instanceof EntityItemFrame && (((EntityItemFrame) movingobjectposition.entityHit).getDisplayedItem() == null @@ -455,9 +457,9 @@ public class EntityBullet extends Entity implements IProjectile { //O: Direct // X X Bullet - // \ | + // \| // O-X Tau - // | / + // |/ // X-O Displacer if (!this.getIsCritical() && !this.getIsChopper()) { @@ -542,6 +544,26 @@ public class EntityBullet extends Entity implements IProjectile { ((EntityPlayerMP) this.shootingEntity).playerNetServerHandler .sendPacket(new S2BPacketChangeGameState(6, 0.0F)); } + + if(this.pip) { + if(!worldObj.isRemote) { + EntityBoxcar pippo = new EntityBoxcar(worldObj); + pippo.posX = movingobjectposition.entityHit.posX; + pippo.posY = movingobjectposition.entityHit.posY + 50; + pippo.posZ = movingobjectposition.entityHit.posZ; + + for(int j = 0; j < 50; j++) { + EntityBSmokeFX fx = new EntityBSmokeFX(worldObj, pippo.posX + (rand.nextDouble() - 0.5) * 4, pippo.posY + (rand.nextDouble() - 0.5) * 12, pippo.posZ + (rand.nextDouble() - 0.5) * 4, 0, 0, 0); + worldObj.spawnEntityInWorld(fx); + } + + worldObj.spawnEntityInWorld(pippo); + } + + worldObj.playSoundEffect(movingobjectposition.entityHit.posX, + movingobjectposition.entityHit.posY + 50, + movingobjectposition.entityHit.posZ, "hbm:alarm.trainHorn", 100F, 1F); + } } if (!(movingobjectposition.entityHit instanceof EntityEnderman)) { diff --git a/com/hbm/entity/projectile/EntityMiniNuke.java b/com/hbm/entity/projectile/EntityMiniNuke.java index 85f036d61..4a624ae6b 100644 --- a/com/hbm/entity/projectile/EntityMiniNuke.java +++ b/com/hbm/entity/projectile/EntityMiniNuke.java @@ -246,12 +246,21 @@ public class EntityMiniNuke extends Entity implements IProjectile entity0.coefficient = 10.0F; this.worldObj.spawnEntityInWorld(entity0); - if(rand.nextInt(100) >= 0) //edited - { - ExplosionParticleB.spawnMush(this.worldObj, (int)this.posX, (int)this.posY - 3, (int)this.posZ); - } else { - ExplosionParticle.spawnMush(this.worldObj, (int)this.posX, (int)this.posY - 3, (int)this.posZ); - } + //Perma-baleflare mode if the polaroid's glitched + if(MainRegistry.polaroidID == 11) + if(rand.nextInt(100) >= 0) //edited + { + ExplosionParticleB.spawnMush(this.worldObj, (int)this.posX, (int)this.posY - 3, (int)this.posZ); + } else { + ExplosionParticle.spawnMush(this.worldObj, (int)this.posX, (int)this.posY - 3, (int)this.posZ); + } + else + if(rand.nextInt(100) == 0) //original + { + ExplosionParticleB.spawnMush(this.worldObj, (int)this.posX, (int)this.posY - 3, (int)this.posZ); + } else { + ExplosionParticle.spawnMush(this.worldObj, (int)this.posX, (int)this.posY - 3, (int)this.posZ); + } } this.setDead(); } diff --git a/com/hbm/handler/MultiblockHandler.java b/com/hbm/handler/MultiblockHandler.java index e44a35436..b075818c5 100644 --- a/com/hbm/handler/MultiblockHandler.java +++ b/com/hbm/handler/MultiblockHandler.java @@ -72,6 +72,7 @@ public class MultiblockHandler { public static final int[] AMSLimiterDimensionSouth = new int[] { 0, 0, 5, 0, 2, 2 }; public static final int[] AMSLimiterDimensionWest = new int[] { 2, 2, 5, 0, 0, 0 }; public static final int[] AMSEmitterDimension = new int[] { 2, 2, 5, 0, 2, 2, }; + public static final int[] AMSBaseDimension = new int[] { 1, 1, 1, 0, 1, 1, }; //Approved! public static boolean checkSpace(World world, int x, int y, int z, int[] i) { diff --git a/com/hbm/inventory/MachineRecipes.java b/com/hbm/inventory/MachineRecipes.java index 8ca07cc62..d31f03876 100644 --- a/com/hbm/inventory/MachineRecipes.java +++ b/com/hbm/inventory/MachineRecipes.java @@ -157,7 +157,7 @@ public class MachineRecipes { new ItemStack(ModItems.rod_dual_waste, 1) }; ItemStack[] schrabidium3 = new ItemStack[] { new ItemStack(ModItems.nugget_schrabidium_fuel, 4), new ItemStack(ModItems.nugget_lead, 19), new ItemStack(ModItems.nugget_neptunium, 1), - new ItemStack(ModItems.rod_quad_euphemium, 1, 34) }; + new ItemStack(ModItems.rod_quad_euphemium, 1) }; if (item == ModItems.cell_uf6) { return uranium; @@ -2554,7 +2554,7 @@ public class MachineRecipes { case PROTOTYPE: list.add(new ItemStack(ModItems.dysfunctional_reactor, 1)); list.add(new ItemStack(ModItems.hull_small_steel, 2)); - list.add(new ItemStack(ModItems.ingot_euphemium, 3, 34)); + list.add(new ItemStack(ModItems.ingot_euphemium, 3)); list.add(new ItemStack(ModItems.circuit_gold, 2)); list.add(new ItemStack(ModItems.wire_gold, 16)); break; diff --git a/com/hbm/inventory/gui/GUIAMSBase.java b/com/hbm/inventory/gui/GUIAMSBase.java index 93dbcda40..bcea7c723 100644 --- a/com/hbm/inventory/gui/GUIAMSBase.java +++ b/com/hbm/inventory/gui/GUIAMSBase.java @@ -55,16 +55,16 @@ public class GUIAMSBase extends GuiInfoContainer { Minecraft.getMinecraft().getTextureManager().bindTexture(texture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - int i = (int)base.getPowerScaled(104); + int i = (int)base.getPowerScaled(106); drawTexturedModalRect(guiLeft + 116, guiTop + 124 - i, 206, 106 - i, 7, i); - int j = base.getFieldScaled(104); + int j = base.getFieldScaled(106); drawTexturedModalRect(guiLeft + 44, guiTop + 124 - j, 192, 106 - j, 7, j); - int k = base.getEfficiencyScaled(104); + int k = base.getEfficiencyScaled(106); drawTexturedModalRect(guiLeft + 53, guiTop + 124 - k, 199, 106 - k, 7, k); - int l = base.getHeatScaled(104); + int l = base.getHeatScaled(106); drawTexturedModalRect(guiLeft + 125, guiTop + 124 - l, 213, 106 - l, 7, l); int m = base.mode; diff --git a/com/hbm/inventory/gui/GUIFusionMultiblock.java b/com/hbm/inventory/gui/GUIFusionMultiblock.java index eb7b0eeea..111893bf7 100644 --- a/com/hbm/inventory/gui/GUIFusionMultiblock.java +++ b/com/hbm/inventory/gui/GUIFusionMultiblock.java @@ -33,7 +33,7 @@ public class GUIFusionMultiblock extends GuiInfoContainer { diFurnace.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 8, guiTop + 88 - 70, 16, 70); diFurnace.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 134, guiTop + 88 - 70, 16, 70); diFurnace.tanks[2].renderTankInfo(this, mouseX, mouseY, guiLeft + 152, guiTop + 88 - 70, 16, 70); - this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 26, guiTop + 88 - 88, 16, 88, diFurnace.power, diFurnace.maxPower); + this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 26, guiTop + 88 - 70, 16, 70, diFurnace.power, diFurnace.maxPower); } @Override @@ -50,7 +50,7 @@ public class GUIFusionMultiblock extends GuiInfoContainer { Minecraft.getMinecraft().getTextureManager().bindTexture(texture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - int k = (int)diFurnace.getPowerScaled(88); + int k = (int)diFurnace.getPowerScaled(70); drawTexturedModalRect(guiLeft + 26, guiTop + 88 - k, 192, 88 - k, 16, k); if(diFurnace.isRunning()) diff --git a/com/hbm/inventory/gui/GuiInfoContainer.java b/com/hbm/inventory/gui/GuiInfoContainer.java index 7dded0616..560fba6b3 100644 --- a/com/hbm/inventory/gui/GuiInfoContainer.java +++ b/com/hbm/inventory/gui/GuiInfoContainer.java @@ -2,6 +2,8 @@ package com.hbm.inventory.gui; import java.util.Arrays; +import com.hbm.lib.Library; + import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.inventory.Container; @@ -18,7 +20,7 @@ public abstract class GuiInfoContainer extends GuiContainer { public void drawElectricityInfo(GuiInfoContainer gui, int mouseX, int mouseY, int x, int y, int width, int height, long power, long maxPower) { if(x <= mouseX && x + width > mouseX && y < mouseY && y + height >= mouseY) - gui.drawFluidInfo(new String[] { power + "/" + maxPower + "HE" }, mouseX, mouseY); + gui.drawFluidInfo(new String[] { Library.getShortNumber(power) + "/" + Library.getShortNumber(maxPower) + "HE" }, mouseX, mouseY); } public void drawCustomInfo(GuiInfoContainer gui, int mouseX, int mouseY, int x, int y, int width, int height, String[] text) { diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 8481f9568..f6d6a0313 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -90,6 +90,8 @@ public class ModItems { public static Item ingot_desh; public static Item nugget_desh; + public static Item ingot_dineutronium; + public static Item nugget_dineutronium; public static Item nugget_uranium; public static Item nugget_u235; @@ -130,6 +132,7 @@ public class ModItems { public static Item plate_euphemium; public static Item bolt_tungsten; public static Item bolt_compound; + public static Item plate_polymer; public static Item ingot_dura_steel; public static Item ingot_polymer; @@ -189,6 +192,8 @@ public class ModItems { public static Item powder_dura_steel; public static Item powder_polymer; + public static Item powder_euphemium; + public static Item powder_meteorite; public static Item powder_lithium_tiny; public static Item powder_neodymium_tiny; @@ -197,12 +202,14 @@ public class ModItems { public static Item powder_cerium_tiny; public static Item powder_lanthanium_tiny; public static Item powder_actinium_tiny; + public static Item powder_meteorite_tiny; public static Item powder_lanthanium; public static Item powder_actinium; public static Item powder_desh; public static Item powder_desh_mix; public static Item powder_nitan_mix; + public static Item powder_spark_mix; public static Item fragment_neodymium; public static Item fragment_cobalt; @@ -465,6 +472,7 @@ public class ModItems { public static Item bottle_nuka; public static Item bottle_cherry; public static Item bottle_quantum; + public static Item bottle_sparkle; public static Item bottle2_empty; public static Item bottle2_korl; public static Item bottle2_fritz; @@ -473,6 +481,7 @@ public class ModItems { public static Item chocolate_milk; public static Item cap_nuka; public static Item cap_quantum; + public static Item cap_sparkle; public static Item cap_korl; public static Item cap_fritz; public static Item ring_pull; @@ -636,6 +645,8 @@ public class ModItems { public static Item gun_revolver_nightmare_ammo; public static Item gun_revolver_nightmare2; public static Item gun_revolver_nightmare2_ammo; + public static Item gun_revolver_pip; + public static Item gun_revolver_pip_ammo; public static Item gun_fatman; public static Item gun_fatman_ammo; public static Item gun_mirv; @@ -746,6 +757,7 @@ public class ModItems { public static Item battery_advanced; public static Item battery_lithium; public static Item battery_schrabidium; + public static Item battery_spark; public static Item battery_creative; public static Item battery_red_cell; @@ -760,7 +772,11 @@ public class ModItems { public static Item battery_schrabidium_cell; public static Item battery_schrabidium_cell_2; public static Item battery_schrabidium_cell_4; + public static Item battery_spark_cell_6; + public static Item battery_spark_cell_25; + public static Item battery_su; + public static Item battery_su_l; public static Item fusion_core; public static Item fusion_core_infinite; public static Item energy_core; @@ -1153,14 +1169,17 @@ public class ModItems { pipes_steel = new Item().setUnlocalizedName("pipes_steel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":pipes_steel"); drill_titanium = new Item().setUnlocalizedName("drill_titanium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":drill_titanium"); plate_dalekanium = new Item().setUnlocalizedName("plate_dalekanium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":plate_dalekanium"); - plate_euphemium = new ItemCustomLore().setUnlocalizedName("plate_euphemium").setCreativeTab(null).setTextureName(RefStrings.MODID + ":plate_euphemium"); + plate_euphemium = new ItemCustomLore().setUnlocalizedName("plate_euphemium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":plate_euphemium"); bolt_tungsten = new Item().setUnlocalizedName("bolt_tungsten").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":bolt_tungsten"); bolt_compound = new Item().setUnlocalizedName("bolt_compound").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":bolt_compound"); + plate_polymer = new Item().setUnlocalizedName("plate_polymer").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":plate_polymer"); ingot_dura_steel = new ItemCustomLore().setUnlocalizedName("ingot_dura_steel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_dura_steel"); ingot_polymer = new ItemCustomLore().setUnlocalizedName("ingot_polymer").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_polymer"); ingot_desh = new ItemCustomLore().setUnlocalizedName("ingot_desh").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_desh"); nugget_desh = new ItemCustomLore().setUnlocalizedName("nugget_desh").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_desh"); + ingot_dineutronium = new ItemCustomLore().setUnlocalizedName("ingot_dineutronium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_dineutronium"); + nugget_dineutronium = new ItemCustomLore().setUnlocalizedName("nugget_dineutronium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_dineutronium"); ingot_lanthanium = new ItemCustomLore().setUnlocalizedName("ingot_lanthanium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_lanthanium"); ingot_actinium = new ItemCustomLore().setUnlocalizedName("ingot_actinium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_actinium"); @@ -1249,10 +1268,13 @@ public class ModItems { powder_cerium = new ItemCustomLore().setUnlocalizedName("powder_cerium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_cerium"); powder_dura_steel = new ItemCustomLore().setUnlocalizedName("powder_dura_steel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_dura_steel"); powder_polymer = new ItemCustomLore().setUnlocalizedName("powder_polymer").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_polymer"); + powder_euphemium = new ItemCustomLore().setUnlocalizedName("powder_euphemium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_euphemium"); + powder_meteorite = new Item().setUnlocalizedName("powder_meteorite").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_meteorite"); powder_lanthanium = new ItemCustomLore().setUnlocalizedName("powder_lanthanium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_lanthanium"); powder_actinium = new ItemCustomLore().setUnlocalizedName("powder_actinium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_actinium"); powder_desh_mix = new Item().setUnlocalizedName("powder_desh_mix").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_desh_mix"); powder_nitan_mix = new Item().setUnlocalizedName("powder_nitan_mix").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_nitan_mix"); + powder_spark_mix = new Item().setUnlocalizedName("powder_spark_mix").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_spark_mix"); powder_desh = new Item().setUnlocalizedName("powder_desh").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_desh"); powder_lithium_tiny = new Item().setUnlocalizedName("powder_lithium_tiny").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_lithium_tiny"); powder_neodymium_tiny = new Item().setUnlocalizedName("powder_neodymium_tiny").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_neodymium_tiny"); @@ -1261,6 +1283,7 @@ public class ModItems { powder_cerium_tiny = new Item().setUnlocalizedName("powder_cerium_tiny").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_cerium_tiny"); powder_lanthanium_tiny = new Item().setUnlocalizedName("powder_lanthanium_tiny").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_lanthanium_tiny"); powder_actinium_tiny = new Item().setUnlocalizedName("powder_actinium_tiny").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_actinium_tiny"); + powder_meteorite_tiny = new Item().setUnlocalizedName("powder_meteorite_tiny").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_meteorite_tiny"); fragment_neodymium = new Item().setUnlocalizedName("fragment_neodymium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":fragment_neodymium"); fragment_cobalt = new Item().setUnlocalizedName("fragment_cobalt").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":fragment_cobalt"); @@ -1505,6 +1528,7 @@ public class ModItems { bottle_nuka = new ItemEnergy().setUnlocalizedName("bottle_nuka").setContainerItem(ModItems.bottle_empty).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":bottle_nuka"); bottle_cherry = new ItemEnergy().setUnlocalizedName("bottle_cherry").setContainerItem(ModItems.bottle_empty).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":bottle_cherry"); bottle_quantum = new ItemEnergy().setUnlocalizedName("bottle_quantum").setContainerItem(ModItems.bottle_empty).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":bottle_quantum"); + bottle_sparkle = new ItemEnergy().setUnlocalizedName("bottle_sparkle").setContainerItem(ModItems.bottle_empty).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":bottle_sparkle"); bottle2_empty = new Item().setUnlocalizedName("bottle2_empty").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":bottle2_empty"); bottle2_korl = new ItemEnergy().setUnlocalizedName("bottle2_korl").setContainerItem(ModItems.bottle2_empty).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":bottle2_korl"); bottle2_fritz = new ItemEnergy().setUnlocalizedName("bottle2_fritz").setContainerItem(ModItems.bottle2_empty).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":bottle2_fritz"); @@ -1513,6 +1537,7 @@ public class ModItems { chocolate_milk = new ItemEnergy().setUnlocalizedName("chocolate_milk").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":chocolate_milk"); cap_nuka = new Item().setUnlocalizedName("cap_nuka").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":cap_nuka"); cap_quantum = new Item().setUnlocalizedName("cap_quantum").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":cap_quantum"); + cap_sparkle = new Item().setUnlocalizedName("cap_sparkle").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":cap_sparkle"); cap_korl = new Item().setUnlocalizedName("cap_korl").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":cap_korl"); cap_fritz = new Item().setUnlocalizedName("cap_fritz").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":cap_fritz"); ring_pull = new Item().setUnlocalizedName("ring_pull").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":ring_pull"); @@ -1528,7 +1553,7 @@ public class ModItems { rod_neptunium = new ItemCustomLore().setUnlocalizedName("rod_neptunium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_neptunium"); rod_lead = new Item().setUnlocalizedName("rod_lead").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_lead"); rod_schrabidium = new ItemCustomLore().setUnlocalizedName("rod_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_schrabidium"); - rod_euphemium = new ItemCustomLore().setUnlocalizedName("rod_astatine").setMaxStackSize(1).setCreativeTab(null).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_euphemium"); + rod_euphemium = new ItemCustomLore().setUnlocalizedName("rod_astatine").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_euphemium"); rod_australium = new ItemCustomLore().setUnlocalizedName("rod_australium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_australium"); rod_weidanium = new ItemCustomLore().setUnlocalizedName("rod_weidanium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_weidanium"); rod_reiium = new ItemCustomLore().setUnlocalizedName("rod_reiium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_reiium"); @@ -1665,6 +1690,8 @@ public class ModItems { gun_revolver_nightmare = new GunNightmare().setMaxDamage(6).setUnlocalizedName("gun_revolver_nightmare").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_revolver_nightmare"); gun_revolver_nightmare2_ammo = new ItemCustomLore().setUnlocalizedName("gun_revolver_nightmare2_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_revolver_nightmare2_ammo"); gun_revolver_nightmare2 = new GunNightmare().setMaxDamage(6).setUnlocalizedName("gun_revolver_nightmare2").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_revolver_nightmare2"); + gun_revolver_pip_ammo = new ItemCustomLore().setUnlocalizedName("gun_revolver_pip_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_revolver_pip_ammo"); + gun_revolver_pip = new GunRevolver(gun_revolver_pip_ammo, 25, 35, false, false).setMaxDamage(1000).setUnlocalizedName("gun_revolver_pip").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_revolver_pip"); gun_fatman_ammo = new Item().setUnlocalizedName("gun_fatman_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_fatman_ammo"); gun_fatman = new GunFatman().setMaxDamage(2500).setUnlocalizedName("gun_fatman").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_fatman"); gun_mirv_ammo = new Item().setUnlocalizedName("gun_mirv_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_mirv_ammo"); @@ -1774,6 +1801,7 @@ public class ModItems { battery_advanced = new ItemBattery(200).setUnlocalizedName("battery_advanced").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":battery_advanced"); battery_lithium = new ItemBattery(2500).setUnlocalizedName("battery_lithium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":battery_lithium"); battery_schrabidium = new ItemBattery(10000).setUnlocalizedName("battery_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":battery_schrabidium"); + battery_spark = new ItemBattery(1000000).setUnlocalizedName("battery_spark").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":battery_spark"); battery_creative = new Item().setUnlocalizedName("battery_creative").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":battery_creative"); battery_red_cell = new ItemBattery(150).setUnlocalizedName("battery_red_cell").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":battery_red_cell"); @@ -1788,7 +1816,11 @@ public class ModItems { battery_schrabidium_cell = new ItemBattery(30000).setUnlocalizedName("battery_schrabidium_cell").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":battery_schrabidium_cell"); battery_schrabidium_cell_2 = new ItemBattery(30000 * 2).setUnlocalizedName("battery_schrabidium_cell_2").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":battery_schrabidium_cell_2"); battery_schrabidium_cell_4 = new ItemBattery(30000 * 4).setUnlocalizedName("battery_schrabidium_cell_4").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":battery_schrabidium_cell_4"); + battery_spark_cell_6 = new ItemBattery(1000000 * 6).setUnlocalizedName("battery_spark_cell_6").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":battery_spark_cell_6"); + battery_spark_cell_25 = new ItemBattery(1000000 * 25).setUnlocalizedName("battery_spark_cell_25").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":battery_spark_cell_25"); + battery_su = new ItemBattery(15).setUnlocalizedName("battery_su").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":battery_su"); + battery_su_l = new ItemBattery(35).setUnlocalizedName("battery_su_l").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":battery_su_l"); fusion_core = new ItemBattery(5000).setUnlocalizedName("fusion_core").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":fusion_core"); fusion_core_infinite = new Item().setUnlocalizedName("fusion_core_infinite").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":fusion_core_infinite"); energy_core = new ItemBattery(5000).setUnlocalizedName("energy_core").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":energy_core"); @@ -1864,9 +1896,9 @@ public class ModItems { clip_xvl1456 = new ItemClip().setUnlocalizedName("clip_xvl1456").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_xvl1456"); clip_emp = new ItemClip().setUnlocalizedName("clip_emp").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_emp"); - ingot_euphemium = new ItemAntiCheat().setUnlocalizedName("ingot_astatine").setTextureName(RefStrings.MODID + ":ingot_euphemium"); - nugget_euphemium = new ItemAntiCheat().setUnlocalizedName("nugget_astatine").setTextureName(RefStrings.MODID + ":nugget_euphemium"); - rod_quad_euphemium = new ItemCustomLore().setUnlocalizedName("rod_quad_astatine").setMaxStackSize(1).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_euphemium"); + ingot_euphemium = new ItemAntiCheat().setUnlocalizedName("ingot_euphemium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_euphemium"); + nugget_euphemium = new ItemAntiCheat().setUnlocalizedName("nugget_euphemium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_euphemium"); + rod_quad_euphemium = new ItemCustomLore().setUnlocalizedName("rod_quad_astatine").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_euphemium"); watch = new ItemCustomLore().setUnlocalizedName("watch").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":watch"); apple_euphemium = new ItemAppleEuphemium(20, 100, false).setUnlocalizedName("apple_astatine").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":apple_euphemium"); @@ -2190,6 +2222,7 @@ public class ModItems { GameRegistry.registerItem(ingot_lanthanium, ingot_lanthanium.getUnlocalizedName()); GameRegistry.registerItem(ingot_actinium, ingot_actinium.getUnlocalizedName()); GameRegistry.registerItem(ingot_desh, ingot_desh.getUnlocalizedName()); + GameRegistry.registerItem(ingot_dineutronium, ingot_dineutronium.getUnlocalizedName()); //Dusts & Other GameRegistry.registerItem(lithium, lithium.getUnlocalizedName()); @@ -2244,6 +2277,8 @@ public class ModItems { GameRegistry.registerItem(powder_desh_mix, powder_desh_mix.getUnlocalizedName()); GameRegistry.registerItem(powder_desh, powder_desh.getUnlocalizedName()); GameRegistry.registerItem(powder_nitan_mix, powder_nitan_mix.getUnlocalizedName()); + GameRegistry.registerItem(powder_spark_mix, powder_spark_mix.getUnlocalizedName()); + GameRegistry.registerItem(powder_meteorite, powder_meteorite.getUnlocalizedName()); GameRegistry.registerItem(dust, dust.getUnlocalizedName()); GameRegistry.registerItem(powder_lithium_tiny, powder_lithium_tiny.getUnlocalizedName()); GameRegistry.registerItem(powder_neodymium_tiny, powder_neodymium_tiny.getUnlocalizedName()); @@ -2252,6 +2287,8 @@ public class ModItems { GameRegistry.registerItem(powder_cerium_tiny, powder_cerium_tiny.getUnlocalizedName()); GameRegistry.registerItem(powder_lanthanium_tiny, powder_lanthanium_tiny.getUnlocalizedName()); GameRegistry.registerItem(powder_actinium_tiny, powder_actinium_tiny.getUnlocalizedName()); + GameRegistry.registerItem(powder_meteorite_tiny, powder_meteorite_tiny.getUnlocalizedName()); + GameRegistry.registerItem(powder_euphemium, powder_euphemium.getUnlocalizedName()); //Powders GameRegistry.registerItem(powder_fire, powder_fire.getUnlocalizedName()); @@ -2297,6 +2334,7 @@ public class ModItems { GameRegistry.registerItem(nugget_daffergon, nugget_daffergon.getUnlocalizedName()); GameRegistry.registerItem(nugget_verticium, nugget_verticium.getUnlocalizedName()); GameRegistry.registerItem(nugget_desh, nugget_desh.getUnlocalizedName()); + GameRegistry.registerItem(nugget_dineutronium, nugget_dineutronium.getUnlocalizedName()); //Plates GameRegistry.registerItem(plate_iron, plate_iron.getUnlocalizedName()); @@ -2312,6 +2350,7 @@ public class ModItems { GameRegistry.registerItem(plate_combine_steel, plate_combine_steel.getUnlocalizedName()); GameRegistry.registerItem(plate_mixed, plate_mixed.getUnlocalizedName()); GameRegistry.registerItem(plate_paa, plate_paa.getUnlocalizedName()); + GameRegistry.registerItem(plate_polymer, plate_polymer.getUnlocalizedName()); GameRegistry.registerItem(plate_dalekanium, plate_dalekanium.getUnlocalizedName()); GameRegistry.registerItem(plate_euphemium, plate_euphemium.getUnlocalizedName()); @@ -2539,7 +2578,12 @@ public class ModItems { GameRegistry.registerItem(battery_schrabidium_cell, battery_schrabidium_cell.getUnlocalizedName()); GameRegistry.registerItem(battery_schrabidium_cell_2, battery_schrabidium_cell_2.getUnlocalizedName()); GameRegistry.registerItem(battery_schrabidium_cell_4, battery_schrabidium_cell_4.getUnlocalizedName()); + GameRegistry.registerItem(battery_spark, battery_spark.getUnlocalizedName()); + GameRegistry.registerItem(battery_spark_cell_6, battery_spark_cell_6.getUnlocalizedName()); + GameRegistry.registerItem(battery_spark_cell_25, battery_spark_cell_25.getUnlocalizedName()); GameRegistry.registerItem(battery_creative, battery_creative.getUnlocalizedName()); + GameRegistry.registerItem(battery_su, battery_su.getUnlocalizedName()); + GameRegistry.registerItem(battery_su_l, battery_su_l.getUnlocalizedName()); GameRegistry.registerItem(fusion_core, fusion_core.getUnlocalizedName()); GameRegistry.registerItem(energy_core, energy_core.getUnlocalizedName()); GameRegistry.registerItem(fusion_core_infinite, fusion_core_infinite.getUnlocalizedName()); @@ -2813,6 +2857,7 @@ public class ModItems { GameRegistry.registerItem(gun_revolver_cursed, gun_revolver_cursed.getUnlocalizedName()); GameRegistry.registerItem(gun_revolver_nightmare, gun_revolver_nightmare.getUnlocalizedName()); GameRegistry.registerItem(gun_revolver_nightmare2, gun_revolver_nightmare2.getUnlocalizedName()); + GameRegistry.registerItem(gun_revolver_pip, gun_revolver_pip.getUnlocalizedName()); GameRegistry.registerItem(gun_rpg, gun_rpg.getUnlocalizedName()); GameRegistry.registerItem(gun_fatman, gun_fatman.getUnlocalizedName()); GameRegistry.registerItem(gun_mirv, gun_mirv.getUnlocalizedName()); @@ -2846,6 +2891,7 @@ public class ModItems { GameRegistry.registerItem(gun_revolver_cursed_ammo, gun_revolver_cursed_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_revolver_nightmare_ammo, gun_revolver_nightmare_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_revolver_nightmare2_ammo, gun_revolver_nightmare2_ammo.getUnlocalizedName()); + GameRegistry.registerItem(gun_revolver_pip_ammo, gun_revolver_pip_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_rpg_ammo, gun_rpg_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_fatman_ammo, gun_fatman_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_mirv_ammo, gun_mirv_ammo.getUnlocalizedName()); @@ -3022,6 +3068,7 @@ public class ModItems { GameRegistry.registerItem(bottle_nuka, bottle_nuka.getUnlocalizedName()); GameRegistry.registerItem(bottle_cherry, bottle_cherry.getUnlocalizedName()); GameRegistry.registerItem(bottle_quantum, bottle_quantum.getUnlocalizedName()); + GameRegistry.registerItem(bottle_sparkle, bottle_sparkle.getUnlocalizedName()); GameRegistry.registerItem(bottle2_empty, bottle2_empty.getUnlocalizedName()); GameRegistry.registerItem(bottle2_korl, bottle2_korl.getUnlocalizedName()); GameRegistry.registerItem(bottle2_fritz, bottle2_fritz.getUnlocalizedName()); @@ -3032,6 +3079,7 @@ public class ModItems { //Money GameRegistry.registerItem(cap_nuka, cap_nuka.getUnlocalizedName()); GameRegistry.registerItem(cap_quantum, cap_quantum.getUnlocalizedName()); + GameRegistry.registerItem(cap_sparkle, cap_sparkle.getUnlocalizedName()); GameRegistry.registerItem(cap_korl, cap_korl.getUnlocalizedName()); GameRegistry.registerItem(cap_fritz, cap_fritz.getUnlocalizedName()); GameRegistry.registerItem(ring_pull, ring_pull.getUnlocalizedName()); diff --git a/com/hbm/items/food/ItemEnergy.java b/com/hbm/items/food/ItemEnergy.java index b9280496e..8f07d0675 100644 --- a/com/hbm/items/food/ItemEnergy.java +++ b/com/hbm/items/food/ItemEnergy.java @@ -109,6 +109,14 @@ public class ItemEnergy extends Item { p_77654_3_.addPotionEffect(new PotionEffect(Potion.resistance.id, 120 * 20, 2)); p_77654_3_.addPotionEffect(new PotionEffect(Potion.jump.id, 120 * 20, 2)); } + if(this == ModItems.bottle_sparkle) + { + p_77654_3_.heal(10F); + p_77654_3_.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 120 * 20, 1)); + p_77654_3_.addPotionEffect(new PotionEffect(Potion.resistance.id, 120 * 20, 2)); + p_77654_3_.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 120 * 20, 2)); + p_77654_3_.addPotionEffect(new PotionEffect(Potion.digSpeed.id, 120 * 20, 1)); + } } if (!p_77654_3_.capabilities.isCreativeMode && this != ModItems.chocolate_milk) @@ -162,6 +170,16 @@ public class ItemEnergy extends Item { p_77654_3_.inventory.addItemStackToInventory(new ItemStack(ModItems.bottle2_empty)); } + + if(this == ModItems.bottle_sparkle || this == ModItems.bottle_sparkle) { + p_77654_3_.inventory.addItemStackToInventory(new ItemStack(ModItems.cap_sparkle)); + if (p_77654_1_.stackSize <= 0) + { + return new ItemStack(ModItems.bottle_empty); + } + + p_77654_3_.inventory.addItemStackToInventory(new ItemStack(ModItems.bottle_empty)); + } } return p_77654_1_; @@ -254,5 +272,12 @@ public class ItemEnergy extends Item { else list.add("moremore caffeine"); } + if(this == ModItems.bottle_sparkle) + { + if(MainRegistry.polaroidID == 11) + list.add("Contains trace amounts of taint."); + else + list.add("The most delicious beverage in the wasteland!"); + } } } diff --git a/com/hbm/items/special/ItemAntiCheat.java b/com/hbm/items/special/ItemAntiCheat.java index 2dd859442..8169a06cc 100644 --- a/com/hbm/items/special/ItemAntiCheat.java +++ b/com/hbm/items/special/ItemAntiCheat.java @@ -12,7 +12,7 @@ public class ItemAntiCheat extends ItemCustomLore { @Override public void onUpdate(ItemStack stack, World world, Entity entity, int j, boolean b) { - if(stack.getItemDamage() != 34) { + /*if(stack.getItemDamage() != 34) { if(entity instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer)entity; @@ -28,7 +28,7 @@ public class ItemAntiCheat extends ItemCustomLore { //if(!world.isRemote) // ExplosionChaos.antiCheat(world, (int)entity.posX, (int)entity.posY, (int)entity.posZ, 20); - } + }*/ } } diff --git a/com/hbm/items/special/ItemBattery.java b/com/hbm/items/special/ItemBattery.java index 9b7a003c3..75b8a8a9e 100644 --- a/com/hbm/items/special/ItemBattery.java +++ b/com/hbm/items/special/ItemBattery.java @@ -3,6 +3,7 @@ package com.hbm.items.special; import java.util.List; import com.hbm.items.ModItems; +import com.hbm.lib.Library; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; @@ -27,7 +28,7 @@ public class ItemBattery extends Item { if(itemstack.getItem() != ModItems.fusion_core && itemstack.getItem() != ModItems.factory_core_titanium && itemstack.getItem() != ModItems.factory_core_advanced && itemstack.getItem() != ModItems.energy_core) { - list.add("Energy stored: " + (charge * 100) + "/" + (maxCharge * 100) + " HE"); + list.add("Energy stored: " + Library.getShortNumber(charge * 100) + "/" + Library.getShortNumber(maxCharge * 100) + "HE"); } else { long charge1 = (charge * 100) / this.maxCharge; list.add("Charge: " + charge1 + "%"); diff --git a/com/hbm/items/special/ItemCustomLore.java b/com/hbm/items/special/ItemCustomLore.java index 1cd48fe31..62d897002 100644 --- a/com/hbm/items/special/ItemCustomLore.java +++ b/com/hbm/items/special/ItemCustomLore.java @@ -296,6 +296,12 @@ public class ItemCustomLore extends ItemRadioactive { list.add("DEAL WITH IT carefully."); } + if(this == ModItems.powder_euphemium) + { + list.add("Pulverized pink."); + list.add("Tastes like strawberries."); + } + if(this == ModItems.watch) { list.add("A small blue pocket watch."); @@ -560,17 +566,40 @@ public class ItemCustomLore extends ItemRadioactive { @Override public EnumRarity getRarity(ItemStack p_77613_1_) { - if(this == ModItems.nugget_euphemium || this == ModItems.ingot_euphemium || this == ModItems.rod_quad_euphemium || this == ModItems.plate_euphemium || this == ModItems.watch || this == ModItems.powder_iodine || this == ModItems.powder_thorium || this == ModItems.powder_neodymium || this == ModItems.powder_neptunium || this == ModItems.powder_astatine || this == ModItems.powder_caesium || this == ModItems.powder_strontium || this == ModItems.powder_cobalt || this == ModItems.powder_bromine || this == ModItems.powder_niobium || this == ModItems.powder_tennessine || this == ModItems.powder_cerium) + if(this == ModItems.nugget_euphemium || this == ModItems.ingot_euphemium || + this == ModItems.rod_quad_euphemium || this == ModItems.plate_euphemium || + this == ModItems.watch || this == ModItems.powder_iodine || + this == ModItems.powder_thorium || this == ModItems.powder_neodymium || + this == ModItems.powder_neptunium || this == ModItems.powder_astatine || + this == ModItems.powder_caesium || this == ModItems.powder_strontium || + this == ModItems.powder_cobalt || this == ModItems.powder_bromine || + this == ModItems.powder_niobium || this == ModItems.powder_tennessine || + this == ModItems.powder_cerium || this == ModItems.powder_euphemium) { return EnumRarity.epic; } - if(this == ModItems.rod_schrabidium || this == ModItems.rod_dual_schrabidium || this == ModItems.rod_quad_schrabidium || this == ModItems.ingot_schrabidium || this == ModItems.nugget_schrabidium || this == ModItems.plate_schrabidium || this == ModItems.cell_sas3 || this == ModItems.powder_schrabidium || this == ModItems.wire_schrabidium || this == ModItems.circuit_schrabidium || this == ModItems.gun_revolver_schrabidium_ammo) + if(this == ModItems.rod_schrabidium || this == ModItems.rod_dual_schrabidium || + this == ModItems.rod_quad_schrabidium || this == ModItems.ingot_schrabidium || + this == ModItems.nugget_schrabidium || this == ModItems.plate_schrabidium || + this == ModItems.cell_sas3 || this == ModItems.powder_schrabidium || + this == ModItems.wire_schrabidium || this == ModItems.circuit_schrabidium || + this == ModItems.gun_revolver_schrabidium_ammo) { return EnumRarity.rare; } - if(this == ModItems.gun_revolver_cursed_ammo || this == ModItems.plate_paa || this == ModItems.gun_mp_ammo || this == ModItems.powder_power || this == ModItems.ingot_australium || this == ModItems.ingot_weidanium || this == ModItems.ingot_reiium || this == ModItems.ingot_unobtainium || this == ModItems.ingot_daffergon || this == ModItems.ingot_verticium || this == ModItems.nugget_australium || this == ModItems.nugget_weidanium || this == ModItems.nugget_reiium || this == ModItems.nugget_unobtainium || this == ModItems.nugget_daffergon || this == ModItems.nugget_verticium || this == ModItems.powder_australium || this == ModItems.powder_weidanium || this == ModItems.powder_reiium || this == ModItems.powder_unobtainium || this == ModItems.powder_daffergon || this == ModItems.powder_verticium) + if(this == ModItems.gun_revolver_cursed_ammo || this == ModItems.plate_paa || + this == ModItems.gun_mp_ammo || this == ModItems.powder_power || + this == ModItems.ingot_australium || this == ModItems.ingot_weidanium || + this == ModItems.ingot_reiium || this == ModItems.ingot_unobtainium || + this == ModItems.ingot_daffergon || this == ModItems.ingot_verticium || + this == ModItems.nugget_australium || this == ModItems.nugget_weidanium || + this == ModItems.nugget_reiium || this == ModItems.nugget_unobtainium || + this == ModItems.nugget_daffergon || this == ModItems.nugget_verticium || + this == ModItems.powder_australium || this == ModItems.powder_weidanium || + this == ModItems.powder_reiium || this == ModItems.powder_unobtainium || + this == ModItems.powder_daffergon || this == ModItems.powder_verticium) { return EnumRarity.uncommon; } diff --git a/com/hbm/items/weapon/GunRevolver.java b/com/hbm/items/weapon/GunRevolver.java index 5b1460a27..0efe71ed4 100644 --- a/com/hbm/items/weapon/GunRevolver.java +++ b/com/hbm/items/weapon/GunRevolver.java @@ -27,10 +27,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; public class GunRevolver extends Item { - public static final String[] bowPullIconNameArray = new String[] { "pulling_0", "pulling_1", "pulling_2" }; - @SideOnly(Side.CLIENT) - private IIcon[] iconArray; - private static final String __OBFID = "CL_00001777"; + private Item ammo; private int dmgMin; private int dmgMax; @@ -58,6 +55,9 @@ public class GunRevolver extends Item { if (this == ModItems.gun_revolver_cursed) { this.setMaxDamage(5000); } + if (this == ModItems.gun_revolver_pip) { + this.setMaxDamage(1000); + } this.ammo = ammo; this.dmgMin = dmgMin; @@ -77,6 +77,10 @@ public class GunRevolver extends Item { return EnumRarity.uncommon; } + if (this == ModItems.gun_revolver_pip) { + return EnumRarity.uncommon; + } + return EnumRarity.common; } @@ -109,24 +113,25 @@ public class GunRevolver extends Item { EntityBullet entityarrow = new EntityBullet(p_77615_2_, p_77615_3_, 3.0F, dmgMin, dmgMax, instakill, rad); entityarrow.setDamage(dmgMin + rand.nextInt(dmgMax - dmgMin)); + if(this == ModItems.gun_revolver_pip && p_77615_3_.isSneaking()) { + entityarrow.pip = true; + entityarrow.setDamage(1); + } p_77615_1_.damageItem(1, p_77615_3_); if (this == ModItems.gun_revolver || this == ModItems.gun_revolver_iron || this == ModItems.gun_revolver_gold || this == ModItems.gun_revolver_lead) { - // p_77615_2_.playSoundAtEntity(p_77615_3_, "random.explode", - // 1.0F, 3.0F); p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.revolverShoot", 1.0F, 1.0F); } if (this == ModItems.gun_revolver_cursed) { - // p_77615_2_.playSoundAtEntity(p_77615_3_, "random.explode", - // 3.0F, 1.5F); p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.heavyShoot", 3.0F, 1.0F); } if (this == ModItems.gun_revolver_schrabidium) { - // p_77615_2_.playSoundAtEntity(p_77615_3_, "random.explode", - // 1.0F, 3.0F); p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.schrabidiumShoot", 1.0F, 1.0F); } + if (this == ModItems.gun_revolver_pip) { + p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.revolverShootAlt", 1.0F, 1.0F); + } if (flag) { entityarrow.canBePickedUp = 2; @@ -233,6 +238,16 @@ public class GunRevolver extends Item { list.add("Damage: 25 - 40"); list.add("33% chance of user being withered."); } + if (this == ModItems.gun_revolver_pip) { + list.add("In loving memory of the eldritch"); + list.add("creature which got smushed by a"); + list.add("falling freight wagon."); + list.add(""); + list.add("Ammo: Tainted Bullets"); + list.add("Damage: 25 - 35"); + list.add("Secondary Damage: 1"); + list.add("Enemy is hit by boxcar."); + } } @Override diff --git a/com/hbm/lib/Library.java b/com/hbm/lib/Library.java index 43f2944d5..df335fec8 100644 --- a/com/hbm/lib/Library.java +++ b/com/hbm/lib/Library.java @@ -291,7 +291,8 @@ public class Library { world.getBlock(x, y, z) == ModBlocks.dummy_port_pumpjack || world.getBlock(x, y, z) == ModBlocks.dummy_port_turbofan || world.getBlock(x, y, z) == ModBlocks.dummy_port_ams_limiter || - world.getBlock(x, y, z) == ModBlocks.dummy_port_ams_emitter) + world.getBlock(x, y, z) == ModBlocks.dummy_port_ams_emitter || + world.getBlock(x, y, z) == ModBlocks.dummy_port_ams_base) { return true; } @@ -325,7 +326,8 @@ public class Library { world.getBlock(x, y, z) == ModBlocks.watz_hatch || world.getBlock(x, y, z) == ModBlocks.fwatz_hatch || world.getBlock(x, y, z) == ModBlocks.dummy_port_ams_limiter || - world.getBlock(x, y, z) == ModBlocks.dummy_port_ams_emitter) + world.getBlock(x, y, z) == ModBlocks.dummy_port_ams_emitter || + world.getBlock(x, y, z) == ModBlocks.dummy_port_ams_base) { return true; } @@ -500,6 +502,42 @@ public class Library { return list; } + public static String getShortNumber(long l) { + + if(l >= Math.pow(10, 18)) { + double res = l / Math.pow(10, 18); + res = Math.round(res * 100.0) / 100.0; + return res + "E"; + } + if(l >= Math.pow(10, 15)) { + double res = l / Math.pow(10, 15); + res = Math.round(res * 100.0) / 100.0; + return res + "P"; + } + if(l >= Math.pow(10, 12)) { + double res = l / Math.pow(10, 12); + res = Math.round(res * 100.0) / 100.0; + return res + "T"; + } + if(l >= Math.pow(10, 9)) { + double res = l / Math.pow(10, 9); + res = Math.round(res * 100.0) / 100.0; + return res + "G"; + } + if(l >= Math.pow(10, 6)) { + double res = l / Math.pow(10, 6); + res = Math.round(res * 100.0) / 100.0; + return res + "M"; + } + if(l >= Math.pow(10, 3)) { + double res = l / Math.pow(10, 3); + res = Math.round(res * 100.0) / 100.0; + return res + "k"; + } + + return Long.toString(l); + } + public static long chargeItemsFromTE(ItemStack[] slots, int index, long power, long maxPower) { if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_generic && ItemBattery.getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) @@ -597,6 +635,25 @@ public class Library { power -= 100; ((ItemBattery)slots[index].getItem()).chargeBattery(slots[index], 1); } else break; + + for(int i = 0; i < 200; i++) + if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_spark && ItemBattery.getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) + { + power -= 100; + ((ItemBattery)slots[index].getItem()).chargeBattery(slots[index], 1); + } else break; + for(int i = 0; i < 200; i++) + if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_spark_cell_6 && ItemBattery.getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) + { + power -= 100; + ((ItemBattery)slots[index].getItem()).chargeBattery(slots[index], 1); + } else break; + for(int i = 0; i < 200; i++) + if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_spark_cell_25 && ItemBattery.getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) + { + power -= 100; + ((ItemBattery)slots[index].getItem()).chargeBattery(slots[index], 1); + } else break; for(int i = 0; i < 10; i++) if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.factory_core_titanium && ItemBattery.getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) @@ -655,6 +712,17 @@ public class Library { return maxPower; } + if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_su && ItemBattery.getCharge(slots[index]) > 0) + { + power += 100; + ((ItemBattery)slots[index].getItem()).dischargeBattery(slots[index], 1); + } + if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_su_l && ItemBattery.getCharge(slots[index]) > 0) + { + power += 100; + ((ItemBattery)slots[index].getItem()).dischargeBattery(slots[index], 1); + } + if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_generic && ItemBattery.getCharge(slots[index]) > 0) { power += 100; @@ -750,6 +818,25 @@ public class Library { power += 100; ((ItemBattery)slots[index].getItem()).dischargeBattery(slots[index], 1); } else break; + + for(int i = 0; i < 200; i++) + if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_spark && ItemBattery.getCharge(slots[index]) > 0) + { + power += 100; + ((ItemBattery)slots[index].getItem()).dischargeBattery(slots[index], 1); + } else break; + for(int i = 0; i < 200; i++) + if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_spark_cell_6 && ItemBattery.getCharge(slots[index]) > 0) + { + power += 100; + ((ItemBattery)slots[index].getItem()).dischargeBattery(slots[index], 1); + } else break; + for(int i = 0; i < 200; i++) + if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_spark_cell_25 && ItemBattery.getCharge(slots[index]) > 0) + { + power += 100; + ((ItemBattery)slots[index].getItem()).dischargeBattery(slots[index], 1); + } else break; for(int i = 0; i < 25; i++) if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.fusion_core && ItemBattery.getCharge(slots[index]) > 0) @@ -1059,6 +1146,11 @@ public class Library { { tileentity = worldObj.getTileEntity(((TileEntityDummy)worldObj.getTileEntity(x, y, z)).targetX, ((TileEntityDummy)worldObj.getTileEntity(x, y, z)).targetY, ((TileEntityDummy)worldObj.getTileEntity(x, y, z)).targetZ); } + //AMS Base + if(block == ModBlocks.dummy_port_ams_base) + { + tileentity = worldObj.getTileEntity(((TileEntityDummy)worldObj.getTileEntity(x, y, z)).targetX, ((TileEntityDummy)worldObj.getTileEntity(x, y, z)).targetY, ((TileEntityDummy)worldObj.getTileEntity(x, y, z)).targetZ); + } if(tileentity == that) tileentity = null; diff --git a/com/hbm/lib/ModDamageSource.java b/com/hbm/lib/ModDamageSource.java index 7e142c7b4..d32c1d10e 100644 --- a/com/hbm/lib/ModDamageSource.java +++ b/com/hbm/lib/ModDamageSource.java @@ -31,6 +31,7 @@ public class ModDamageSource extends DamageSource { public static DamageSource blackhole = (new DamageSource("blackhole")).setDamageIsAbsolute().setDamageBypassesArmor(); public static DamageSource turbofan = (new DamageSource("blender")).setDamageIsAbsolute().setDamageBypassesArmor(); public static DamageSource meteorite = (new DamageSource("meteorite")).setDamageIsAbsolute().setDamageBypassesArmor(); + public static DamageSource boxcar = (new DamageSource("boxcar")).setDamageIsAbsolute().setDamageBypassesArmor(); public ModDamageSource(String p_i1566_1_) { super(p_i1566_1_); diff --git a/com/hbm/lib/RefStrings.java b/com/hbm/lib/RefStrings.java index 292b46572..e4e069ee6 100644 --- a/com/hbm/lib/RefStrings.java +++ b/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ package com.hbm.lib; public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech Mod"; - public static final String VERSION = "1.0.26"; + public static final String VERSION = "1.0.27 BETA (Bromine-Mercury-X01)"; //HBM's Beta Naming Convention: //V T (X-Y-Z) //V -> next release version diff --git a/com/hbm/main/ClientProxy.java b/com/hbm/main/ClientProxy.java index b9ede10c1..73ccb4e06 100644 --- a/com/hbm/main/ClientProxy.java +++ b/com/hbm/main/ClientProxy.java @@ -161,6 +161,7 @@ public class ClientProxy extends ServerProxy MinecraftForgeClient.registerItemRenderer(ModItems.gun_defabricator, new ItemRenderOverkill()); MinecraftForgeClient.registerItemRenderer(ModItems.gun_dash, new ItemRenderOverkill()); MinecraftForgeClient.registerItemRenderer(ModItems.gun_twigun, new ItemRenderOverkill()); + MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_pip, new ItemRenderOverkill()); MinecraftForgeClient.registerItemRenderer(ModItems.multitool_dig, new ItemRenderMultitool()); MinecraftForgeClient.registerItemRenderer(ModItems.multitool_silk, new ItemRenderMultitool()); @@ -238,6 +239,7 @@ public class ClientProxy extends ServerProxy RenderingRegistry.registerEntityRenderingHandler(EntityBombletTheta.class, new RenderBombletTheta()); RenderingRegistry.registerEntityRenderingHandler(EntityBombletSelena.class, new RenderBombletSelena()); RenderingRegistry.registerEntityRenderingHandler(EntityMeteor.class, new RenderMeteor()); + RenderingRegistry.registerEntityRenderingHandler(EntityBoxcar.class, new RenderBoxcar()); RenderingRegistry.registerEntityRenderingHandler(EntityMissileEndo.class, new RenderMissileThermo()); RenderingRegistry.registerEntityRenderingHandler(EntityMissileExo.class, new RenderMissileThermo()); diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index c69f33fa4..a51c042b8 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -374,9 +374,9 @@ public class CraftingManager { //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.part_copper), new Object[] { "P", "D", "P", 'P', "plateSteel", 'D', "dustCopper" })); //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.part_plutonium), new Object[] { "P", "D", "P", 'P', "plateSteel", 'D', "dustPlutonium" })); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_euphemium, 1, 34), new Object[] { ModItems.rod_quad_euphemium }); - GameRegistry.addRecipe(new ItemStack(ModItems.ingot_euphemium, 1, 34), new Object[] { "###", "###", "###", '#', new ItemStack(ModItems.nugget_euphemium, 1, 34) }); - GameRegistry.addRecipe(new ItemStack(ModItems.nugget_euphemium, 9, 34), new Object[] { "#", '#', new ItemStack(ModItems.ingot_euphemium, 1, 34) }); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_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 }); //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pellet_rtg, 1), new Object[] { "IPI", "PPP", "IPI", 'I', "plateIron", 'P', "tinyPu238" })); //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pellet_rtg_weak, 1), new Object[] { "IUI", "UPU", "IUI", 'I', "plateIron", 'P', "tinyPu238", 'U', "tinyU238" })); @@ -543,11 +543,11 @@ public class CraftingManager { //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.titanium_filter, 1), new Object[] { "PFP", "CBC", "CBC", 'P', "plateLead", 'B', "U238", 'C', "plateTitanium", 'F', ModItems.fuse })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.detonator, 1), new Object[] { " W", "SC", "CE", 'S', "plateSteel", 'W', ModItems.wire_red_copper, 'C', ModItems.circuit_red_copper, 'E', "ingotSteel" })); - GameRegistry.addRecipe(new ItemStack(ModItems.singularity, 1), new Object[] { "ESE", "SBS", "ESE", 'E', new ItemStack(ModItems.nugget_euphemium, 1, 34), 'S', ModItems.cell_anti_schrabidium, 'B', Item.getItemFromBlock(ModBlocks.block_schrabidium) }); + GameRegistry.addRecipe(new ItemStack(ModItems.singularity, 1), new Object[] { "ESE", "SBS", "ESE", 'E', ModItems.nugget_euphemium, 'S', ModItems.cell_anti_schrabidium, 'B', Item.getItemFromBlock(ModBlocks.block_schrabidium) }); GameRegistry.addRecipe(new ItemStack(ModItems.singularity_counter_resonant, 1), new Object[] { "CTC", "TST", "CTC", 'C', ModItems.plate_combine_steel, 'T', ModItems.ingot_magnetized_tungsten, 'S', ModItems.singularity }); GameRegistry.addRecipe(new ItemStack(ModItems.singularity_super_heated, 1), new Object[] { "CTC", "TST", "CTC", 'C', ModItems.plate_advanced_alloy, 'T', ModItems.powder_power, 'S', ModItems.singularity }); GameRegistry.addRecipe(new ItemStack(ModItems.black_hole, 1), new Object[] { "SSS", "SCS", "SSS", 'C', ModItems.singularity, 'S', ModItems.crystal_xen }); - GameRegistry.addRecipe(new ItemStack(ModItems.crystal_xen, 1), new Object[] { "EEE", "EIE", "EEE", 'E', ModItems.powder_power, 'I', new ItemStack(ModItems.ingot_euphemium, 1, 34) }); + GameRegistry.addRecipe(new ItemStack(ModItems.crystal_xen, 1), new Object[] { "EEE", "EIE", "EEE", 'E', ModItems.powder_power, 'I', ModItems.ingot_euphemium }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.screwdriver, 1), new Object[] { " I", " I ", "S ", 'S', "ingotSteel", 'I', "ingotIron" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.overfuse, 1), new Object[] { ModItems.screwdriver, "dustNeptunium", ModItems.powder_iodine, ModItems.powder_thorium, ModItems.powder_astatine, ModItems.powder_neodymium, ModItems.board_copper, ModItems.black_hole, ModItems.powder_caesium })); @@ -679,7 +679,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_cryolator_ammo, 16), new Object[] { "SPS", "PCP", "SPS", 'S', "plateSteel", 'C', "dustSalpeter", 'P', Items.snowball })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_cryolator_ammo, 16), new Object[] { " F ", "SFS", " F ", 'S', "plateSteel", 'F', ModItems.powder_ice })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_zomg, 1), new Object[] { "PRR", "CCS", "PXX", 'P', ModItems.plate_paa, 'R', "plateDenseLead", 'S', ModItems.singularity_counter_resonant, 'X', ModItems.crystal_xen, 'C', ModItems.coil_magnetized_tungsten})); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_mp, 1), new Object[] { "EEE", "SSM", "III", 'E', new ItemStack(ModItems.ingot_euphemium, 1, 34), 'S', "plateSteel", 'I', "ingotSteel", 'M', ModItems.motor})); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_mp, 1), new Object[] { "EEE", "SSM", "III", 'E', ModItems.ingot_euphemium, 'S', "plateSteel", 'I', "ingotSteel", 'M', ModItems.motor})); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_mp_ammo, 32), new Object[] { "G", "C", 'G', "plateGold", 'C', "plateCopper", 'S', Items.gunpowder })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_emp, 1), new Object[] { "CPG", "CMF", "CPI", 'C', ModItems.coil_copper, 'P', "plateLead", 'G', ModItems.circuit_gold, 'M', ModItems.magnetron, 'I', "ingotTungsten", 'F', ModItems.fuse })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_emp_ammo, 8), new Object[] { "IGI", "IPI", "IPI", 'G', "plateGold", 'I', "plateIron", 'P', ModItems.powder_power })); @@ -949,18 +949,18 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.cape_radiation, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 11), 'D', new ItemStack(Items.dye, 1, 11), 'I', ModItems.nuclear_waste }); GameRegistry.addRecipe(new ItemStack(ModItems.cape_gasmask, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 4), 'D', new ItemStack(Items.dye, 1, 0), 'I', ModItems.gas_mask }); GameRegistry.addRecipe(new ItemStack(ModItems.cape_schrabidium, 1), new Object[] { "W W", "WIW", "WDW", 'W', ModItems.ingot_schrabidium, 'D', new ItemStack(Items.dye, 1, 0), 'I', ModItems.circuit_red_copper }); - GameRegistry.addRecipe(new ItemStack(ModItems.cape_hbm, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 15), 'D', ModItems.ingot_neptunium, 'I', new ItemStack(ModItems.ingot_euphemium, 1, 34) }); + GameRegistry.addRecipe(new ItemStack(ModItems.cape_hbm, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 15), 'D', ModItems.ingot_neptunium, 'I', ModItems.ingot_euphemium }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cape_dafnik, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 1), 'D', new ItemStack(Items.dye, 1, 0), 'I', "ingotSteel" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cape_lpkukin, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 13), 'D', new ItemStack(Items.dye, 1, 8), 'I', "plateSteel" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.igniter, 1), new Object[] { " W", "SC", "CE", 'S', "plateSteel", 'W', ModItems.wire_schrabidium, 'C', ModItems.circuit_schrabidium, 'E', new ItemStack(ModItems.ingot_euphemium, 1, 34) })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.igniter, 1), new Object[] { " W", "SC", "CE", 'S', "plateSteel", 'W', ModItems.wire_schrabidium, 'C', ModItems.circuit_schrabidium, 'E', ModItems.ingot_euphemium })); GameRegistry.addRecipe(new ItemStack(ModItems.euphemium_helmet, 1), new Object[] { "EEE", "E E", 'E', ModItems.plate_euphemium }); GameRegistry.addRecipe(new ItemStack(ModItems.euphemium_plate, 1), new Object[] { "EWE", "EEE", "EEE", 'E', ModItems.plate_euphemium, 'W', ModItems.watch }); GameRegistry.addRecipe(new ItemStack(ModItems.euphemium_legs, 1), new Object[] { "EEE", "E E", "E E", 'E', ModItems.plate_euphemium }); GameRegistry.addRecipe(new ItemStack(ModItems.euphemium_boots, 1), new Object[] { "E E", "E E", 'E', ModItems.plate_euphemium }); - GameRegistry.addRecipe(new ItemStack(ModItems.watch, 1), new Object[] { "LEL", "EWE", "LEL", 'E', new ItemStack(ModItems.ingot_euphemium, 1, 34), 'L', new ItemStack(Items.dye, 1, 4), 'W', Items.clock }); - GameRegistry.addRecipe(new ItemStack(ModItems.apple_euphemium, 1), new Object[] { "EEE", "EAE", "EEE", 'E', new ItemStack(ModItems.nugget_euphemium, 1, 34), 'A', Items.apple }); - GameRegistry.addRecipe(new ItemStack(ModItems.plate_euphemium, 1), new Object[] { "AEA", "ENE", "AEA", 'E', new ItemStack(ModItems.ingot_euphemium, 1, 34), 'N', Items.nether_star, 'A', ModItems.powder_astatine }); + GameRegistry.addRecipe(new ItemStack(ModItems.watch, 1), new Object[] { "LEL", "EWE", "LEL", 'E', ModItems.ingot_euphemium, 'L', new ItemStack(Items.dye, 1, 4), 'W', Items.clock }); + GameRegistry.addRecipe(new ItemStack(ModItems.apple_euphemium, 1), new Object[] { "EEE", "EAE", "EEE", 'E', ModItems.nugget_euphemium, 'A', Items.apple }); + GameRegistry.addRecipe(new ItemStack(ModItems.plate_euphemium, 1), new Object[] { "AEA", "ENE", "AEA", 'E', ModItems.ingot_euphemium, 'N', Items.nether_star, 'A', ModItems.powder_astatine }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mask_of_infamy, 1), new Object[] { "III", "III", " I ", 'I', "plateIron" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.designator, 1), new Object[] { " A", "#B#", "#B#", '#', "plateIron", 'A', "plateSteel", 'B', ModItems.circuit_red_copper })); @@ -972,7 +972,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.geiger_counter, 1), new Object[] { "GPP", "WCS", "WBB", 'W', ModItems.wire_gold, 'P', ModItems.ingot_polymer, 'C', ModItems.circuit_copper, 'G', "ingotGold", 'S', "plateSteel", 'B', ModItems.ingot_beryllium })); //GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_hammer, 1), new Object[] { "BBB", "BBB", " S ", 'B', Item.getItemFromBlock(ModBlocks.block_schrabidium), 'S', Items.stick }); - GameRegistry.addRecipe(new ItemStack(ModItems.euphemium_stopper, 1), new Object[] { "I", "S", "S", 'I', new ItemStack(ModItems.ingot_euphemium, 1, 34), 'S', Items.stick }); + GameRegistry.addRecipe(new ItemStack(ModItems.euphemium_stopper, 1), new Object[] { "I", "S", "S", 'I', ModItems.ingot_euphemium, 'S', Items.stick }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.matchstick, 16), new Object[] { "I", "S", 'I', "sulfur", 'S', Items.stick })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.matchstick, 16), new Object[] { "I", "S", 'I', "dustSulfur", 'S', Items.stick })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.crowbar, 1), new Object[] { "II", " I", " I", 'I', "ingotSteel" })); diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index b18606ebf..13f5a510c 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -105,6 +105,7 @@ import com.hbm.entity.particle.EntitySSmokeFX; import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.entity.particle.EntityTSmokeFX; import com.hbm.entity.projectile.EntityBaleflare; +import com.hbm.entity.projectile.EntityBoxcar; import com.hbm.entity.projectile.EntityBullet; import com.hbm.entity.projectile.EntityChopperMine; import com.hbm.entity.projectile.EntityCombineBall; @@ -615,6 +616,7 @@ public class MainRegistry EntityRegistry.registerModEntity(EntityVortex.class, "entity_vortex", 83, this, 250, 1, true); EntityRegistry.registerModEntity(EntityMeteor.class, "entity_meteor", 84, this, 1000, 1, true); EntityRegistry.registerModEntity(EntityLaser.class, "entity_laser", 85, this, 1000, 1, true); + EntityRegistry.registerModEntity(EntityBoxcar.class, "entity_boxcar", 86, this, 1000, 1, true); EntityRegistry.registerGlobalEntityID(EntityNuclearCreeper.class, "entity_mob_nuclear_creeper", EntityRegistry.findGlobalUniqueEntityId(), 0x204131, 0x75CE00); EntityRegistry.registerGlobalEntityID(EntityHunterChopper.class, "entity_mob_hunter_chopper", EntityRegistry.findGlobalUniqueEntityId(), 0x000020, 0x2D2D72); diff --git a/com/hbm/main/ResourceManager.java b/com/hbm/main/ResourceManager.java index 56f851e8a..472839b6d 100644 --- a/com/hbm/main/ResourceManager.java +++ b/com/hbm/main/ResourceManager.java @@ -89,4 +89,13 @@ public class ResourceManager { //Shimmer Sledge public static final ResourceLocation shimmer_sledge_tex = new ResourceLocation(RefStrings.MODID, "textures/models/shimmer_sledge.png"); + ////Obj Entities + + //Boxcar + public static final IModelCustom boxcar = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/boxcar.obj")); + + ////Texture Entities + + //Boxcar + public static final ResourceLocation boxcar_tex = new ResourceLocation(RefStrings.MODID, "textures/models/boxcar.png"); } diff --git a/com/hbm/render/entity/RenderBoxcar.java b/com/hbm/render/entity/RenderBoxcar.java new file mode 100644 index 000000000..7ab69b184 --- /dev/null +++ b/com/hbm/render/entity/RenderBoxcar.java @@ -0,0 +1,36 @@ +package com.hbm.render.entity; + +import org.lwjgl.opengl.GL11; + +import com.hbm.main.ResourceManager; + +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.entity.Entity; +import net.minecraft.util.ResourceLocation; + +public class RenderBoxcar extends Render { + + @Override + public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, + float p_76986_9_) { + + GL11.glPushMatrix(); + GL11.glTranslatef((float)p_76986_2_, (float)p_76986_4_, (float)p_76986_6_); + GL11.glTranslatef(0, 0, -1.5F); + GL11.glRotated(180, 0, 0, 1); + GL11.glRotated(90, 1, 0, 0); + GL11.glDisable(GL11.GL_CULL_FACE); + + bindTexture(ResourceManager.boxcar_tex); + ResourceManager.boxcar.renderAll(); + + GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glPopMatrix(); + } + + @Override + protected ResourceLocation getEntityTexture(Entity p_110775_1_) { + return ResourceManager.boxcar_tex; + } + +} \ No newline at end of file diff --git a/com/hbm/render/item/ItemRenderOverkill.java b/com/hbm/render/item/ItemRenderOverkill.java index 5dccbdd75..27d8b341c 100644 --- a/com/hbm/render/item/ItemRenderOverkill.java +++ b/com/hbm/render/item/ItemRenderOverkill.java @@ -4,12 +4,14 @@ import org.lwjgl.opengl.GL11; import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; +import com.hbm.main.MainRegistry; import com.hbm.render.model.ModelDash; import com.hbm.render.model.ModelDefabricator; import com.hbm.render.model.ModelEuthanasia; import com.hbm.render.model.ModelGun; import com.hbm.render.model.ModelHP; import com.hbm.render.model.ModelJack; +import com.hbm.render.model.ModelPip; import com.hbm.render.model.ModelSpark; import com.hbm.render.model.ModelTwiGun; @@ -28,6 +30,7 @@ public class ItemRenderOverkill implements IItemRenderer { protected ModelDefabricator defab; protected ModelDash dasher; protected ModelTwiGun rgottp; + protected ModelPip pip; public ItemRenderOverkill() { powerJack = new ModelJack(); @@ -37,6 +40,7 @@ public class ItemRenderOverkill implements IItemRenderer { defab = new ModelDefabricator(); dasher = new ModelDash(); rgottp = new ModelTwiGun(); + pip = new ModelPip(); } @Override @@ -76,6 +80,8 @@ public class ItemRenderOverkill implements IItemRenderer { Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelDash.png")); if(item.getItem() == ModItems.gun_twigun) Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelTwiGun.png")); + if(item.getItem() == ModItems.gun_revolver_pip) + Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelPip.png")); GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F); GL11.glTranslatef(-0.5F, 0.0F, -0.2F); @@ -83,9 +89,15 @@ public class ItemRenderOverkill implements IItemRenderer { GL11.glScalef(0.5F, 0.5F, 0.5F); //GL11.glTranslatef(-0.4F, -0.1F, 0.1F); GL11.glTranslatef(-0.2F, -0.1F, -0.1F); + if(item.getItem() == ModItems.gun_defabricator) GL11.glTranslatef(0, 0.5F, 0.4F); + if(item.getItem() == ModItems.gun_revolver_pip) { + GL11.glScalef(0.60F, 0.60F, 0.60F); + GL11.glTranslatef(0.0F, 0.3F, 0.2F); + } + if(item.getItem() == ModItems.gun_jack) powerJack.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); if(item.getItem() == ModItems.gun_spark) @@ -100,6 +112,8 @@ public class ItemRenderOverkill implements IItemRenderer { dasher.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); if(item.getItem() == ModItems.gun_twigun) rgottp.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); + if(item.getItem() == ModItems.gun_revolver_pip) + pip.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); GL11.glPopMatrix(); break; case EQUIPPED: @@ -120,6 +134,8 @@ public class ItemRenderOverkill implements IItemRenderer { Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelDash.png")); if(item.getItem() == ModItems.gun_twigun) Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelTwiGun.png")); + if(item.getItem() == ModItems.gun_revolver_pip) + Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelPip.png")); GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F); @@ -138,6 +154,11 @@ public class ItemRenderOverkill implements IItemRenderer { if(item.getItem() == ModItems.gun_defabricator) GL11.glTranslatef(0.5F, 0.6F, -0.2F); + if(item.getItem() == ModItems.gun_revolver_pip) { + GL11.glScalef(0.60F, 0.60F, 0.60F); + GL11.glTranslatef(0.7F, 0.3F, 0.0F); + } + if(item.getItem() == ModItems.gun_jack) powerJack.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); if(item.getItem() == ModItems.gun_spark) @@ -152,6 +173,8 @@ public class ItemRenderOverkill implements IItemRenderer { dasher.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); if(item.getItem() == ModItems.gun_twigun) rgottp.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); + if(item.getItem() == ModItems.gun_revolver_pip) + pip.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); GL11.glPopMatrix(); default: break; } diff --git a/com/hbm/render/model/ModelPip.java b/com/hbm/render/model/ModelPip.java new file mode 100755 index 000000000..6fe5f40c2 --- /dev/null +++ b/com/hbm/render/model/ModelPip.java @@ -0,0 +1,223 @@ +//This File was created with the Minecraft-SMP Modelling Toolbox 2.3.0.0 +// Copyright (C) 2017 Minecraft-SMP.de +// This file is for Flan's Flying Mod Version 4.0.x+ + +// Model: Pip +// Model Creator: +// Created on:09.12.2017 - 12:48:52 +// Last changed on: 09.12.2017 - 12:48:52 + +package com.hbm.render.model; + +import org.lwjgl.opengl.GL11; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +public class ModelPip extends ModelBase +{ + + public ModelRenderer pipModel[]; + + int textureX = 128; + int textureY = 128; + + public ModelPip() + { + textureWidth = 128; + textureHeight = 128; + pipModel = new ModelRenderer[39]; + pipModel[0] = new ModelRenderer(this, 1, 1); // Box 0 + pipModel[1] = new ModelRenderer(this, 49, 1); // Box 1 + pipModel[2] = new ModelRenderer(this, 97, 1); // Box 2 + pipModel[3] = new ModelRenderer(this, 1, 9); // Box 3 + pipModel[4] = new ModelRenderer(this, 25, 9); // Box 4 + pipModel[5] = new ModelRenderer(this, 49, 9); // Box 5 + pipModel[6] = new ModelRenderer(this, 73, 9); // Box 6 + pipModel[7] = new ModelRenderer(this, 81, 17); // Box 7 + pipModel[8] = new ModelRenderer(this, 97, 17); // Box 10 + pipModel[9] = new ModelRenderer(this, 1, 25); // Box 12 + pipModel[10] = new ModelRenderer(this, 1, 9); // Box 14 + pipModel[11] = new ModelRenderer(this, 17, 25); // Box 15 + pipModel[12] = new ModelRenderer(this, 41, 25); // Box 16 + pipModel[13] = new ModelRenderer(this, 49, 9); // Box 17 + pipModel[14] = new ModelRenderer(this, 113, 17); // Box 18 + pipModel[15] = new ModelRenderer(this, 73, 17); // Box 19 + pipModel[16] = new ModelRenderer(this, 65, 25); // Box 20 + pipModel[17] = new ModelRenderer(this, 113, 25); // Box 22 + pipModel[18] = new ModelRenderer(this, 65, 25); // Box 23 + pipModel[19] = new ModelRenderer(this, 1, 33); // Box 24 + pipModel[20] = new ModelRenderer(this, 81, 33); // Box 25 + pipModel[21] = new ModelRenderer(this, 1, 41); // Box 26 + pipModel[22] = new ModelRenderer(this, 89, 33); // Box 27 + pipModel[23] = new ModelRenderer(this, 105, 33); // Box 28 + pipModel[24] = new ModelRenderer(this, 33, 41); // Box 29 + pipModel[25] = new ModelRenderer(this, 49, 41); // Box 30 + pipModel[26] = new ModelRenderer(this, 65, 41); // Box 31 + pipModel[27] = new ModelRenderer(this, 105, 41); // Box 32 + pipModel[28] = new ModelRenderer(this, 1, 49); // Box 33 + pipModel[29] = new ModelRenderer(this, 17, 49); // Box 34 + pipModel[30] = new ModelRenderer(this, 33, 49); // Box 35 + pipModel[31] = new ModelRenderer(this, 57, 49); // Box 36 + pipModel[32] = new ModelRenderer(this, 81, 49); // Box 37 + pipModel[33] = new ModelRenderer(this, 105, 49); // Box 38 + pipModel[34] = new ModelRenderer(this, 1, 57); // Box 39 + pipModel[35] = new ModelRenderer(this, 89, 25); // Box 40 + pipModel[36] = new ModelRenderer(this, 97, 41); // Box 41 + pipModel[37] = new ModelRenderer(this, 49, 49); // Box 42 + pipModel[38] = new ModelRenderer(this, 73, 57); // Box 43 + + pipModel[0].addBox(0F, 0F, 0F, 20, 3, 2, 0F); // Box 0 + pipModel[0].setRotationPoint(-20F, -5.5F, -1F); + + pipModel[1].addBox(0F, 0F, 0F, 20, 2, 3, 0F); // Box 1 + pipModel[1].setRotationPoint(-20F, -5F, -1.5F); + + pipModel[2].addBox(0F, 0F, 0F, 10, 8, 3, 0F); // Box 2 + pipModel[2].setRotationPoint(0F, -6F, -1.5F); + + pipModel[3].addBox(0F, 0F, 0F, 6, 5, 5, 0F); // Box 3 + pipModel[3].setRotationPoint(2F, -5F, -2.5F); + + pipModel[4].addBox(0F, 0F, 0F, 6, 6, 4, 0F); // Box 4 + pipModel[4].setRotationPoint(2F, -5.5F, -2F); + + pipModel[5].addBox(0F, 0F, 0F, 6, 4, 6, 0F); // Box 5 + pipModel[5].setRotationPoint(2F, -4.5F, -3F); + + pipModel[6].addBox(0F, 0F, 0F, 7, 2, 1, 0F); // Box 6 + pipModel[6].setRotationPoint(-7F, -2.5F, -0.5F); + + pipModel[7].addBox(-6F, 0F, 0F, 6, 3, 1, 0F); // Box 7 + pipModel[7].setRotationPoint(15F, -2.5F, -1.5F); + pipModel[7].rotateAngleZ = 0.61086524F; + + pipModel[8].addBox(0F, 0F, 0F, 5, 5, 3, 0F); // Box 10 + pipModel[8].setRotationPoint(10F, -2.5F, -1.5F); + + pipModel[9].addBox(-6F, 0F, 0F, 6, 3, 1, 0F); // Box 12 + pipModel[9].setRotationPoint(15F, -2.5F, 0.5F); + pipModel[9].rotateAngleZ = 0.61086524F; + + pipModel[10].addBox(-6F, 0F, 0F, 1, 3, 1, 0F); // Box 14 + pipModel[10].setRotationPoint(15F, -2.5F, -0.5F); + pipModel[10].rotateAngleZ = 0.61086524F; + + pipModel[11].addBox(0F, 0F, 0F, 6, 6, 4, 0F); // Box 15 + pipModel[11].setRotationPoint(12F, 4F, -2F); + + pipModel[12].addBox(-5F, -7F, 0F, 5, 7, 4, 0F); // Box 16 + pipModel[12].setRotationPoint(18F, 4F, -2F); + pipModel[12].rotateAngleZ = -0.52359878F; + + pipModel[13].addBox(0F, -2F, 0F, 1, 2, 1, 0F); // Box 17 + pipModel[13].setRotationPoint(12F, -2.5F, -0.5F); + pipModel[13].rotateAngleZ = 0.34906585F; + + pipModel[14].addBox(-0.5F, -3F, 0F, 3, 1, 1, 0F); // Box 18 + pipModel[14].setRotationPoint(12F, -2.5F, -0.5F); + pipModel[14].rotateAngleZ = 0.34906585F; + + pipModel[15].addBox(0F, 0F, 0F, 1, 3, 5, 0F); // Box 19 + pipModel[15].setRotationPoint(8F, -4F, -2.5F); + + pipModel[16].addBox(0F, 0F, 0F, 1, 3, 5, 0F); // Box 20 + pipModel[16].setRotationPoint(1F, -4F, -2.5F); + + pipModel[17].addBox(0F, 0F, 0F, 5, 3, 2, 0F); // Box 22 + pipModel[17].setRotationPoint(5F, 2F, -1F); + + pipModel[18].addBox(-1F, -0.5F, 0F, 1, 3, 1, 0F); // Box 23 + pipModel[18].setRotationPoint(9F, 2F, -0.5F); + pipModel[18].rotateAngleZ = 0.43633231F; + + pipModel[19].addBox(0F, 0F, 0F, 5, 1, 2, 0F); // Box 24 + pipModel[19].setRotationPoint(-19.5F, -6.5F, -1F); + + pipModel[20].addBox(0F, 0F, 0F, 4, 1, 1, 0F); // Box 25 + pipModel[20].setRotationPoint(-19F, -7.5F, -0.5F); + pipModel[20].rotateAngleZ = 0.26179939F; + + pipModel[21].addBox(0F, 0F, 0F, 15, 1, 2, 0F); // Box 26 + pipModel[21].setRotationPoint(-4F, -7F, -1F); + + pipModel[22].addBox(1F, 0F, 0F, 3, 4, 3, 0F); // Box 27 + pipModel[22].setRotationPoint(-3F, -12F, -1.5F); + + pipModel[23].addBox(1F, 0F, 0F, 3, 3, 4, 0F); // Box 28 + pipModel[23].setRotationPoint(-3F, -11.5F, -2F); + + pipModel[24].addBox(0F, 0F, 0F, 3, 3, 4, 0F); // Box 29 + pipModel[24].setRotationPoint(6F, -11.5F, -2F); + + pipModel[25].addBox(0F, 0F, 0F, 3, 4, 3, 0F); // Box 30 + pipModel[25].setRotationPoint(6F, -12F, -1.5F); + + pipModel[26].addBox(0F, 0F, 0F, 13, 3, 3, 0F); // Box 31 + pipModel[26].setRotationPoint(-3F, -11.5F, -1.5F); + + pipModel[27].addBox(0F, 0F, 0F, 3, 4, 3, 0F); // Box 32 + pipModel[27].setRotationPoint(-6F, -12F, -1.5F); + + pipModel[28].addBox(0F, 0F, 0F, 3, 3, 4, 0F); // Box 33 + pipModel[28].setRotationPoint(-6F, -11.5F, -2F); + + pipModel[29].addBox(0F, 0F, 0F, 4, 5, 3, 0F); // Box 34 + pipModel[29].setRotationPoint(-10F, -12.5F, -1.5F); + + pipModel[30].addBox(0F, 0F, 0F, 4, 3, 5, 0F); // Box 35 + pipModel[30].setRotationPoint(-10F, -11.5F, -2.5F); + + pipModel[31].addBox(0F, 0F, 0F, 4, 4, 4, 0F); // Box 36 + pipModel[31].setRotationPoint(-10F, -12F, -2F); + + pipModel[32].addBox(0F, 0F, 0F, 5, 3, 4, 0F); // Box 37 + pipModel[32].setRotationPoint(10F, -11.5F, -2F); + + pipModel[33].addBox(0F, 0F, 0F, 5, 4, 3, 0F); // Box 38 + pipModel[33].setRotationPoint(10F, -12F, -1.5F); + + pipModel[34].addBox(0F, 0F, 0F, 3, 4, 4, 0F); // Box 39 + pipModel[34].setRotationPoint(2F, -12F, -2F); + + pipModel[35].addBox(0F, 0F, 0F, 3, 1, 1, 0F); // Box 40 + pipModel[35].setRotationPoint(-2F, -8F, -0.5F); + + pipModel[36].addBox(0F, 0F, 0F, 3, 1, 1, 0F); // Box 41 + pipModel[36].setRotationPoint(6F, -8F, -0.5F); + + pipModel[37].addBox(0F, 0F, 0F, 2, 1, 2, 0F); // Box 42 + pipModel[37].setRotationPoint(2.5F, -12.5F, -1F); + + pipModel[38].addBox(0F, 0F, 0F, 3, 1, 3, 0F); // Box 43 + pipModel[38].setRotationPoint(2F, -13.5F, -1.5F); + + + for(int i = 0; i < 39; i++) + { + pipModel[i].setTextureSize(textureX, textureY); + pipModel[i].mirror = true; + } + + } + + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) + { + super.render(entity, f, f1, f2, f3, f4, f5); + setRotationAngles(f, f1, f2, f3, f4, f5, entity); + GL11.glDisable(GL11.GL_CULL_FACE); + for(int i = 0; i < 39; i++) + { + pipModel[i].render(f5); + } + GL11.glEnable(GL11.GL_CULL_FACE); + } + + @Override + public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) + { + super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); + } +} \ No newline at end of file diff --git a/com/hbm/render/tileentity/RenderDecoBlock.java b/com/hbm/render/tileentity/RenderDecoBlock.java index f621549cc..aec97c4d4 100644 --- a/com/hbm/render/tileentity/RenderDecoBlock.java +++ b/com/hbm/render/tileentity/RenderDecoBlock.java @@ -4,6 +4,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.blocks.ModBlocks; import com.hbm.lib.RefStrings; +import com.hbm.main.ResourceManager; import com.hbm.render.model.ModelSteelBeam; import com.hbm.render.model.ModelSteelCorner; import com.hbm.render.model.ModelSteelRoof; @@ -108,6 +109,17 @@ public class RenderDecoBlock extends TileEntitySpecialRenderer { if(tileentity.getWorldObj().getBlock(tileentity.xCoord, tileentity.yCoord, tileentity.zCoord) == ModBlocks.steel_scaffold) this.model5.renderModel(0.0625F); GL11.glPopMatrix(); + + if(tileentity.getWorldObj().getBlock(tileentity.xCoord, tileentity.yCoord, tileentity.zCoord) == ModBlocks.boxcar) { + GL11.glTranslatef(0, 0, -1.5F); + GL11.glRotated(90, 1, 0, 0); + + GL11.glDisable(GL11.GL_CULL_FACE); + bindTexture(ResourceManager.boxcar_tex); + ResourceManager.boxcar.renderAll(); + GL11.glEnable(GL11.GL_CULL_FACE); + } + GL11.glPopMatrix(); } diff --git a/com/hbm/tileentity/machine/TileEntityAMSBase.java b/com/hbm/tileentity/machine/TileEntityAMSBase.java index cea2acb40..49dbb682e 100644 --- a/com/hbm/tileentity/machine/TileEntityAMSBase.java +++ b/com/hbm/tileentity/machine/TileEntityAMSBase.java @@ -35,7 +35,7 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IS private ItemStack slots[]; public long power = 0; - public static final long maxPower = 1000000; + public static final long maxPower = 1000000000000000L; public int field = 0; public static final int maxField = 100; public int efficiency = 0; @@ -61,10 +61,10 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IS public TileEntityAMSBase() { slots = new ItemStack[13]; tanks = new FluidTank[4]; - tanks[0] = new FluidTank(FluidType.WATER, 64000, 0); - tanks[1] = new FluidTank(FluidType.COOLANT, 64000, 1); - tanks[2] = new FluidTank(FluidType.DEUTERIUM, 64000, 2); - tanks[3] = new FluidTank(FluidType.TRITIUM, 64000, 3); + tanks[0] = new FluidTank(FluidType.WATER, 8000, 0); + tanks[1] = new FluidTank(FluidType.COOLANT, 8000, 1); + tanks[2] = new FluidTank(FluidType.DEUTERIUM, 8000, 2); + tanks[3] = new FluidTank(FluidType.TRITIUM, 8000, 3); } @Override @@ -246,30 +246,49 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IS tanks[i].updateTank(xCoord, yCoord, zCoord); int f1 = 0, f2 = 0, f3 = 0, f4 = 0; + int booster = 0; if(worldObj.getTileEntity(xCoord + 6, yCoord, zCoord) instanceof TileEntityAMSLimiter) { TileEntityAMSLimiter te = (TileEntityAMSLimiter)worldObj.getTileEntity(xCoord + 6, yCoord, zCoord); - if(!te.locked && worldObj.getBlockMetadata(xCoord + 6, yCoord, zCoord) == 4) + if(!te.locked && worldObj.getBlockMetadata(xCoord + 6, yCoord, zCoord) == 4) { f1 = te.efficiency; + if(te.mode == 2) + booster++; + } } if(worldObj.getTileEntity(xCoord - 6, yCoord, zCoord) instanceof TileEntityAMSLimiter) { TileEntityAMSLimiter te = (TileEntityAMSLimiter)worldObj.getTileEntity(xCoord - 6, yCoord, zCoord); - if(!te.locked && worldObj.getBlockMetadata(xCoord - 6, yCoord, zCoord) == 5) + if(!te.locked && worldObj.getBlockMetadata(xCoord - 6, yCoord, zCoord) == 5) { f2 = te.efficiency; + if(te.mode == 2) + booster++; + } } if(worldObj.getTileEntity(xCoord, yCoord, zCoord + 6) instanceof TileEntityAMSLimiter) { TileEntityAMSLimiter te = (TileEntityAMSLimiter)worldObj.getTileEntity(xCoord, yCoord, zCoord + 6); - if(!te.locked && worldObj.getBlockMetadata(xCoord, yCoord, zCoord + 6) == 2) + if(!te.locked && worldObj.getBlockMetadata(xCoord, yCoord, zCoord + 6) == 2) { f3 = te.efficiency; + if(te.mode == 2) + booster++; + } } if(worldObj.getTileEntity(xCoord, yCoord, zCoord - 6) instanceof TileEntityAMSLimiter) { TileEntityAMSLimiter te = (TileEntityAMSLimiter)worldObj.getTileEntity(xCoord, yCoord, zCoord - 6); - if(!te.locked && worldObj.getBlockMetadata(xCoord, yCoord, zCoord - 6) == 3) + if(!te.locked && worldObj.getBlockMetadata(xCoord, yCoord, zCoord - 6) == 3) { f4 = te.efficiency; + if(te.mode == 2) + booster++; + } } this.field = Math.round(calcField(f1, f2, f3, f4)); + mode = 0; + if(field > 0) + mode = 1; + if(booster > 0) + mode = 2; + if(worldObj.getTileEntity(xCoord, yCoord + 9, zCoord) instanceof TileEntityAMSEmitter) { TileEntityAMSEmitter te = (TileEntityAMSEmitter)worldObj.getTileEntity(xCoord, yCoord + 9, zCoord); this.efficiency = te.efficiency; diff --git a/com/hbm/tileentity/machine/TileEntityAMSLimiter.java b/com/hbm/tileentity/machine/TileEntityAMSLimiter.java index b0e3f5a9d..01f02b7fa 100644 --- a/com/hbm/tileentity/machine/TileEntityAMSLimiter.java +++ b/com/hbm/tileentity/machine/TileEntityAMSLimiter.java @@ -302,9 +302,12 @@ public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory, if(slots[2] != null) { if(slots[2].getItem() == ModItems.ams_focus_limiter) mode = 1; - if(slots[2].getItem() == ModItems.ams_focus_booster) + else if(slots[2].getItem() == ModItems.ams_focus_booster) mode = 2; - } + else + this.efficiency = 0; + } else + this.efficiency = 0; if(tank.getFill() <= 5 || heat > maxHeat * 0.9) warning = 2; diff --git a/com/hbm/tileentity/machine/TileEntityFWatzCore.java b/com/hbm/tileentity/machine/TileEntityFWatzCore.java index 3a535c2c3..47a33812b 100644 --- a/com/hbm/tileentity/machine/TileEntityFWatzCore.java +++ b/com/hbm/tileentity/machine/TileEntityFWatzCore.java @@ -29,7 +29,7 @@ import net.minecraft.world.World; public class TileEntityFWatzCore extends TileEntity implements ISidedInventory, IReactor, ISource, IFluidContainer, IFluidAcceptor { public long power; - public final static long maxPower = 100000000; + public final static long maxPower = 10000000000L; public boolean cooldown = false; public FluidTank tanks[]; @@ -303,35 +303,35 @@ public class TileEntityFWatzCore extends TileEntity implements ISidedInventory, tanks[0].setFill(tanks[0].getFill() - 150); tanks[1].setFill(tanks[1].getFill() - 75); tanks[2].setFill(tanks[2].getFill() - 75); - power += 500000; + power += 5000000; isWorking = true; } if(i == 2 && tanks[1].getFill() - 75 >= 0 && tanks[2].getFill() - 35 >= 0) { tanks[0].setFill(tanks[0].getFill() - 75); tanks[1].setFill(tanks[1].getFill() - 35); tanks[2].setFill(tanks[2].getFill() - 30); - power += 250000; + power += 2500000; isWorking = true; } if(i == 3 && tanks[1].getFill() - 75 >= 0 && tanks[2].getFill() - 140 >= 0) { tanks[0].setFill(tanks[0].getFill() - 300); tanks[1].setFill(tanks[1].getFill() - 75); tanks[2].setFill(tanks[2].getFill() - 140); - power += 1000000; + power += 10000000; isWorking = true; } if(i == 4 && tanks[1].getFill() - 100 >= 0 && tanks[2].getFill() - 100 >= 0) { tanks[0].setFill(tanks[0].getFill() - 100); tanks[1].setFill(tanks[1].getFill() - 100); tanks[2].setFill(tanks[2].getFill() - 100); - power += 1000000; + power += 10000000; isWorking = true; } if(i == 5 && tanks[1].getFill() - 15 >= 0 && tanks[2].getFill() - 15 >= 0) { tanks[0].setFill(tanks[0].getFill() - 150); tanks[1].setFill(tanks[1].getFill() - 15); tanks[2].setFill(tanks[2].getFill() - 15); - power += 10000000; + power += 100000000; isWorking = true; } diff --git a/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java b/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java index 4a33cb83e..df17a2f06 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java +++ b/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java @@ -26,7 +26,7 @@ public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInv public long power = 0; public int process = 0; public int soundCycle = 0; - public static final long maxPower = 100000; + public static final long maxPower = 100000000; public static final int processSpeed = 200; public FluidTank tank; @@ -38,7 +38,7 @@ public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInv public TileEntityMachineCMBFactory() { slots = new ItemStack[6]; - tank = new FluidTank(FluidType.WATZ, 16000, 0); + tank = new FluidTank(FluidType.WATZ, 8000, 0); } @Override @@ -232,7 +232,7 @@ public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInv boolean b = false; - if(tank.getFill() > 0 && power > 0 && slots[1] != null && slots[3] != null && (slots[4] == null || slots[4].stackSize <= 60)) + if(tank.getFill() >= 10 && power >= 100000 && slots[1] != null && slots[3] != null && (slots[4] == null || slots[4].stackSize <= 60)) { boolean flag0 = slots[1].getItem() == ModItems.ingot_magnetized_tungsten || slots[1].getItem() == ModItems.powder_magnetized_tungsten; boolean flag1 = slots[3].getItem() == ModItems.ingot_advanced_alloy || slots[3].getItem() == ModItems.powder_advanced_alloy; @@ -248,8 +248,8 @@ public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInv } public void process() { - tank.setFill(tank.getFill() - 1); - power -= 15; + tank.setFill(tank.getFill() - 10); + power -= 100000; process++;