diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 89357f6ad..28d794bd9 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -30,6 +30,8 @@ hbmfluid.heatingoil=Heizöl hbmfluid.naphtha=Mitteldestillat hbmfluid.lightoil=Leichtöl hbmfluid.petroleum=Petroleumgas +hbmfluid.acid=Wasserstoffperoxid +hbmfluid.watz=Giftiger Schlamm chem.TEST=Test chem.FP_HEAVYOIL=Schwerölverarbeitung @@ -42,10 +44,17 @@ chem.FC_I_NAPHTHA=Industriöl-Cracking chem.FC_GAS_PETROLEUM=Erdgas-Cracking chem.FC_DIESEL_KEROSENE=Diesel-Cracking chem.FC_KEROSENE_PETROLEUM=Kerosin-Cracking -chem.CC_I=Erweitertes Kohle-Cracking -chem.CC_HEATING=Fortgeschrittenes Kohle-Cracking -chem.CC_HEAVY=Einfaches Kohle-Cracking -chem.CC_NAPHTHA=Naphtha-Kohle-Cracking +chem.CC_OIL=Kohleverflüssigung +chem.CC_I=Erweiterte Kohleverflüssigung +chem.CC_HEATING=Fortgeschrittene Kohleverflüssigung +chem.CC_HEAVY=Einfache Kohleverflüssigung +chem.CC_NAPHTHA=Naphtha-Kohleverflüssigung +chem.ASPHALT=Asphaltherstellung +chem.COOLANT=Kühlflüssigkeit mischen +chem.DESH=Deshherstellung +chem.PEROXIDE=Wasserstoffperoxidherstellung +chem.CIRCUIT_4=Überstaktete Schaltkreisherstellung +chem.CIRCUIT_4=Leistungsstarke Schaltkreisherstellung item.record.lc.desc=Valve - Diabolic Adrenaline Guitar/Lambda Core item.record.ss.desc=Valve - Sector Sweep @@ -137,6 +146,13 @@ tile.nuke_fleija.name=F.L.E.I.J.A. tile.nuke_prototype.name=Der Prototyp tile.nuke_custom.name=Anpassbare Bombe +tile.turret_light.name=Leichtes MG-Geschütz +tile.turret_heavy.name=Schweres MG-Geschütz +tile.turret_rocket.name=Raketengeschütz +tile.turret_flamer.name=Flammenwerfergeschütz +tile.turret_tau.name=Tauonengeschütz +item.turret_control.name=Geschützsteuerung + tile.bomb_multi.name=Mehrzweckbombe tile.flame_war.name=Flamewar aus der Box @@ -211,6 +227,7 @@ tile.gas_duct.name=Gasleitung tile.gas_duct_solid.name=Verstärkte Gasleitung tile.machine_drill.name=Automatischer Minenbohrer container.miningDrill=Automatischer Minenbohrer +tile.drill_pipe.name=Bohrgestänge tile.machine_assembler.name=Fertigungsmaschine container.assembler=Fertigungsmaschine tile.machine_chemplant.name=Chemiefabrik @@ -355,6 +372,9 @@ item.nugget_verticium.name=Verticiumnugget item.ingot_desh.name=Deshbarren item.nugget_desh.name=Deshnugget item.powder_desh.name=Deshstaub +item.powder_desh_mix.name=Deshmischung + +item.solid_fuel.name=Festbrennstoff item.nugget_u235.name=U235-Nugget item.nugget_u238.name=U238-Nugget diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 1d999e998..75feee442 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -30,6 +30,8 @@ hbmfluid.heatingoil=Heating Oil hbmfluid.naphtha=Naphtha hbmfluid.lightoil=Light Oil hbmfluid.petroleum=Petroleum Gas +hbmfluid.acid=Hydrogen Peroxide +hbmfluid.watz=Poisonous Mud chem.TEST=Test chem.FP_HEAVYOIL=Heavy Oil Processing @@ -42,10 +44,17 @@ chem.FC_I_NAPHTHA=Industrial Oil Cracking chem.FC_GAS_PETROLEUM=Gas Cracking chem.FC_DIESEL_KEROSENE=Diesel Cracking chem.FC_KEROSENE_PETROLEUM=Kerosene Cracking -chem.CC_I=Enhanced Coal Cracking -chem.CC_HEATING=Advanced Coal Cracking -chem.CC_HEAVY=Basic Coal Cracking -chem.CC_NAPHTHA=Naphtha Coal Cracking +chem.CC_OIL=Coal Liquefaction +chem.CC_I=Enhanced Coal Liquefaction +chem.CC_HEATING=Advanced Coal Liquefaction +chem.CC_HEAVY=Basic Coal Liquefaction +chem.CC_NAPHTHA=Naphtha Coal Liquefaction +chem.ASPHALT=Asphalt Production +chem.COOLANT=Coolant Mixing +chem.DESH=Desh Production +chem.PEROXIDE=Hydrogen Peroxide Production +chem.CIRCUIT_4=Overclocked Circuit Production +chem.CIRCUIT_5=High Performance Circuit Production item.record.lc.desc=Valve - Diabolic Adrenaline Guitar/Lambda Core item.record.ss.desc=Valve - Sector Sweep @@ -146,6 +155,13 @@ tile.therm_exo.name=Exothermic Bomb tile.crashed_bomb.name=Dud +tile.turret_light.name=Light Machine Gun Turret +tile.turret_heavy.name=Heavy Machine Gun Turret +tile.turret_rocket.name=Rocket Turret +tile.turret_flamer.name=Flamethrower Turret +tile.turret_tau.name=Tauon Turret +item.turret_control.name=Turret Controller + tile.crate.name=Supply Crate tile.marker_structure.name=Multiblock Structure Marker @@ -211,6 +227,7 @@ tile.gas_duct.name=Gas Pipe tile.gas_duct_solid.name=Coated Gas Pipe tile.machine_drill.name=Automatic Mining Drill container.miningDrill=Automatic Mining Drill +tile.drill_pipe.name=Drill Pipe tile.machine_assembler.name=Assembly Machine container.assembler=Assembly Machine tile.machine_chemplant.name=Chemical Plant @@ -355,6 +372,9 @@ 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.solid_fuel.name=Solid Fuel item.nugget_u235.name=U235 Nugget item.nugget_u238.name=U238 Nugget diff --git a/assets/hbm/models/turret_flamer_gun.obj b/assets/hbm/models/turret_flamer_gun.obj new file mode 100644 index 000000000..61bedf730 --- /dev/null +++ b/assets/hbm/models/turret_flamer_gun.obj @@ -0,0 +1,1327 @@ +# Blender v2.76 (sub 0) OBJ File: 'turret_flamer_gun.blend' +# www.blender.org +o Cube.001_Cube +v -0.200000 -0.200000 0.300000 +v -0.200000 0.200000 0.300000 +v -0.200000 -0.200000 -0.300000 +v -0.200000 0.200000 -0.300000 +v 0.200000 -0.200000 0.300000 +v 0.200000 0.200000 0.300000 +v 0.200000 -0.200000 -0.300000 +v 0.200000 0.200000 -0.300000 +v -0.170000 -0.170000 0.300000 +v -0.170000 0.170000 0.300000 +v 0.170000 0.170000 0.300000 +v 0.170000 -0.170000 0.300000 +v -0.170000 -0.170000 0.450000 +v -0.170000 0.170000 0.450000 +v 0.170000 0.170000 0.450000 +v 0.170000 -0.170000 0.450000 +v 0.000000 0.140000 0.700000 +v 0.098995 0.098995 0.700000 +v 0.000000 0.100000 0.450000 +v 0.000000 0.100000 0.700000 +v 0.070711 0.070711 0.450000 +v 0.070711 0.070711 0.700000 +v 0.100000 -0.000000 0.450000 +v 0.100000 0.000000 0.700000 +v 0.070711 -0.070711 0.450000 +v 0.070711 -0.070711 0.700000 +v -0.000000 -0.100000 0.450000 +v -0.000000 -0.100000 0.700000 +v -0.070711 -0.070711 0.450000 +v -0.070711 -0.070711 0.700000 +v -0.100000 -0.000000 0.450000 +v -0.100000 0.000000 0.700000 +v -0.070711 0.070711 0.450000 +v -0.070711 0.070711 0.700000 +v 0.140000 0.000000 0.700000 +v 0.098995 -0.098995 0.700000 +v -0.000000 -0.140000 0.700000 +v -0.098995 -0.098995 0.700000 +v -0.140000 0.000000 0.700000 +v -0.098995 0.098995 0.700000 +v 0.000000 0.140000 1.150000 +v -0.098995 0.098995 1.150000 +v -0.140000 0.000000 1.150000 +v -0.098995 -0.098995 1.150000 +v -0.000000 -0.140000 1.150000 +v 0.098995 -0.098995 1.150000 +v 0.140000 0.000000 1.150000 +v 0.098995 0.098995 1.150000 +v 0.000000 0.100000 1.150000 +v 0.070711 0.070711 1.150000 +v 0.100000 0.000000 1.150000 +v 0.070711 -0.070711 1.150000 +v -0.000000 -0.100000 1.150000 +v -0.070711 -0.070711 1.150000 +v -0.100000 0.000000 1.150000 +v -0.070711 0.070711 1.150000 +v 0.070711 0.070711 1.250000 +v 0.000000 0.100000 1.250000 +v 0.100000 0.000000 1.250000 +v 0.070711 -0.070711 1.250000 +v -0.000000 -0.100000 1.250000 +v -0.070711 -0.070711 1.250000 +v -0.100000 0.000000 1.250000 +v -0.070711 0.070711 1.250000 +v 0.107322 -0.125000 1.200000 +v 0.125000 -0.142678 1.200000 +v -0.375000 -0.000000 -0.100000 +v 0.375000 0.000000 -0.100000 +v -0.375000 -0.070711 -0.070711 +v 0.375000 -0.070711 -0.070711 +v -0.375000 -0.100000 0.000000 +v 0.375000 -0.100000 0.000000 +v -0.375000 -0.070711 0.070711 +v 0.375000 -0.070711 0.070711 +v -0.375000 -0.000000 0.100000 +v 0.375000 0.000000 0.100000 +v -0.375000 0.070711 0.070711 +v 0.375000 0.070711 0.070711 +v -0.375000 0.100000 -0.000000 +v 0.375000 0.100000 -0.000000 +v -0.375000 0.070711 -0.070711 +v 0.375000 0.070711 -0.070711 +v 0.125000 -0.142678 0.450000 +v 0.107322 -0.125000 0.450000 +v 0.142678 -0.125000 1.200000 +v 0.125000 -0.107322 1.200000 +v 0.142678 -0.125000 0.450000 +v 0.125000 -0.107322 0.450000 +v 0.107411 -0.125089 1.258839 +v 0.125089 -0.107411 1.258839 +v 0.112589 -0.094911 1.241161 +v 0.094911 -0.112589 1.241161 +v 0.076161 -0.093839 1.297855 +v 0.076161 -0.093839 1.268856 +v 0.093839 -0.076161 1.268856 +v 0.093839 -0.076161 1.297855 +v 0.058484 -0.076161 1.297855 +v 0.058484 -0.076161 1.268856 +v 0.076161 -0.058484 1.268856 +v 0.076161 -0.058484 1.297855 +v -0.128701 -0.181791 -0.375000 +v -0.153033 -0.165533 -0.375000 +v -0.169291 -0.141201 -0.375000 +v -0.175000 -0.112500 -0.375000 +v -0.120295 -0.181791 -0.354705 +v -0.137500 -0.165533 -0.337500 +v -0.148996 -0.141201 -0.326004 +v -0.153033 -0.112500 -0.321967 +v -0.100000 -0.181791 -0.346299 +v -0.100000 -0.165533 -0.321967 +v -0.100000 -0.141201 -0.305709 +v -0.100000 -0.112500 -0.300000 +v -0.100000 -0.187500 -0.375000 +v -0.079705 -0.181791 -0.354705 +v -0.062500 -0.165533 -0.337500 +v -0.051004 -0.141201 -0.326004 +v -0.046967 -0.112500 -0.321967 +v -0.071299 -0.181791 -0.375000 +v -0.046967 -0.165533 -0.375000 +v -0.030709 -0.141201 -0.375000 +v -0.025000 -0.112500 -0.375000 +v -0.079705 -0.181791 -0.395295 +v -0.062500 -0.165533 -0.412500 +v -0.051004 -0.141201 -0.423996 +v -0.046967 -0.112500 -0.428033 +v -0.100000 -0.181791 -0.403701 +v -0.100000 -0.165533 -0.428033 +v -0.100000 -0.141201 -0.444291 +v -0.100000 -0.112500 -0.450000 +v -0.120295 -0.181791 -0.395295 +v -0.137500 -0.165533 -0.412500 +v -0.148996 -0.141201 -0.423996 +v -0.153033 -0.112500 -0.428033 +v -0.175000 0.112500 -0.375000 +v -0.169291 0.141201 -0.375000 +v -0.153033 0.165533 -0.375000 +v -0.128701 0.181791 -0.375000 +v -0.153033 0.112500 -0.321967 +v -0.148996 0.141201 -0.326004 +v -0.137500 0.165533 -0.337500 +v -0.120295 0.181791 -0.354705 +v -0.100000 0.112500 -0.300000 +v -0.100000 0.141201 -0.305709 +v -0.100000 0.165533 -0.321967 +v -0.100000 0.181791 -0.346299 +v -0.046967 0.112500 -0.321967 +v -0.051004 0.141201 -0.326004 +v -0.062500 0.165533 -0.337500 +v -0.079705 0.181791 -0.354705 +v -0.025000 0.112500 -0.375000 +v -0.030709 0.141201 -0.375000 +v -0.046967 0.165533 -0.375000 +v -0.071299 0.181791 -0.375000 +v -0.046967 0.112500 -0.428033 +v -0.051004 0.141201 -0.423996 +v -0.062500 0.165533 -0.412500 +v -0.079705 0.181791 -0.395295 +v -0.100000 0.112500 -0.450000 +v -0.100000 0.141201 -0.444291 +v -0.100000 0.165533 -0.428033 +v -0.100000 0.181791 -0.403701 +v -0.153033 0.112500 -0.428033 +v -0.148996 0.141201 -0.423996 +v -0.137500 0.165533 -0.412500 +v -0.120295 0.181791 -0.395295 +v 0.071299 -0.181791 -0.375000 +v 0.046967 -0.165533 -0.375000 +v 0.030709 -0.141201 -0.375000 +v 0.025000 -0.112500 -0.375000 +v 0.079705 -0.181791 -0.354705 +v 0.062500 -0.165533 -0.337500 +v 0.051004 -0.141201 -0.326004 +v 0.046967 -0.112500 -0.321967 +v 0.100000 -0.181791 -0.346299 +v 0.100000 -0.165533 -0.321967 +v 0.100000 -0.141201 -0.305709 +v 0.100000 -0.112500 -0.300000 +v 0.100000 -0.187500 -0.375000 +v 0.120295 -0.181791 -0.354705 +v 0.137500 -0.165533 -0.337500 +v 0.148996 -0.141201 -0.326004 +v 0.153033 -0.112500 -0.321967 +v 0.128701 -0.181791 -0.375000 +v 0.153033 -0.165533 -0.375000 +v 0.169291 -0.141201 -0.375000 +v 0.175000 -0.112500 -0.375000 +v 0.120295 -0.181791 -0.395295 +v 0.137500 -0.165533 -0.412500 +v 0.148996 -0.141201 -0.423996 +v 0.153033 -0.112500 -0.428033 +v 0.100000 -0.181791 -0.403701 +v 0.100000 -0.165533 -0.428033 +v 0.100000 -0.141201 -0.444291 +v 0.100000 -0.112500 -0.450000 +v 0.079705 -0.181791 -0.395295 +v 0.062500 -0.165533 -0.412500 +v 0.051004 -0.141201 -0.423996 +v 0.046967 -0.112500 -0.428033 +v 0.025000 0.112500 -0.375000 +v 0.030709 0.141201 -0.375000 +v 0.046967 0.165533 -0.375000 +v 0.071299 0.181791 -0.375000 +v 0.046967 0.112500 -0.321967 +v 0.051004 0.141201 -0.326004 +v 0.062500 0.165533 -0.337500 +v 0.079705 0.181791 -0.354705 +v 0.100000 0.112500 -0.300000 +v 0.100000 0.141201 -0.305709 +v 0.100000 0.165533 -0.321967 +v 0.100000 0.181791 -0.346299 +v 0.153033 0.112500 -0.321967 +v 0.148996 0.141201 -0.326004 +v 0.137500 0.165533 -0.337500 +v 0.120295 0.181791 -0.354705 +v 0.175000 0.112500 -0.375000 +v 0.169291 0.141201 -0.375000 +v 0.153033 0.165533 -0.375000 +v 0.128701 0.181791 -0.375000 +v 0.153033 0.112500 -0.428033 +v 0.148996 0.141201 -0.423996 +v 0.137500 0.165533 -0.412500 +v 0.120295 0.181791 -0.395295 +v 0.100000 0.112500 -0.450000 +v 0.100000 0.141201 -0.444291 +v 0.100000 0.165533 -0.428033 +v 0.100000 0.181791 -0.403701 +v 0.046967 0.112500 -0.428033 +v 0.051004 0.141201 -0.423996 +v 0.062500 0.165533 -0.412500 +v 0.079705 0.181791 -0.395295 +v -0.128701 0.211791 -0.375000 +v -0.120295 0.204025 -0.356250 +v -0.100000 0.200808 -0.348484 +v -0.079705 0.204025 -0.356250 +v -0.071299 0.211791 -0.375000 +v -0.079705 0.219558 -0.393750 +v -0.100000 0.222775 -0.401517 +v -0.120295 0.219558 -0.393750 +v 0.071299 0.211791 -0.375000 +v 0.079705 0.204025 -0.356250 +v 0.100000 0.200808 -0.348484 +v 0.120295 0.204025 -0.356250 +v 0.128701 0.211791 -0.375000 +v 0.120295 0.219558 -0.393750 +v 0.100000 0.222775 -0.401517 +v 0.079705 0.219558 -0.393750 +v -0.128701 0.239508 -0.363520 +v -0.120295 0.225157 -0.349169 +v -0.100000 0.219213 -0.343225 +v -0.079705 0.225157 -0.349169 +v -0.071299 0.239508 -0.363520 +v -0.079705 0.253858 -0.377870 +v -0.100000 0.259802 -0.383814 +v -0.120295 0.253858 -0.377870 +v 0.071299 0.239508 -0.363520 +v 0.079705 0.225157 -0.349169 +v 0.100000 0.219213 -0.343225 +v 0.120295 0.225157 -0.349169 +v 0.128701 0.239508 -0.363520 +v 0.120295 0.253858 -0.377870 +v 0.100000 0.259802 -0.383814 +v 0.079705 0.253858 -0.377870 +v -0.128701 0.260721 -0.342306 +v -0.120295 0.241971 -0.334540 +v -0.100000 0.234204 -0.331323 +v -0.079705 0.241971 -0.334540 +v -0.071299 0.260721 -0.342306 +v -0.079705 0.279471 -0.350073 +v -0.100000 0.287237 -0.353290 +v -0.120295 0.279471 -0.350073 +v 0.071299 0.260721 -0.342306 +v 0.079705 0.241971 -0.334540 +v 0.100000 0.234204 -0.331323 +v 0.120295 0.241971 -0.334540 +v 0.128701 0.260721 -0.342306 +v 0.120295 0.279471 -0.350073 +v 0.100000 0.287237 -0.353290 +v 0.079705 0.279471 -0.350073 +v -0.128701 0.272201 -0.314590 +v -0.120295 0.251906 -0.314590 +v -0.100000 0.243500 -0.314590 +v -0.079705 0.251906 -0.314590 +v -0.071299 0.272201 -0.314590 +v -0.079705 0.292496 -0.314590 +v -0.100000 0.300902 -0.314590 +v -0.120295 0.292496 -0.314590 +v 0.071299 0.272201 -0.314590 +v 0.079705 0.251906 -0.314590 +v 0.100000 0.243500 -0.314590 +v 0.120295 0.251906 -0.314590 +v 0.128701 0.272201 -0.314590 +v 0.120295 0.292496 -0.314590 +v 0.100000 0.300902 -0.314590 +v 0.079705 0.292496 -0.314590 +v -0.128701 0.272201 -0.284590 +v -0.120295 0.253451 -0.292356 +v -0.100000 0.245685 -0.295573 +v -0.079705 0.253451 -0.292356 +v -0.071299 0.272201 -0.284590 +v -0.079705 0.290951 -0.276823 +v -0.100000 0.298718 -0.273607 +v -0.120295 0.290951 -0.276823 +v 0.071299 0.272201 -0.284590 +v 0.079705 0.253451 -0.292356 +v 0.100000 0.245685 -0.295573 +v 0.120295 0.253451 -0.292356 +v 0.128701 0.272201 -0.284590 +v 0.120295 0.290951 -0.276823 +v 0.100000 0.298718 -0.273607 +v 0.079705 0.290951 -0.276823 +v -0.128701 0.260721 -0.256874 +v -0.120295 0.246370 -0.271224 +v -0.100000 0.240426 -0.277168 +v -0.079705 0.246370 -0.271224 +v -0.071299 0.260721 -0.256874 +v -0.079705 0.275071 -0.242523 +v -0.100000 0.281016 -0.236579 +v -0.120295 0.275071 -0.242523 +v 0.071299 0.260721 -0.256874 +v 0.079705 0.246370 -0.271224 +v 0.100000 0.240426 -0.277168 +v 0.120295 0.246370 -0.271224 +v 0.128701 0.260721 -0.256874 +v 0.120295 0.275071 -0.242523 +v 0.100000 0.281016 -0.236579 +v 0.079705 0.275071 -0.242523 +v -0.128701 0.239508 -0.235660 +v -0.120295 0.231741 -0.254410 +v -0.100000 0.228524 -0.262177 +v -0.079705 0.231741 -0.254410 +v -0.071299 0.239508 -0.235660 +v -0.079705 0.247274 -0.216910 +v -0.100000 0.250491 -0.209144 +v -0.120295 0.247274 -0.216910 +v 0.071299 0.239508 -0.235660 +v 0.079705 0.231741 -0.254410 +v 0.100000 0.228524 -0.262177 +v 0.120295 0.231741 -0.254410 +v 0.128701 0.239508 -0.235660 +v 0.120295 0.247274 -0.216910 +v 0.100000 0.250491 -0.209144 +v 0.079705 0.247274 -0.216910 +v -0.128701 0.211791 -0.224180 +v -0.120295 0.211791 -0.244475 +v -0.100000 0.211791 -0.252881 +v -0.079705 0.211791 -0.244475 +v -0.071299 0.211791 -0.224180 +v -0.079705 0.211791 -0.203885 +v -0.100000 0.211791 -0.195479 +v -0.120295 0.211791 -0.203885 +v 0.071299 0.211791 -0.224180 +v 0.079705 0.211791 -0.244475 +v 0.100000 0.211791 -0.252881 +v 0.120295 0.211791 -0.244475 +v 0.128701 0.211791 -0.224180 +v 0.120295 0.211791 -0.203885 +v 0.100000 0.211791 -0.195479 +v 0.079705 0.211791 -0.203885 +v -0.128701 0.191791 -0.224180 +v -0.120295 0.191791 -0.244475 +v -0.100000 0.191791 -0.252881 +v -0.079705 0.191791 -0.244475 +v -0.071299 0.191791 -0.224180 +v -0.079705 0.191791 -0.203885 +v -0.100000 0.191791 -0.195479 +v -0.120295 0.191791 -0.203885 +v 0.071299 0.191791 -0.224180 +v 0.079705 0.191791 -0.244475 +v 0.100000 0.191791 -0.252881 +v 0.120295 0.191791 -0.244475 +v 0.128701 0.191791 -0.224180 +v 0.120295 0.191791 -0.203885 +v 0.100000 0.191791 -0.195479 +v 0.079705 0.191791 -0.203885 +v -0.185000 -0.025000 -0.300000 +v -0.185000 0.025000 -0.300000 +v -0.185000 -0.025000 -0.457500 +v -0.185000 0.025000 -0.457500 +v 0.185000 -0.025000 -0.300000 +v 0.185000 0.025000 -0.300000 +v 0.185000 -0.025000 -0.457500 +v 0.185000 0.025000 -0.457500 +v -0.050000 0.200000 0.250000 +v -0.050000 0.250000 0.150000 +v -0.050000 0.200000 -0.150000 +v -0.050000 0.250000 -0.150000 +v 0.050000 0.200000 0.250000 +v 0.050000 0.250000 0.150000 +v 0.050000 0.200000 -0.150000 +v 0.050000 0.250000 -0.150000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn -0.382700 -0.923900 0.000000 +vn 0.382700 0.923900 -0.000000 +vn 0.923900 0.382700 -0.000000 +vn 0.923900 -0.382700 0.000000 +vn -0.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.707100 -0.707100 -0.000000 +vn 0.000000 -0.382700 -0.923900 +vn -0.650400 0.650400 -0.392200 +vn 0.000000 -0.923900 -0.382700 +vn -0.707100 0.707100 0.000000 +vn 0.000000 -0.923900 0.382700 +vn 0.707100 -0.707100 0.000000 +vn 0.000000 -0.382700 0.923900 +vn 0.651300 -0.651300 0.389400 +vn -0.000000 0.382700 0.923900 +vn 0.707100 0.707100 0.000000 +vn -0.000000 0.923900 0.382700 +vn -0.000000 0.382700 -0.923900 +vn -0.000000 0.923900 -0.382700 +vn -0.510700 0.510700 -0.691600 +vn 0.468000 -0.468000 0.749700 +vn -0.786200 -0.525300 0.325600 +vn -0.908700 -0.180700 0.376400 +vn -0.541400 -0.810300 0.224300 +vn -0.376400 -0.180700 0.908700 +vn -0.224300 -0.810300 0.541400 +vn -0.325600 -0.525300 0.786200 +vn 0.325600 -0.525300 0.786200 +vn 0.376400 -0.180700 0.908700 +vn 0.224300 -0.810300 0.541400 +vn 0.786200 -0.525300 0.325600 +vn 0.908700 -0.180700 0.376400 +vn 0.541400 -0.810300 0.224300 +vn 0.908700 -0.180700 -0.376400 +vn 0.541400 -0.810300 -0.224300 +vn 0.786200 -0.525300 -0.325600 +vn 0.376400 -0.180700 -0.908700 +vn 0.224300 -0.810300 -0.541400 +vn 0.325600 -0.525300 -0.786200 +vn -0.325600 -0.525300 -0.786200 +vn -0.376400 -0.180700 -0.908700 +vn -0.224300 -0.810300 -0.541400 +vn -0.194500 -0.977600 0.080500 +vn -0.080500 -0.977600 0.194500 +vn 0.080500 -0.977600 0.194500 +vn 0.194500 -0.977600 0.080500 +vn 0.194500 -0.977600 -0.080500 +vn 0.080500 -0.977600 -0.194500 +vn -0.080500 -0.977600 -0.194500 +vn -0.786200 -0.525300 -0.325600 +vn -0.194500 -0.977600 -0.080500 +vn -0.382700 0.000000 0.923900 +vn -0.923900 0.000000 0.382700 +vn -0.908700 -0.180700 -0.376400 +vn -0.541400 -0.810300 -0.224300 +vn -0.923900 0.000000 -0.382700 +vn -0.382700 0.000000 -0.923900 +vn -0.786200 0.525300 0.325600 +vn -0.541400 0.810300 0.224300 +vn -0.908700 0.180700 0.376400 +vn -0.325600 0.525300 0.786200 +vn -0.224300 0.810300 0.541400 +vn -0.376400 0.180700 0.908700 +vn 0.224300 0.810300 0.541400 +vn 0.376400 0.180700 0.908700 +vn 0.325600 0.525300 0.786200 +vn 0.908700 0.180700 0.376400 +vn 0.786200 0.525300 0.325600 +vn 0.541400 0.810300 0.224300 +vn 0.786200 0.525300 -0.325600 +vn 0.541400 0.810300 -0.224300 +vn 0.908700 0.180700 -0.376400 +vn 0.224300 0.810300 -0.541400 +vn 0.376400 0.180700 -0.908700 +vn 0.325600 0.525300 -0.786200 +vn -0.224300 0.810300 -0.541400 +vn -0.376400 0.180700 -0.908700 +vn -0.325600 0.525300 -0.786200 +vn -0.786200 0.525300 -0.325600 +vn -0.541400 0.810300 -0.224300 +vn -0.908700 0.180700 -0.376400 +vn 0.382700 0.000000 -0.923900 +vn 0.923900 0.000000 -0.382700 +vn 0.923900 0.000000 0.382700 +vn 0.382700 0.000000 0.923900 +vn 0.347600 0.065000 0.935400 +vn -0.382400 0.388200 -0.838500 +vn 0.363800 0.401800 -0.840400 +vn -0.923600 0.026600 0.382500 +vn -0.380500 0.105500 0.918700 +vn 0.912500 0.000000 0.409100 +vn -0.382400 0.037800 -0.923200 +vn 0.914900 0.016500 -0.403400 +vn 0.363800 0.049600 -0.930200 +vn 0.912500 -0.289300 0.289300 +vn -0.923900 0.146400 -0.353600 +vn -0.923600 -0.121800 0.363600 +vn -0.380500 -0.254100 0.889200 +vn 0.347600 -0.297900 0.889000 +vn 0.912500 -0.156600 0.378000 +vn 0.914900 0.169600 -0.366300 +vn -0.380500 -0.808400 0.449100 +vn -0.923600 -0.343300 0.171000 +vn 0.914900 0.296900 -0.273500 +vn 0.363800 0.692800 -0.622700 +vn -0.382400 0.679500 -0.626100 +vn -0.923900 0.270600 -0.270600 +vn -0.923600 -0.251700 0.289300 +vn -0.380500 -0.575000 0.724300 +vn 0.347600 -0.615500 0.707400 +vn -0.382400 0.923200 0.037800 +vn 0.363800 0.930200 0.049600 +vn 0.347600 -0.839300 0.418000 +vn 0.912500 -0.378000 0.156600 +vn 0.914900 0.379000 -0.139100 +vn 0.363800 0.878300 -0.310100 +vn -0.382400 0.867400 -0.318400 +vn -0.923900 0.353600 -0.146400 +vn 0.914900 0.366300 0.169600 +vn 0.912500 -0.378000 -0.156600 +vn -0.923600 -0.382500 0.026600 +vn -0.380500 -0.918700 0.105500 +vn 0.347600 -0.935400 0.065000 +vn 0.912500 -0.409100 0.000000 +vn 0.914900 0.403400 0.016500 +vn -0.380500 -0.724300 -0.575000 +vn 0.363800 0.840400 0.401800 +vn -0.382400 0.838500 0.388200 +vn -0.923900 0.353600 0.146400 +vn -0.923600 -0.363600 -0.121800 +vn -0.380500 -0.889200 -0.254100 +vn 0.347600 -0.889000 -0.297900 +vn -0.382400 0.318400 0.867400 +vn 0.347600 -0.707400 -0.615500 +vn 0.912500 -0.289300 -0.289300 +vn 0.914900 0.273500 0.296900 +vn 0.363800 0.622700 0.692800 +vn -0.382400 0.626100 0.679500 +vn -0.923900 0.270600 0.270600 +vn -0.923600 -0.289300 -0.251700 +vn -0.923900 0.146400 0.353600 +vn -0.923600 -0.171000 -0.343300 +vn -0.380500 -0.449100 -0.808400 +vn 0.347600 -0.418000 -0.839300 +vn 0.912500 -0.156600 -0.378000 +vn 0.914900 0.139100 0.379000 +vn 0.363800 0.310100 0.878300 +vn 0.000000 0.894400 0.447200 +vn -0.914900 0.016500 -0.403400 +vn 0.380500 0.105500 0.918700 +vn -0.363800 0.401800 -0.840400 +vn 0.382400 0.388200 -0.838500 +vn -0.912500 0.000000 0.409100 +vn -0.347600 0.065000 0.935400 +vn 0.923600 0.026600 0.382500 +vn -0.363800 0.049600 -0.930200 +vn 0.382400 0.037800 -0.923200 +vn 0.923600 -0.251700 0.289300 +vn -0.914900 0.169600 -0.366300 +vn -0.912500 -0.156600 0.378000 +vn -0.347600 -0.297900 0.889000 +vn 0.380500 -0.254100 0.889200 +vn 0.923600 -0.121800 0.363600 +vn 0.923900 0.146400 -0.353600 +vn -0.347600 -0.839300 0.418000 +vn -0.912500 -0.378000 0.156600 +vn 0.923900 0.270600 -0.270600 +vn 0.382400 0.679500 -0.626100 +vn -0.363800 0.692800 -0.622700 +vn -0.914900 0.296900 -0.273500 +vn -0.912500 -0.289300 0.289300 +vn -0.347600 -0.615500 0.707400 +vn 0.380500 -0.575000 0.724300 +vn -0.363800 0.930200 0.049600 +vn 0.382400 0.923200 0.037800 +vn 0.380500 -0.808400 0.449100 +vn 0.923600 -0.343300 0.171000 +vn 0.923900 0.353600 -0.146400 +vn 0.382400 0.867400 -0.318400 +vn -0.363800 0.878300 -0.310100 +vn -0.914900 0.379000 -0.139100 +vn 0.923900 0.353600 0.146400 +vn 0.923600 -0.363600 -0.121800 +vn -0.914900 0.403400 0.016500 +vn -0.912500 -0.409100 0.000000 +vn -0.347600 -0.935400 0.065000 +vn 0.380500 -0.918700 0.105500 +vn 0.923600 -0.382500 0.026600 +vn -0.347600 -0.707400 -0.615400 +vn 0.382400 0.838500 0.388200 +vn -0.363800 0.840400 0.401800 +vn -0.914900 0.366300 0.169600 +vn -0.912500 -0.378000 -0.156600 +vn -0.347600 -0.889000 -0.297900 +vn 0.380500 -0.889200 -0.254100 +vn -0.363800 0.310100 0.878300 +vn 0.380500 -0.724300 -0.575000 +vn 0.923600 -0.289300 -0.251700 +vn 0.923900 0.270600 0.270600 +vn 0.382400 0.626100 0.679500 +vn -0.363800 0.622700 0.692800 +vn -0.914900 0.273500 0.296900 +vn -0.912500 -0.289300 -0.289300 +vn -0.914900 0.139100 0.379000 +vn -0.912500 -0.156600 -0.378000 +vn -0.347600 -0.418000 -0.839300 +vn 0.380500 -0.449100 -0.808400 +vn 0.923600 -0.171000 -0.343300 +vn 0.923900 0.146400 0.353600 +vn 0.382400 0.318400 0.867400 +s off +f 4//1 3//1 1//1 +f 8//2 7//2 3//2 +f 6//3 5//3 7//3 +f 1//4 9//4 10//4 +f 3//5 7//5 5//5 +f 8//6 4//6 2//6 +f 11//3 15//3 16//3 +f 5//4 12//4 9//4 +f 2//4 10//4 11//4 +f 6//4 11//4 12//4 +f 14//4 13//4 16//4 +f 10//6 14//6 15//6 +f 9//1 13//1 14//1 +f 12//5 16//5 13//5 +f 37//7 45//7 44//7 +f 22//2 18//2 35//2 +f 19//8 20//8 22//8 +f 17//8 41//8 48//8 +f 30//2 28//2 37//2 +f 21//9 22//9 24//9 +f 18//9 48//9 47//9 +f 34//2 40//2 17//2 +f 23//10 24//10 26//10 +f 38//11 44//11 43//11 +f 26//2 36//2 37//2 +f 25//12 26//12 28//12 +f 40//13 42//13 41//13 +f 34//2 32//2 39//2 +f 28//7 30//7 29//7 +f 41//4 49//4 50//4 +f 24//2 35//2 36//2 +f 30//11 32//11 31//11 +f 22//2 20//2 17//2 +f 34//13 20//13 19//13 +f 32//14 34//14 33//14 +f 39//14 43//14 42//14 +f 30//2 38//2 39//2 +f 35//10 47//10 46//10 +f 36//12 46//12 45//12 +f 50//4 51//4 47//4 +f 51//4 52//4 46//4 +f 52//4 53//4 45//4 +f 45//4 53//4 54//4 +f 54//4 55//4 43//4 +f 55//4 56//4 42//4 +f 56//4 49//4 41//4 +f 55//14 63//14 64//14 +f 55//4 53//4 49//4 +f 53//7 61//7 62//7 +f 52//10 51//10 59//10 +f 49//8 58//8 57//8 +f 56//13 64//13 58//13 +f 54//11 62//11 63//11 +f 53//12 52//12 60//12 +f 51//9 50//9 57//9 +f 65//15 66//15 89//15 +f 68//16 70//16 69//16 +f 86//17 65//17 92//17 +f 69//18 70//18 72//18 +f 88//19 84//19 65//19 +f 72//20 74//20 73//20 +f 83//21 87//21 85//21 +f 74//22 76//22 75//22 +f 85//23 90//23 89//23 +f 76//24 78//24 77//24 +f 86//25 85//25 87//25 +f 78//26 80//26 79//26 +f 84//15 83//15 66//15 +f 82//27 68//27 67//27 +f 80//28 82//28 81//28 +f 86//25 91//25 90//25 +f 90//25 91//25 95//25 +f 96//4 100//4 97//4 +f 92//29 94//29 95//29 +f 90//30 96//30 93//30 +f 89//15 93//15 94//15 +f 100//19 99//19 98//19 +f 96//25 95//25 99//25 +f 95//2 94//2 98//2 +f 93//15 97//15 98//15 +f 102//31 106//31 107//31 +f 104//32 103//32 107//32 +f 102//33 101//33 105//33 +f 107//34 111//34 112//34 +f 105//35 109//35 110//35 +f 106//36 110//36 111//36 +f 111//37 110//37 115//37 +f 111//38 116//38 117//38 +f 109//39 114//39 115//39 +f 115//40 119//40 120//40 +f 116//41 120//41 121//41 +f 114//42 118//42 119//42 +f 120//43 124//43 125//43 +f 118//44 122//44 123//44 +f 119//45 123//45 124//45 +f 125//46 124//46 128//46 +f 122//47 126//47 127//47 +f 124//48 123//48 127//48 +f 127//49 131//49 132//49 +f 128//50 132//50 133//50 +f 126//51 130//51 131//51 +f 101//52 113//52 105//52 +f 105//53 113//53 109//53 +f 109//54 113//54 114//54 +f 114//55 113//55 118//55 +f 118//56 113//56 122//56 +f 122//57 113//57 126//57 +f 126//58 113//58 130//58 +f 131//59 102//59 103//59 +f 130//60 113//60 101//60 +f 112//61 142//61 138//61 +f 108//62 138//62 134//62 +f 132//63 103//63 104//63 +f 131//64 130//64 101//64 +f 162//65 133//65 104//65 +f 162//66 158//66 129//66 +f 135//67 139//67 140//67 +f 136//68 140//68 141//68 +f 135//69 134//69 138//69 +f 139//70 143//70 144//70 +f 140//71 144//71 145//71 +f 139//72 138//72 142//72 +f 145//73 144//73 148//73 +f 142//74 146//74 147//74 +f 144//75 143//75 147//75 +f 146//76 150//76 151//76 +f 148//77 147//77 151//77 +f 148//78 152//78 153//78 +f 152//79 151//79 155//79 +f 152//80 156//80 157//80 +f 150//81 154//81 155//81 +f 156//82 160//82 161//82 +f 154//83 158//83 159//83 +f 156//84 155//84 159//84 +f 160//85 164//85 165//85 +f 158//86 162//86 163//86 +f 159//87 163//87 164//87 +f 163//88 135//88 136//88 +f 165//89 164//89 136//89 +f 162//90 134//90 135//90 +f 129//91 158//91 154//91 +f 125//92 154//92 150//92 +f 150//93 146//93 117//93 +f 146//94 142//94 112//94 +f 167//31 171//31 172//31 +f 169//32 168//32 172//32 +f 167//33 166//33 170//33 +f 173//34 172//34 176//34 +f 170//35 174//35 175//35 +f 171//36 175//36 176//36 +f 176//37 175//37 180//37 +f 176//38 181//38 182//38 +f 174//39 179//39 180//39 +f 180//40 184//40 185//40 +f 181//41 185//41 186//41 +f 179//42 183//42 184//42 +f 185//43 189//43 190//43 +f 183//44 187//44 188//44 +f 184//45 188//45 189//45 +f 190//46 189//46 193//46 +f 188//47 187//47 191//47 +f 189//48 188//48 192//48 +f 192//49 196//49 197//49 +f 193//50 197//50 198//50 +f 191//51 195//51 196//51 +f 166//52 178//52 170//52 +f 170//53 178//53 174//53 +f 174//54 178//54 179//54 +f 179//55 178//55 183//55 +f 183//56 178//56 187//56 +f 187//57 178//57 191//57 +f 191//58 178//58 195//58 +f 196//59 167//59 168//59 +f 195//60 178//60 166//60 +f 177//61 207//61 203//61 +f 173//62 203//62 199//62 +f 198//63 197//63 168//63 +f 196//64 195//64 166//64 +f 227//65 198//65 169//65 +f 227//66 223//66 194//66 +f 201//67 200//67 204//67 +f 201//68 205//68 206//68 +f 199//69 203//69 204//69 +f 204//70 208//70 209//70 +f 205//71 209//71 210//71 +f 203//72 207//72 208//72 +f 209//73 213//73 214//73 +f 208//74 207//74 211//74 +f 209//75 208//75 212//75 +f 211//76 215//76 216//76 +f 212//77 216//77 217//77 +f 213//78 217//78 218//78 +f 216//79 220//79 221//79 +f 217//80 221//80 222//80 +f 215//81 219//81 220//81 +f 222//82 221//82 225//82 +f 220//83 219//83 223//83 +f 221//84 220//84 224//84 +f 225//85 229//85 230//85 +f 223//86 227//86 228//86 +f 224//87 228//87 229//87 +f 165//65 137//65 231//65 +f 214//95 242//95 241//95 +f 228//88 200//88 201//88 +f 230//89 229//89 201//89 +f 227//90 199//90 200//90 +f 194//91 223//91 219//91 +f 190//92 219//92 215//92 +f 215//93 211//93 182//93 +f 211//94 207//94 177//94 +f 237//96 238//96 254//96 +f 245//97 261//97 260//97 +f 202//98 206//98 240//98 +f 141//99 145//99 233//99 +f 218//100 243//100 242//100 +f 230//65 202//65 239//65 +f 206//99 210//99 241//99 +f 161//101 165//101 238//101 +f 157//102 236//102 235//102 +f 161//103 237//103 236//103 +f 149//95 234//95 233//95 +f 226//101 230//101 246//101 +f 137//98 141//98 232//98 +f 222//102 244//102 243//102 +f 153//100 235//100 234//100 +f 226//103 245//103 244//103 +f 259//104 275//104 274//104 +f 251//104 267//104 266//104 +f 245//96 246//96 262//96 +f 238//105 231//105 247//105 +f 231//106 232//106 248//106 +f 246//105 239//105 255//105 +f 239//106 240//106 256//106 +f 232//107 233//107 249//107 +f 240//107 241//107 257//107 +f 234//108 250//108 249//108 +f 242//108 258//108 257//108 +f 235//109 251//109 250//109 +f 243//109 259//109 258//109 +f 236//110 252//110 251//110 +f 244//110 260//110 259//110 +f 237//97 253//97 252//97 +f 264//111 265//111 281//111 +f 271//112 272//112 288//112 +f 252//113 268//113 267//113 +f 260//113 276//113 275//113 +f 253//114 269//114 268//114 +f 261//114 277//114 276//114 +f 253//115 254//115 270//115 +f 261//115 262//115 278//115 +f 254//116 247//116 263//116 +f 247//117 248//117 264//117 +f 262//116 255//116 271//116 +f 255//117 256//117 272//117 +f 248//118 249//118 265//118 +f 256//118 257//118 273//118 +f 250//119 266//119 265//119 +f 258//119 274//119 273//119 +f 285//120 286//120 302//120 +f 293//121 309//121 308//121 +f 272//111 273//111 289//111 +f 266//122 282//122 281//122 +f 274//122 290//122 289//122 +f 267//123 283//123 282//123 +f 275//123 291//123 290//123 +f 268//124 284//124 283//124 +f 276//124 292//124 291//124 +f 269//125 285//125 284//125 +f 277//125 293//125 292//125 +f 269//126 270//126 286//126 +f 277//126 278//126 294//126 +f 270//127 263//127 279//127 +f 263//112 264//112 280//112 +f 278//127 271//127 287//127 +f 300//128 316//128 315//128 +f 307//129 323//129 322//129 +f 293//120 294//120 310//120 +f 286//14 279//14 295//14 +f 279//130 280//130 296//130 +f 294//14 287//14 303//14 +f 287//130 288//130 304//130 +f 280//131 281//131 297//131 +f 288//131 289//131 305//131 +f 282//132 298//132 297//132 +f 290//132 306//132 305//132 +f 283//133 299//133 298//133 +f 291//133 307//133 306//133 +f 284//134 300//134 299//134 +f 292//134 308//134 307//134 +f 285//121 301//121 300//121 +f 320//135 321//135 337//135 +f 312//135 313//135 329//135 +f 308//128 324//128 323//128 +f 301//136 317//136 316//136 +f 309//136 325//136 324//136 +f 301//137 302//137 318//137 +f 309//137 310//137 326//137 +f 302//138 295//138 311//138 +f 295//139 296//139 312//139 +f 310//138 303//138 319//138 +f 303//139 304//139 320//139 +f 296//140 297//140 313//140 +f 304//140 305//140 321//140 +f 298//141 314//141 313//141 +f 306//141 322//141 321//141 +f 299//129 315//129 314//129 +f 341//142 342//142 358//142 +f 333//142 334//142 350//142 +f 314//143 330//143 329//143 +f 322//143 338//143 337//143 +f 315//144 331//144 330//144 +f 323//144 339//144 338//144 +f 316//145 332//145 331//145 +f 324//145 340//145 339//145 +f 317//146 333//146 332//146 +f 325//146 341//146 340//146 +f 317//147 318//147 334//147 +f 325//147 326//147 342//147 +f 318//148 311//148 327//148 +f 311//149 312//149 328//149 +f 326//148 319//148 335//148 +f 319//149 320//149 336//149 +f 347//93 348//93 364//93 +f 355//92 371//92 370//92 +f 334//150 327//150 343//150 +f 327//151 328//151 344//151 +f 342//150 335//150 351//150 +f 335//151 336//151 352//151 +f 328//152 329//152 345//152 +f 336//152 337//152 353//152 +f 330//153 346//153 345//153 +f 338//153 354//153 353//153 +f 331//154 347//154 346//154 +f 339//154 355//154 354//154 +f 332//155 348//155 347//155 +f 340//155 356//155 355//155 +f 333//156 349//156 348//156 +f 341//156 357//156 356//156 +f 355//93 356//93 372//93 +f 348//94 349//94 365//94 +f 356//94 357//94 373//94 +f 350//61 366//61 365//61 +f 358//61 374//61 373//61 +f 343//62 359//62 366//62 +f 343//65 344//65 360//65 +f 358//62 351//62 367//62 +f 352//65 368//65 367//65 +f 344//66 345//66 361//66 +f 352//66 353//66 369//66 +f 346//91 362//91 361//91 +f 354//91 370//91 369//91 +f 346//92 347//92 363//92 +f 378//1 377//1 375//1 +f 382//2 381//2 377//2 +f 380//3 379//3 381//3 +f 377//5 381//5 379//5 +f 382//6 378//6 376//6 +f 384//1 386//1 385//1 +f 390//2 389//2 385//2 +f 388//3 387//3 389//3 +f 384//157 383//157 387//157 +f 385//5 389//5 387//5 +f 390//6 386//6 384//6 +f 2//1 4//1 1//1 +f 4//2 8//2 3//2 +f 8//3 6//3 7//3 +f 2//4 1//4 10//4 +f 1//5 3//5 5//5 +f 6//6 8//6 2//6 +f 12//3 11//3 16//3 +f 1//4 5//4 9//4 +f 6//4 2//4 11//4 +f 5//4 6//4 12//4 +f 15//4 14//4 16//4 +f 11//6 10//6 15//6 +f 10//1 9//1 14//1 +f 9//5 12//5 13//5 +f 38//7 37//7 44//7 +f 24//2 22//2 35//2 +f 21//8 19//8 22//8 +f 18//8 17//8 48//8 +f 38//2 30//2 37//2 +f 23//9 21//9 24//9 +f 35//9 18//9 47//9 +f 20//2 34//2 17//2 +f 25//10 23//10 26//10 +f 39//11 38//11 43//11 +f 28//2 26//2 37//2 +f 27//12 25//12 28//12 +f 17//13 40//13 41//13 +f 40//2 34//2 39//2 +f 27//7 28//7 29//7 +f 48//4 41//4 50//4 +f 26//2 24//2 36//2 +f 29//11 30//11 31//11 +f 18//2 22//2 17//2 +f 33//13 34//13 19//13 +f 31//14 32//14 33//14 +f 40//14 39//14 42//14 +f 32//2 30//2 39//2 +f 36//10 35//10 46//10 +f 37//12 36//12 45//12 +f 48//4 50//4 47//4 +f 47//4 51//4 46//4 +f 46//4 52//4 45//4 +f 44//4 45//4 54//4 +f 44//4 54//4 43//4 +f 43//4 55//4 42//4 +f 42//4 56//4 41//4 +f 56//14 55//14 64//14 +f 51//4 50//4 49//4 +f 49//4 56//4 55//4 +f 55//4 54//4 53//4 +f 53//4 52//4 51//4 +f 51//4 49//4 53//4 +f 54//7 53//7 62//7 +f 60//10 52//10 59//10 +f 50//8 49//8 57//8 +f 49//13 56//13 58//13 +f 55//11 54//11 63//11 +f 61//12 53//12 60//12 +f 59//9 51//9 57//9 +f 92//15 65//15 89//15 +f 67//16 68//16 69//16 +f 91//17 86//17 92//17 +f 71//18 69//18 72//18 +f 86//19 88//19 65//19 +f 71//20 72//20 73//20 +f 66//21 83//21 85//21 +f 73//22 74//22 75//22 +f 66//23 85//23 89//23 +f 75//24 76//24 77//24 +f 88//25 86//25 87//25 +f 77//26 78//26 79//26 +f 65//15 84//15 66//15 +f 81//27 82//27 67//27 +f 79//28 80//28 81//28 +f 85//25 86//25 90//25 +f 96//25 90//25 95//25 +f 93//4 96//4 97//4 +f 91//29 92//29 95//29 +f 89//30 90//30 93//30 +f 92//15 89//15 94//15 +f 97//19 100//19 98//19 +f 100//25 96//25 99//25 +f 99//2 95//2 98//2 +f 94//15 93//15 98//15 +f 103//31 102//31 107//31 +f 108//32 104//32 107//32 +f 106//33 102//33 105//33 +f 108//34 107//34 112//34 +f 106//35 105//35 110//35 +f 107//36 106//36 111//36 +f 116//37 111//37 115//37 +f 112//38 111//38 117//38 +f 110//39 109//39 115//39 +f 116//40 115//40 120//40 +f 117//41 116//41 121//41 +f 115//42 114//42 119//42 +f 121//43 120//43 125//43 +f 119//44 118//44 123//44 +f 120//45 119//45 124//45 +f 129//46 125//46 128//46 +f 123//47 122//47 127//47 +f 128//48 124//48 127//48 +f 128//49 127//49 132//49 +f 129//50 128//50 133//50 +f 127//51 126//51 131//51 +f 132//59 131//59 103//59 +f 108//61 112//61 138//61 +f 104//62 108//62 134//62 +f 133//63 132//63 104//63 +f 102//64 131//64 101//64 +f 134//65 162//65 104//65 +f 133//66 162//66 129//66 +f 136//67 135//67 140//67 +f 137//68 136//68 141//68 +f 139//69 135//69 138//69 +f 140//70 139//70 144//70 +f 141//71 140//71 145//71 +f 143//72 139//72 142//72 +f 149//73 145//73 148//73 +f 143//74 142//74 147//74 +f 148//75 144//75 147//75 +f 147//76 146//76 151//76 +f 152//77 148//77 151//77 +f 149//78 148//78 153//78 +f 156//79 152//79 155//79 +f 153//80 152//80 157//80 +f 151//81 150//81 155//81 +f 157//82 156//82 161//82 +f 155//83 154//83 159//83 +f 160//84 156//84 159//84 +f 161//85 160//85 165//85 +f 159//86 158//86 163//86 +f 160//87 159//87 164//87 +f 164//88 163//88 136//88 +f 137//89 165//89 136//89 +f 163//90 162//90 135//90 +f 125//91 129//91 154//91 +f 121//92 125//92 150//92 +f 121//93 150//93 117//93 +f 117//94 146//94 112//94 +f 168//31 167//31 172//31 +f 173//32 169//32 172//32 +f 171//33 167//33 170//33 +f 177//34 173//34 176//34 +f 171//35 170//35 175//35 +f 172//36 171//36 176//36 +f 181//37 176//37 180//37 +f 177//38 176//38 182//38 +f 175//39 174//39 180//39 +f 181//40 180//40 185//40 +f 182//41 181//41 186//41 +f 180//42 179//42 184//42 +f 186//43 185//43 190//43 +f 184//44 183//44 188//44 +f 185//45 184//45 189//45 +f 194//46 190//46 193//46 +f 192//47 188//47 191//47 +f 193//48 189//48 192//48 +f 193//49 192//49 197//49 +f 194//50 193//50 198//50 +f 192//51 191//51 196//51 +f 197//59 196//59 168//59 +f 173//61 177//61 203//61 +f 169//62 173//62 199//62 +f 169//63 198//63 168//63 +f 167//64 196//64 166//64 +f 199//65 227//65 169//65 +f 198//66 227//66 194//66 +f 205//67 201//67 204//67 +f 202//68 201//68 206//68 +f 200//69 199//69 204//69 +f 205//70 204//70 209//70 +f 206//71 205//71 210//71 +f 204//72 203//72 208//72 +f 210//73 209//73 214//73 +f 212//74 208//74 211//74 +f 213//75 209//75 212//75 +f 212//76 211//76 216//76 +f 213//77 212//77 217//77 +f 214//78 213//78 218//78 +f 217//79 216//79 221//79 +f 218//80 217//80 222//80 +f 216//81 215//81 220//81 +f 226//82 222//82 225//82 +f 224//83 220//83 223//83 +f 225//84 221//84 224//84 +f 226//85 225//85 230//85 +f 224//86 223//86 228//86 +f 225//87 224//87 229//87 +f 238//158 165//158 231//158 +f 210//159 214//159 241//159 +f 229//88 228//88 201//88 +f 202//89 230//89 201//89 +f 228//90 227//90 200//90 +f 190//91 194//91 219//91 +f 186//92 190//92 215//92 +f 186//93 215//93 182//93 +f 182//94 211//94 177//94 +f 253//160 237//160 254//160 +f 244//161 245//161 260//161 +f 239//162 202//162 240//162 +f 232//163 141//163 233//163 +f 214//164 218//164 242//164 +f 246//158 230//158 239//158 +f 240//163 206//163 241//163 +f 237//165 161//165 238//165 +f 153//92 157//92 235//92 +f 157//166 161//166 236//166 +f 145//159 149//159 233//159 +f 245//165 226//165 246//165 +f 231//162 137//162 232//162 +f 218//92 222//92 243//92 +f 149//164 153//164 234//164 +f 222//166 226//166 244//166 +f 258//167 259//167 274//167 +f 250//167 251//167 266//167 +f 261//160 245//160 262//160 +f 254//168 238//168 247//168 +f 247//169 231//169 248//169 +f 262//168 246//168 255//168 +f 255//169 239//169 256//169 +f 248//170 232//170 249//170 +f 256//170 240//170 257//170 +f 233//171 234//171 249//171 +f 241//171 242//171 257//171 +f 234//172 235//172 250//172 +f 242//172 243//172 258//172 +f 235//173 236//173 251//173 +f 243//173 244//173 259//173 +f 236//161 237//161 252//161 +f 280//174 264//174 281//174 +f 287//175 271//175 288//175 +f 251//176 252//176 267//176 +f 259//176 260//176 275//176 +f 252//177 253//177 268//177 +f 260//177 261//177 276//177 +f 269//178 253//178 270//178 +f 277//178 261//178 278//178 +f 270//179 254//179 263//179 +f 263//180 247//180 264//180 +f 278//179 262//179 271//179 +f 271//180 255//180 272//180 +f 264//181 248//181 265//181 +f 272//181 256//181 273//181 +f 249//182 250//182 265//182 +f 257//182 258//182 273//182 +f 301//183 285//183 302//183 +f 292//184 293//184 308//184 +f 288//174 272//174 289//174 +f 265//185 266//185 281//185 +f 273//185 274//185 289//185 +f 266//186 267//186 282//186 +f 274//186 275//186 290//186 +f 267//187 268//187 283//187 +f 275//187 276//187 291//187 +f 268//188 269//188 284//188 +f 276//188 277//188 292//188 +f 285//189 269//189 286//189 +f 293//189 277//189 294//189 +f 286//190 270//190 279//190 +f 279//175 263//175 280//175 +f 294//190 278//190 287//190 +f 299//191 300//191 315//191 +f 306//192 307//192 322//192 +f 309//183 293//183 310//183 +f 302//193 286//193 295//193 +f 295//194 279//194 296//194 +f 310//193 294//193 303//193 +f 303//194 287//194 304//194 +f 296//195 280//195 297//195 +f 304//195 288//195 305//195 +f 281//196 282//196 297//196 +f 289//196 290//196 305//196 +f 282//197 283//197 298//197 +f 290//197 291//197 306//197 +f 283//9 284//9 299//9 +f 291//9 292//9 307//9 +f 284//184 285//184 300//184 +f 336//198 320//198 337//198 +f 328//198 312//198 329//198 +f 307//191 308//191 323//191 +f 300//199 301//199 316//199 +f 308//199 309//199 324//199 +f 317//200 301//200 318//200 +f 325//200 309//200 326//200 +f 318//201 302//201 311//201 +f 311//202 295//202 312//202 +f 326//201 310//201 319//201 +f 319//202 303//202 320//202 +f 312//203 296//203 313//203 +f 320//203 304//203 321//203 +f 297//204 298//204 313//204 +f 305//204 306//204 321//204 +f 298//192 299//192 314//192 +f 357//205 341//205 358//205 +f 349//205 333//205 350//205 +f 313//206 314//206 329//206 +f 321//206 322//206 337//206 +f 314//207 315//207 330//207 +f 322//207 323//207 338//207 +f 315//208 316//208 331//208 +f 323//208 324//208 339//208 +f 316//209 317//209 332//209 +f 324//209 325//209 340//209 +f 333//210 317//210 334//210 +f 341//210 325//210 342//210 +f 334//211 318//211 327//211 +f 327//212 311//212 328//212 +f 342//211 326//211 335//211 +f 335//212 319//212 336//212 +f 363//93 347//93 364//93 +f 354//92 355//92 370//92 +f 350//213 334//213 343//213 +f 343//214 327//214 344//214 +f 358//213 342//213 351//213 +f 351//214 335//214 352//214 +f 344//215 328//215 345//215 +f 352//215 336//215 353//215 +f 329//216 330//216 345//216 +f 337//216 338//216 353//216 +f 330//217 331//217 346//217 +f 338//217 339//217 354//217 +f 331//218 332//218 347//218 +f 339//218 340//218 355//218 +f 332//219 333//219 348//219 +f 340//219 341//219 356//219 +f 371//93 355//93 372//93 +f 364//94 348//94 365//94 +f 372//94 356//94 373//94 +f 349//61 350//61 365//61 +f 357//61 358//61 373//61 +f 350//62 343//62 366//62 +f 359//65 343//65 360//65 +f 374//62 358//62 367//62 +f 351//65 352//65 367//65 +f 360//66 344//66 361//66 +f 368//66 352//66 369//66 +f 345//91 346//91 361//91 +f 353//91 354//91 369//91 +f 362//92 346//92 363//92 +f 376//1 378//1 375//1 +f 378//2 382//2 377//2 +f 382//3 380//3 381//3 +f 375//5 377//5 379//5 +f 380//6 382//6 376//6 +f 383//1 384//1 385//1 +f 386//2 390//2 385//2 +f 390//3 388//3 389//3 +f 388//157 384//157 387//157 +f 383//5 385//5 387//5 +f 388//6 390//6 384//6 diff --git a/assets/hbm/models/turret_tau_gun.obj b/assets/hbm/models/turret_tau_gun.obj new file mode 100644 index 000000000..a45db2e5f --- /dev/null +++ b/assets/hbm/models/turret_tau_gun.obj @@ -0,0 +1,400 @@ +# Blender v2.76 (sub 0) OBJ File: 'turret_tau_gun.blend' +# www.blender.org +o Cube.001_Cube +v 0.200000 0.200000 -0.400000 +v 0.200000 -0.075000 -0.400000 +v 0.200000 0.200000 0.400000 +v 0.200000 -0.200000 0.400000 +v -0.200000 0.200000 -0.400000 +v -0.200000 -0.075000 -0.400000 +v -0.200000 0.200000 0.400000 +v -0.200000 -0.200000 0.400000 +v 0.000000 0.112500 0.400000 +v 0.000000 0.150000 0.900000 +v 0.097428 0.056250 0.400000 +v 0.129904 0.075000 0.900000 +v 0.097428 -0.056250 0.400000 +v 0.129904 -0.075000 0.900000 +v -0.000000 -0.112500 0.400000 +v -0.000000 -0.150000 0.900000 +v -0.097428 -0.056250 0.400000 +v -0.129904 -0.075000 0.900000 +v -0.097428 0.056250 0.400000 +v -0.129904 0.075000 0.900000 +v 0.000000 0.150000 0.650000 +v 0.129904 0.075000 0.650000 +v 0.129904 0.075000 0.900000 +v 0.000000 0.150000 0.900000 +v 0.129904 -0.075000 0.650000 +v 0.129904 -0.075000 0.900000 +v -0.000000 -0.150000 0.650000 +v -0.000000 -0.150000 0.900000 +v -0.129904 -0.075000 0.650000 +v -0.129904 -0.075000 0.900000 +v -0.129904 0.075000 0.650000 +v -0.129904 0.075000 0.900000 +v 0.012990 0.142500 0.675000 +v 0.012990 0.142500 0.875000 +v 0.116913 0.082500 0.875000 +v 0.116913 0.082500 0.675000 +v 0.129904 0.060000 0.675000 +v 0.129904 0.060000 0.875000 +v 0.129904 -0.060000 0.875000 +v 0.129904 -0.060000 0.675000 +v 0.116913 -0.082500 0.675000 +v 0.116913 -0.082500 0.875000 +v 0.012990 -0.142500 0.875000 +v 0.012990 -0.142500 0.675000 +v -0.012990 -0.142500 0.675000 +v -0.012990 -0.142500 0.875000 +v -0.116913 -0.082500 0.875000 +v -0.116913 -0.082500 0.675000 +v -0.116913 0.082500 0.675000 +v -0.116913 0.082500 0.875000 +v -0.012990 0.142500 0.875000 +v -0.012990 0.142500 0.675000 +v -0.129904 -0.060000 0.675000 +v -0.129904 -0.060000 0.875000 +v -0.129904 0.060000 0.875000 +v -0.129904 0.060000 0.675000 +v 0.000490 0.120849 0.675000 +v 0.000490 0.120849 0.875000 +v 0.104413 0.060849 0.875000 +v 0.104413 0.060849 0.675000 +v 0.104904 0.060000 0.675000 +v 0.104904 0.060000 0.875000 +v 0.104904 -0.060000 0.875000 +v 0.104904 -0.060000 0.675000 +v 0.104413 -0.060849 0.675000 +v 0.104413 -0.060849 0.875000 +v 0.000490 -0.120849 0.875000 +v 0.000490 -0.120849 0.675000 +v -0.000490 -0.120849 0.675000 +v -0.000490 -0.120849 0.875000 +v -0.104413 -0.060849 0.875000 +v -0.104413 -0.060849 0.675000 +v -0.104413 0.060849 0.675000 +v -0.104413 0.060849 0.875000 +v -0.000490 0.120849 0.875000 +v -0.000490 0.120849 0.675000 +v -0.104904 -0.060000 0.675000 +v -0.104904 -0.060000 0.875000 +v -0.104904 0.060000 0.875000 +v -0.104904 0.060000 0.675000 +v 0.000000 0.025000 0.900000 +v 0.000000 0.025000 1.400000 +v 0.021651 0.012500 0.900000 +v 0.021651 0.012500 1.400000 +v 0.021651 -0.012500 0.900000 +v 0.021651 -0.012500 1.400000 +v -0.000000 -0.025000 0.900000 +v -0.000000 -0.025000 1.400000 +v -0.021651 -0.012500 0.900000 +v -0.021651 -0.012500 1.400000 +v -0.021651 0.012500 0.900000 +v -0.021651 0.012500 1.400000 +v -0.050000 -0.086603 1.300000 +v -0.100000 0.000000 1.050000 +v -0.070711 -0.000000 0.979289 +v 0.000000 -0.000000 0.950000 +v 0.050000 -0.086603 1.300000 +v -0.050000 0.086603 1.050000 +v -0.035355 0.061237 0.979289 +v 0.100000 0.000000 1.300000 +v 0.050000 0.086603 1.050000 +v 0.035355 0.061237 0.979289 +v 0.050000 0.086603 1.300000 +v 0.100000 0.000000 1.050000 +v 0.070711 -0.000000 0.979289 +v -0.050000 0.086603 1.300000 +v 0.050000 -0.086603 1.050000 +v 0.035355 -0.061237 0.979289 +v -0.100000 0.000000 1.300000 +v -0.050000 -0.086603 1.050000 +v -0.035355 -0.061237 0.979289 +v -0.125000 0.250000 0.050000 +v -0.125000 -0.050000 0.050000 +v -0.375000 -0.000000 -0.100000 +v 0.375000 0.000000 -0.100000 +v -0.375000 -0.070711 -0.070711 +v 0.375000 -0.070711 -0.070711 +v -0.375000 -0.100000 0.000000 +v 0.375000 -0.100000 0.000000 +v -0.375000 -0.070711 0.070711 +v 0.375000 -0.070711 0.070711 +v -0.375000 -0.000000 0.100000 +v 0.375000 0.000000 0.100000 +v -0.375000 0.070711 0.070711 +v 0.375000 0.070711 0.070711 +v -0.375000 0.100000 -0.000000 +v 0.375000 0.100000 -0.000000 +v -0.375000 0.070711 -0.070711 +v 0.375000 0.070711 -0.070711 +v -0.125000 -0.050000 -0.450000 +v -0.125000 0.250000 -0.450000 +v 0.125000 -0.050000 0.050000 +v 0.125000 0.250000 0.050000 +v 0.125000 -0.050000 -0.450000 +v 0.125000 0.250000 -0.450000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 -0.988000 -0.154400 +vn 0.000000 0.000000 1.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn -1.000000 0.000000 0.000000 +vn 0.495800 -0.858800 -0.128800 +vn 0.495800 0.858800 -0.128800 +vn -0.495800 -0.858800 -0.128800 +vn -0.991700 0.000000 -0.128800 +vn -0.495800 0.858800 -0.128800 +vn 0.991700 -0.000000 -0.128800 +vn 0.500000 0.866000 0.000000 +vn 0.500000 -0.866000 0.000000 +vn -0.500000 -0.866000 0.000000 +vn -0.500000 0.866000 0.000000 +vn 0.866000 -0.500000 0.000000 +vn -0.866000 0.500000 0.000000 +vn -0.000000 -1.000000 0.000000 +vn -0.866000 -0.500000 0.000000 +vn 0.866000 0.500000 0.000000 +vn -0.815200 0.470600 -0.337700 +vn 0.000000 0.941300 -0.337700 +vn 0.815200 0.470600 -0.337700 +vn 0.815200 -0.470600 -0.337700 +vn 0.000000 -0.941300 -0.337700 +vn -0.373700 0.215700 -0.902100 +vn 0.000000 0.431500 -0.902100 +vn 0.373700 0.215700 -0.902100 +vn 0.373700 -0.215700 -0.902100 +vn 0.000000 -0.431500 -0.902100 +vn -0.815200 -0.470600 -0.337700 +vn -0.373700 -0.215700 -0.902100 +vn 0.000000 -0.382700 -0.923900 +vn 0.000000 -0.923900 -0.382700 +vn 0.000000 -0.923900 0.382700 +vn 0.000000 -0.382700 0.923900 +vn -0.000000 0.382700 0.923900 +vn -0.000000 0.923900 0.382700 +vn -0.000000 0.382700 -0.923900 +vn -0.000000 0.923900 -0.382700 +s off +f 1//1 5//1 7//1 +f 6//2 2//2 4//2 +f 7//3 8//3 4//3 +f 3//4 4//4 2//4 +f 1//5 2//5 6//5 +f 7//6 5//6 6//6 +f 13//7 25//7 27//7 +f 9//8 21//8 22//8 +f 20//3 10//3 24//3 +f 15//9 27//9 29//9 +f 10//3 16//3 14//3 +f 17//10 29//10 31//10 +f 19//11 31//11 21//11 +f 18//3 20//3 32//3 +f 13//12 11//12 22//12 +f 16//3 18//3 30//3 +f 10//3 12//3 23//3 +f 14//3 16//3 28//3 +f 12//3 14//3 26//3 +f 34//13 33//13 21//13 +f 35//13 34//13 24//13 +f 22//13 36//13 35//13 +f 33//13 36//13 22//13 +f 38//4 37//4 22//4 +f 26//4 39//4 38//4 +f 25//4 40//4 39//4 +f 37//4 40//4 25//4 +f 42//14 41//14 25//14 +f 43//14 42//14 26//14 +f 27//14 44//14 43//14 +f 41//14 44//14 27//14 +f 46//15 45//15 27//15 +f 47//15 46//15 28//15 +f 29//15 48//15 47//15 +f 45//15 48//15 29//15 +f 50//16 49//16 31//16 +f 24//16 51//16 50//16 +f 21//16 52//16 51//16 +f 49//16 52//16 21//16 +f 54//6 53//6 29//6 +f 55//6 54//6 30//6 +f 31//6 56//6 55//6 +f 53//6 56//6 31//6 +f 58//13 59//13 60//13 +f 58//17 57//17 33//17 +f 35//5 59//5 58//5 +f 60//18 59//18 35//18 +f 57//3 60//3 36//3 +f 62//4 63//4 64//4 +f 62//19 61//19 37//19 +f 63//5 62//5 38//5 +f 64//1 63//1 39//1 +f 37//3 61//3 64//3 +f 66//14 67//14 68//14 +f 66//20 65//20 41//20 +f 67//5 66//5 42//5 +f 68//21 67//21 43//21 +f 65//3 68//3 44//3 +f 70//15 71//15 72//15 +f 70//18 69//18 45//18 +f 71//5 70//5 46//5 +f 72//17 71//17 47//17 +f 45//3 69//3 72//3 +f 74//16 75//16 76//16 +f 74//21 73//21 49//21 +f 75//5 74//5 50//5 +f 76//20 75//20 51//20 +f 49//3 73//3 76//3 +f 78//6 79//6 80//6 +f 78//1 77//1 53//1 +f 79//5 78//5 54//5 +f 80//19 79//19 55//19 +f 77//3 80//3 56//3 +f 82//13 84//13 83//13 +f 84//4 86//4 85//4 +f 86//14 88//14 87//14 +f 88//15 90//15 89//15 +f 82//3 88//3 86//3 +f 92//16 82//16 81//16 +f 90//6 92//6 91//6 +f 94//22 98//22 99//22 +f 98//23 101//23 102//23 +f 101//24 104//24 105//24 +f 104//25 107//25 108//25 +f 107//26 110//26 111//26 +f 96//27 95//27 99//27 +f 96//28 99//28 102//28 +f 94//18 109//18 106//18 +f 106//1 103//1 101//1 +f 96//29 102//29 105//29 +f 94//20 110//20 93//20 +f 96//30 105//30 108//30 +f 104//17 100//17 97//17 +f 96//31 108//31 111//31 +f 111//32 110//32 94//32 +f 110//19 107//19 97//19 +f 96//33 111//33 95//33 +f 115//34 117//34 116//34 +f 117//35 119//35 118//35 +f 135//1 131//1 112//1 +f 119//36 121//36 120//36 +f 130//19 134//19 132//19 +f 121//37 123//37 122//37 +f 112//3 113//3 132//3 +f 123//38 125//38 124//38 +f 133//4 132//4 134//4 +f 125//39 127//39 126//39 +f 135//5 134//5 130//5 +f 129//40 115//40 114//40 +f 127//41 129//41 128//41 +f 131//6 130//6 113//6 +f 3//1 1//1 7//1 +f 8//2 6//2 4//2 +f 3//3 7//3 4//3 +f 1//4 3//4 2//4 +f 5//5 1//5 6//5 +f 8//6 7//6 6//6 +f 15//7 13//7 27//7 +f 11//8 9//8 22//8 +f 32//3 20//3 24//3 +f 17//9 15//9 29//9 +f 14//3 12//3 10//3 +f 10//3 20//3 18//3 +f 18//3 16//3 10//3 +f 19//10 17//10 31//10 +f 9//11 19//11 21//11 +f 30//3 18//3 32//3 +f 25//12 13//12 22//12 +f 28//3 16//3 30//3 +f 24//3 10//3 23//3 +f 26//3 14//3 28//3 +f 23//3 12//3 26//3 +f 24//13 34//13 21//13 +f 23//13 35//13 24//13 +f 23//13 22//13 35//13 +f 21//13 33//13 22//13 +f 23//4 38//4 22//4 +f 23//4 26//4 38//4 +f 26//4 25//4 39//4 +f 22//4 37//4 25//4 +f 26//14 42//14 25//14 +f 28//14 43//14 26//14 +f 28//14 27//14 43//14 +f 25//14 41//14 27//14 +f 28//15 46//15 27//15 +f 30//15 47//15 28//15 +f 30//15 29//15 47//15 +f 27//15 45//15 29//15 +f 32//16 50//16 31//16 +f 32//16 24//16 50//16 +f 24//16 21//16 51//16 +f 31//16 49//16 21//16 +f 30//6 54//6 29//6 +f 32//6 55//6 30//6 +f 32//6 31//6 55//6 +f 29//6 53//6 31//6 +f 57//13 58//13 60//13 +f 34//17 58//17 33//17 +f 34//5 35//5 58//5 +f 36//18 60//18 35//18 +f 33//3 57//3 36//3 +f 61//4 62//4 64//4 +f 38//19 62//19 37//19 +f 39//5 63//5 38//5 +f 40//1 64//1 39//1 +f 40//3 37//3 64//3 +f 65//14 66//14 68//14 +f 42//20 66//20 41//20 +f 43//5 67//5 42//5 +f 44//21 68//21 43//21 +f 41//3 65//3 44//3 +f 69//15 70//15 72//15 +f 46//18 70//18 45//18 +f 47//5 71//5 46//5 +f 48//17 72//17 47//17 +f 48//3 45//3 72//3 +f 73//16 74//16 76//16 +f 50//21 74//21 49//21 +f 51//5 75//5 50//5 +f 52//20 76//20 51//20 +f 52//3 49//3 76//3 +f 77//6 78//6 80//6 +f 54//1 78//1 53//1 +f 55//5 79//5 54//5 +f 56//19 80//19 55//19 +f 53//3 77//3 56//3 +f 81//13 82//13 83//13 +f 83//4 84//4 85//4 +f 85//14 86//14 87//14 +f 87//15 88//15 89//15 +f 86//3 84//3 82//3 +f 82//3 92//3 90//3 +f 90//3 88//3 82//3 +f 91//16 92//16 81//16 +f 89//6 90//6 91//6 +f 95//22 94//22 99//22 +f 99//23 98//23 102//23 +f 102//24 101//24 105//24 +f 105//25 104//25 108//25 +f 108//26 107//26 111//26 +f 98//18 94//18 106//18 +f 98//1 106//1 101//1 +f 109//20 94//20 93//20 +f 107//17 104//17 97//17 +f 95//32 111//32 94//32 +f 93//19 110//19 97//19 +f 114//34 115//34 116//34 +f 116//35 117//35 118//35 +f 133//1 135//1 112//1 +f 118//36 119//36 120//36 +f 113//19 130//19 132//19 +f 120//37 121//37 122//37 +f 133//3 112//3 132//3 +f 122//38 123//38 124//38 +f 135//4 133//4 134//4 +f 124//39 125//39 126//39 +f 131//5 135//5 130//5 +f 128//40 129//40 114//40 +f 126//41 127//41 128//41 +f 112//6 131//6 113//6 diff --git a/assets/hbm/textures/blocks/turret_flamer.png b/assets/hbm/textures/blocks/turret_flamer.png new file mode 100644 index 000000000..961ef7948 Binary files /dev/null and b/assets/hbm/textures/blocks/turret_flamer.png differ diff --git a/assets/hbm/textures/blocks/turret_heavy.png b/assets/hbm/textures/blocks/turret_heavy.png new file mode 100644 index 000000000..6f0ebb755 Binary files /dev/null and b/assets/hbm/textures/blocks/turret_heavy.png differ diff --git a/assets/hbm/textures/blocks/turret_light.png b/assets/hbm/textures/blocks/turret_light.png new file mode 100644 index 000000000..69db22eb2 Binary files /dev/null and b/assets/hbm/textures/blocks/turret_light.png differ diff --git a/assets/hbm/textures/blocks/turret_rocket.png b/assets/hbm/textures/blocks/turret_rocket.png new file mode 100644 index 000000000..f3220fd1e Binary files /dev/null and b/assets/hbm/textures/blocks/turret_rocket.png differ diff --git a/assets/hbm/textures/blocks/turret_tau.png b/assets/hbm/textures/blocks/turret_tau.png new file mode 100644 index 000000000..f5b449b7a Binary files /dev/null and b/assets/hbm/textures/blocks/turret_tau.png differ diff --git a/assets/hbm/textures/gui/fluids2.png b/assets/hbm/textures/gui/fluids2.png index 895402a63..df2cb79b8 100755 Binary files a/assets/hbm/textures/gui/fluids2.png and b/assets/hbm/textures/gui/fluids2.png differ diff --git a/assets/hbm/textures/gui/gui_nei_chemplant.png b/assets/hbm/textures/gui/gui_nei_chemplant.png new file mode 100644 index 000000000..a76fd6a85 Binary files /dev/null and b/assets/hbm/textures/gui/gui_nei_chemplant.png differ diff --git a/assets/hbm/textures/items/fluid_icon.png b/assets/hbm/textures/items/fluid_icon.png new file mode 100644 index 000000000..4db83ebf0 Binary files /dev/null and b/assets/hbm/textures/items/fluid_icon.png differ diff --git a/assets/hbm/textures/items/powder_desh_mix.png b/assets/hbm/textures/items/powder_desh_mix.png new file mode 100644 index 000000000..11239d9f1 Binary files /dev/null and b/assets/hbm/textures/items/powder_desh_mix.png differ diff --git a/assets/hbm/textures/items/powder_energy_alt.png b/assets/hbm/textures/items/powder_energy_alt.png new file mode 100644 index 000000000..6f4481b22 Binary files /dev/null and b/assets/hbm/textures/items/powder_energy_alt.png differ diff --git a/assets/hbm/textures/items/powder_template.png b/assets/hbm/textures/items/powder_template.png new file mode 100644 index 000000000..71b8b07c5 Binary files /dev/null and b/assets/hbm/textures/items/powder_template.png differ diff --git a/assets/hbm/textures/items/solid_fuel.png b/assets/hbm/textures/items/solid_fuel.png new file mode 100644 index 000000000..6d85971b2 Binary files /dev/null and b/assets/hbm/textures/items/solid_fuel.png differ diff --git a/assets/hbm/textures/items/turret_control.png b/assets/hbm/textures/items/turret_control.png new file mode 100644 index 000000000..6362b5fda Binary files /dev/null and b/assets/hbm/textures/items/turret_control.png differ diff --git a/com/hbm/blocks/ModBlocks.java b/com/hbm/blocks/ModBlocks.java index 06487cd40..ab5e41e28 100644 --- a/com/hbm/blocks/ModBlocks.java +++ b/com/hbm/blocks/ModBlocks.java @@ -366,6 +366,8 @@ public class ModBlocks { public static Block turret_light; public static Block turret_heavy; public static Block turret_rocket; + public static Block turret_flamer; + public static Block turret_tau; public static Block book_guide; @@ -669,6 +671,8 @@ public class ModBlocks { turret_light = new TurretLight(Material.iron).setBlockName("turret_light").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabNuke).setBlockTextureName(RefStrings.MODID + ":turret_light"); turret_heavy = new TurretHeavy(Material.iron).setBlockName("turret_heavy").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabNuke).setBlockTextureName(RefStrings.MODID + ":turret_heavy"); turret_rocket = new TurretRocket(Material.iron).setBlockName("turret_rocket").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabNuke).setBlockTextureName(RefStrings.MODID + ":turret_rocket"); + turret_flamer = new TurretFlamer(Material.iron).setBlockName("turret_flamer").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabNuke).setBlockTextureName(RefStrings.MODID + ":turret_flamer"); + turret_tau = new TurretTau(Material.iron).setBlockName("turret_tau").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabNuke).setBlockTextureName(RefStrings.MODID + ":turret_tau"); book_guide = new Guide(Material.iron).setBlockName("book_guide").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabNuke); @@ -879,6 +883,8 @@ public class ModBlocks { GameRegistry.registerBlock(turret_light, turret_light.getUnlocalizedName()); GameRegistry.registerBlock(turret_heavy, turret_heavy.getUnlocalizedName()); GameRegistry.registerBlock(turret_rocket, turret_rocket.getUnlocalizedName()); + GameRegistry.registerBlock(turret_flamer, turret_flamer.getUnlocalizedName()); + GameRegistry.registerBlock(turret_tau, turret_tau.getUnlocalizedName()); //Block Bombs GameRegistry.registerBlock(flame_war, flame_war.getUnlocalizedName()); diff --git a/com/hbm/blocks/bomb/TurretFlamer.java b/com/hbm/blocks/bomb/TurretFlamer.java new file mode 100644 index 000000000..7949b1857 --- /dev/null +++ b/com/hbm/blocks/bomb/TurretFlamer.java @@ -0,0 +1,66 @@ +package com.hbm.blocks.bomb; + +import com.hbm.entity.particle.EntityGasFlameFX; +import com.hbm.entity.projectile.EntityBullet; +import com.hbm.entity.projectile.EntityFire; +import com.hbm.tileentity.TileEntityTurretFlamer; +import com.hbm.tileentity.TileEntityTurretHeavy; + +import net.minecraft.block.material.Material; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; + +public class TurretFlamer extends TurretBase { + + public TurretFlamer(Material mat) { + super(mat); + } + + @Override + public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { + return new TileEntityTurretFlamer(); + } + + @Override + public void executeHoldAction(World world, int i, double yaw, double pitch, int x, int y, int z) { + + if(pitch < -60) + pitch = -60; + if(pitch > 30) + pitch = 30; + + if(true) { + Vec3 vector = Vec3.createVectorHelper( + -Math.sin(yaw / 180.0F * (float) Math.PI) * Math.cos(pitch / 180.0F * (float) Math.PI), + -Math.sin(pitch / 180.0F * (float) Math.PI), + Math.cos(yaw / 180.0F * (float) Math.PI) * Math.cos(pitch / 180.0F * (float) Math.PI)); + + vector.normalize(); + + if(!world.isRemote) { + EntityFire bullet = new EntityFire(world); + bullet.posX = x + vector.xCoord * 2 + 0.5; + bullet.posY = y + vector.yCoord * 2 + 1; + bullet.posZ = z + vector.zCoord * 2 + 0.5; + + bullet.motionX = vector.xCoord * 3; + bullet.motionY = vector.yCoord * 3; + bullet.motionZ = vector.zCoord * 3; + + bullet.setDamage(6 + rand.nextInt(5)); + + world.spawnEntityInWorld(bullet); + } + + if(i == 0) + world.playSoundEffect(x, y, z, "hbm:weapon.flamethrowerIgnite", 1.0F, 1.0F); + else + world.playSoundEffect(x, y, z, "hbm:weapon.flamethrowerShoot", 1.0F, 1.0F); + } + } + + @Override + public void executeReleaseAction(World world, int i, double yaw, double pitch, int x, int y, int z) { } + +} diff --git a/com/hbm/blocks/bomb/TurretTau.java b/com/hbm/blocks/bomb/TurretTau.java new file mode 100644 index 000000000..8b191ad3c --- /dev/null +++ b/com/hbm/blocks/bomb/TurretTau.java @@ -0,0 +1,63 @@ +package com.hbm.blocks.bomb; + +import com.hbm.entity.particle.EntityGasFlameFX; +import com.hbm.entity.projectile.EntityBullet; +import com.hbm.tileentity.TileEntityTurretHeavy; +import com.hbm.tileentity.TileEntityTurretTau; + +import net.minecraft.block.material.Material; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; + +public class TurretTau extends TurretBase { + + public TurretTau(Material mat) { + super(mat); + } + + @Override + public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { + return new TileEntityTurretTau(); + } + + @Override + public void executeHoldAction(World world, int i, double yaw, double pitch, int x, int y, int z) { + + if(pitch < -60) + pitch = -60; + if(pitch > 30) + pitch = 30; + + if(i != 0 && i % 4 == 0) { + Vec3 vector = Vec3.createVectorHelper( + -Math.sin(yaw / 180.0F * (float) Math.PI) * Math.cos(pitch / 180.0F * (float) Math.PI), + -Math.sin(pitch / 180.0F * (float) Math.PI), + Math.cos(yaw / 180.0F * (float) Math.PI) * Math.cos(pitch / 180.0F * (float) Math.PI)); + + vector.normalize(); + + if(!world.isRemote) { + EntityBullet bullet = new EntityBullet(world); + bullet.setIsCritical(true); + bullet.posX = x + vector.xCoord * 2 + 0.5; + bullet.posY = y + vector.yCoord * 2 + 1; + bullet.posZ = z + vector.zCoord * 2 + 0.5; + + bullet.motionX = vector.xCoord * 3; + bullet.motionY = vector.yCoord * 3; + bullet.motionZ = vector.zCoord * 3; + + bullet.setDamage(25 + rand.nextInt(65 - 25)); + + world.spawnEntityInWorld(bullet); + } + + world.playSoundEffect(x, y, z, "hbm:weapon.tauShoot", 1.0F, 0.5F); + } + } + + @Override + public void executeReleaseAction(World world, int i, double yaw, double pitch, int x, int y, int z) { } + +} diff --git a/com/hbm/handler/FluidTypeHandler.java b/com/hbm/handler/FluidTypeHandler.java index 6034cc983..4a0a7ff02 100644 --- a/com/hbm/handler/FluidTypeHandler.java +++ b/com/hbm/handler/FluidTypeHandler.java @@ -6,7 +6,7 @@ public class FluidTypeHandler { NONE (0x888888, 8947848, 0, 1, "hbmfluid.none"), WATER (0x3333FF, 3355647, 1, 1, "hbmfluid.water"), - STEAM (0x3333FF, 3355647, 1, 1, "hbmfluid.steam"), + STEAM (0x020202, 3355647, 9, 1, "hbmfluid.steam"), COOLANT (0xd8fcff, 14220543, 2, 1, "hbmfluid.coolant"), LAVA (0xFF3300, 16724736, 3, 1, "hbmfluid.lava"), @@ -15,7 +15,7 @@ public class FluidTypeHandler { TRITIUM (0x000099, 153, 5, 1, "hbmfluid.tritium"), OIL (0x020202, 131586, 6, 1, "hbmfluid.oil"), - HOTOIL (0x020202, 131586, 6, 1, "hbmfluid.hotoil"), + HOTOIL (0x020202, 131586, 8, 1, "hbmfluid.hotoil"), HEAVYOIL (0x141312, 1315602, 2, 2, "hbmfluid.heavyoil"), BITUMEN (0x1f2426, 2040870, 3, 2, "hbmfluid.bitumen"), @@ -40,7 +40,10 @@ public class FluidTypeHandler { PUF6 (0x4C4C4C, 5000268, 15, 1, "hbmfluid.puf6"), AMAT (0x010101, 65793, 0, 2, "hbmfluid.amat"), - ASCHRAB (0xb50000, 11862016, 1, 2, "hbmfluid.aschrab"); + ASCHRAB (0xb50000, 11862016, 1, 2, "hbmfluid.aschrab"), + + ACID (0x020202, 11862016, 10, 2, "hbmfluid.acid"), + WATZ (0x020202, 11862016, 11, 2, "hbmfluid.watz"); private int color; diff --git a/com/hbm/handler/FuelHandler.java b/com/hbm/handler/FuelHandler.java index 39492d29d..192d8a638 100644 --- a/com/hbm/handler/FuelHandler.java +++ b/com/hbm/handler/FuelHandler.java @@ -12,20 +12,8 @@ public class FuelHandler implements IFuelHandler { @Override public int getBurnTime(ItemStack fuel) { - if(fuel.getItem().equals(ModItems.canister_oil)) + if(fuel.getItem().equals(ModItems.solid_fuel)) return 3200; - if(fuel.getItem().equals(ModItems.canister_smear)) - return 6400; - if(fuel.getItem().equals(ModItems.canister_reoil)) - return 9600; - if(fuel.getItem().equals(ModItems.canister_petroil)) - return 9200; - if(fuel.getItem().equals(ModItems.canister_canola)) - return 4800; - if(fuel.getItem().equals(ModItems.canister_fuel)) - return 3200; - if(fuel.getItem().equals(ModItems.canister_kerosene)) - return 2400; if(fuel.getItem().equals(ModItems.powder_coal)) return 1600; if(fuel.getItem().equals(ModItems.scrap)) @@ -34,8 +22,6 @@ public class FuelHandler implements IFuelHandler { return 400; if(fuel.getItem().equals(ModItems.powder_fire)) return 6400; - if(fuel.getItem().equals(Item.getItemFromBlock(ModBlocks.red_barrel))) - return 32000; if(fuel.getItem().equals(Item.getItemFromBlock(ModBlocks.block_scrap))) return 8000; diff --git a/com/hbm/inventory/MachineRecipes.java b/com/hbm/inventory/MachineRecipes.java index df1412b73..f68de7acb 100644 --- a/com/hbm/inventory/MachineRecipes.java +++ b/com/hbm/inventory/MachineRecipes.java @@ -1756,11 +1756,13 @@ public class MachineRecipes { list.add(new ItemStack(ModItems.circuit_aluminium, 1)); list.add(new ItemStack(ModItems.wire_copper, 6)); list.add(new ItemStack(ModItems.powder_quartz, 4)); + list.add(new ItemStack(ModItems.plate_copper, 1)); break; case CIRCUIT_3: list.add(new ItemStack(ModItems.circuit_copper, 1)); list.add(new ItemStack(ModItems.wire_red_copper, 6)); list.add(new ItemStack(ModItems.powder_gold, 4)); + list.add(new ItemStack(ModItems.ingot_polymer, 1)); break; case RTG_PELLET: list.add(new ItemStack(ModItems.nugget_pu238, 5)); @@ -2489,10 +2491,10 @@ public class MachineRecipes { Map recipes = new HashMap(); recipes.put(new ItemStack(ModItems.canister_oil, 1) , new ItemStack[] { - new ItemStack(ModItems.canister_smear, 1), - new ItemStack(ModItems.canister_canola, 1), - new ItemStack(ModItems.canister_fuel, 1), - new ItemStack(ModItems.canister_kerosene, 1), + new ItemStack(ModItems.canister_heavyoil, 1), + new ItemStack(ModItems.canister_naphtha, 1), + new ItemStack(ModItems.canister_lightoil, 1), + new ItemStack(ModItems.gas_petroleum, 1), new ItemStack(ModItems.sulfur, 1) }); return recipes; @@ -2511,6 +2513,9 @@ public class MachineRecipes { list.add(new ItemStack(Items.gold_ingot, 2)); list.add(new ItemStack(Items.coal, 8)); break; + case CC_OIL: + list.add(new ItemStack(Items.coal, 10)); + break; case CC_I: list.add(new ItemStack(Items.coal, 8)); break; @@ -2523,6 +2528,28 @@ public class MachineRecipes { case CC_NAPHTHA: list.add(new ItemStack(Items.coal, 10)); break; + case ASPHALT: + list.add(new ItemStack(Blocks.gravel, 2)); + list.add(new ItemStack(Blocks.sand, 6)); + break; + case COOLANT: + list.add(new ItemStack(ModItems.niter, 1)); + break; + case DESH: + list.add(new ItemStack(ModItems.powder_desh_mix, 2)); + break; + case CIRCUIT_4: + list.add(new ItemStack(ModItems.circuit_red_copper, 1)); + list.add(new ItemStack(ModItems.wire_gold, 6)); + list.add(new ItemStack(ModItems.powder_lapis, 4)); + list.add(new ItemStack(ModItems.ingot_desh, 1)); + break; + case CIRCUIT_5: + list.add(new ItemStack(ModItems.circuit_gold, 1)); + list.add(new ItemStack(ModItems.wire_schrabidium, 6)); + list.add(new ItemStack(ModItems.powder_diamond, 4)); + list.add(new ItemStack(ModItems.powder_power, 1)); + break; default: break; } @@ -2584,6 +2611,10 @@ public class MachineRecipes { input[0] = new FluidStack(800, FluidType.SMEAR); input[1] = new FluidStack(1800, FluidType.WATER); break; + case CC_OIL: + input[0] = new FluidStack(600, FluidType.OIL); + input[1] = new FluidStack(1400, FluidType.STEAM); + break; case CC_HEATING: input[0] = new FluidStack(800, FluidType.HEATINGOIL); input[1] = new FluidStack(2000, FluidType.STEAM); @@ -2596,6 +2627,26 @@ public class MachineRecipes { input[0] = new FluidStack(1200, FluidType.NAPHTHA); input[1] = new FluidStack(2400, FluidType.STEAM); break; + case ASPHALT: + input[0] = new FluidStack(8000, FluidType.BITUMEN); + break; + case COOLANT: + input[0] = new FluidStack(1800, FluidType.WATER); + break; + case DESH: + input[0] = new FluidStack(800, FluidType.ACID); + input[1] = new FluidStack(200, FluidType.LIGHTOIL); + break; + case PEROXIDE: + input[0] = new FluidStack(1000, FluidType.WATER); + break; + case CIRCUIT_4: + input[0] = new FluidStack(400, FluidType.ACID); + break; + case CIRCUIT_5: + input[0] = new FluidStack(800, FluidType.ACID); + input[1] = new FluidStack(400, FluidType.PETROLEUM); + break; default: break; } @@ -2615,6 +2666,21 @@ public class MachineRecipes { output[0] = new ItemStack(ModItems.ingot_steel); output[1] = new ItemStack(ModItems.ingot_desh, 2); break; + case ASPHALT: + output[0] = new ItemStack(ModBlocks.asphalt, 4); + output[1] = new ItemStack(ModBlocks.asphalt, 4); + output[2] = new ItemStack(ModBlocks.asphalt, 4); + output[3] = new ItemStack(ModBlocks.asphalt, 4); + break; + case DESH: + output[0] = new ItemStack(ModItems.ingot_desh, 1); + break; + case CIRCUIT_4: + output[0] = new ItemStack(ModItems.circuit_gold, 1); + break; + case CIRCUIT_5: + output[0] = new ItemStack(ModItems.circuit_schrabidium, 1); + break; default: break; } @@ -2667,6 +2733,9 @@ public class MachineRecipes { case FC_KEROSENE_PETROLEUM: input[0] = new FluidStack(800, FluidType.PETROLEUM); break; + case CC_OIL: + input[0] = new FluidStack(1000, FluidType.OIL); + break; case CC_I: input[0] = new FluidStack(800, FluidType.SMEAR); break; @@ -2679,6 +2748,12 @@ public class MachineRecipes { case CC_NAPHTHA: input[0] = new FluidStack(2000, FluidType.NAPHTHA); break; + case COOLANT: + input[0] = new FluidStack(2000, FluidType.COOLANT); + break; + case PEROXIDE: + input[0] = new FluidStack(800, FluidType.ACID); + break; default: break; } diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 5d92e1a9d..482cdaf39 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -134,6 +134,8 @@ public class ModItems { public static Item ingot_lanthanium; public static Item ingot_actinium; + public static Item solid_fuel; + public static Item powder_lead; public static Item powder_neptunium; public static Item powder_schrabidium; @@ -196,6 +198,7 @@ public class ModItems { public static Item powder_lanthanium; public static Item powder_actinium; public static Item powder_desh; + public static Item powder_desh_mix; public static Item fragment_neodymium; public static Item fragment_cobalt; @@ -535,6 +538,7 @@ public class ModItems { public static Item assembly_template; public static Item chemistry_template; public static Item fluid_identifier; + public static Item fluid_icon; public static Item missile_generic; public static Item missile_anti_ballistic; @@ -1067,6 +1071,8 @@ public class ModItems { 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"); + + solid_fuel = new Item().setUnlocalizedName("solid_fuel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":solid_fuel"); ingot_australium = new ItemCustomLore().setUnlocalizedName("ingot_australium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_australium"); ingot_weidanium = new ItemCustomLore().setUnlocalizedName("ingot_weidanium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_weidanium"); @@ -1130,7 +1136,7 @@ public class ModItems { powder_red_copper = new Item().setUnlocalizedName("powder_red_copper").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_red_copper"); powder_steel = new Item().setUnlocalizedName("powder_steel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_steel"); powder_lithium = new Item().setUnlocalizedName("powder_lithium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_lithium"); - powder_power = new ItemCustomLore().setUnlocalizedName("powder_power").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_energy"); + powder_power = new ItemCustomLore().setUnlocalizedName("powder_power").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_energy_alt"); powder_iodine = new ItemCustomLore().setUnlocalizedName("powder_iodine").setCreativeTab(null).setTextureName(RefStrings.MODID + ":powder_iodine"); powder_thorium = new ItemCustomLore().setUnlocalizedName("powder_thorium").setCreativeTab(null).setTextureName(RefStrings.MODID + ":powder_thorium"); powder_neodymium = new ItemCustomLore().setUnlocalizedName("powder_neodymium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_neodymium"); @@ -1152,6 +1158,7 @@ public class ModItems { powder_polymer = new ItemCustomLore().setUnlocalizedName("powder_polymer").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_polymer"); 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_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"); @@ -1712,11 +1719,12 @@ public class ModItems { chopper = new ItemChopper().setUnlocalizedName("chopper").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":chopper"); linker = new ItemTeleLink().setUnlocalizedName("linker").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":linker"); oil_detector = new ItemOilDetector().setUnlocalizedName("oil_detector").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":oil_detector"); - turret_control = new ItemTurretControl().setUnlocalizedName("turret_control").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":turret_control"); + turret_control = new ItemTurretControl().setUnlocalizedName("turret_control").setFull3D().setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":turret_control"); assembly_template = new ItemAssemblyTemplate().setUnlocalizedName("assembly_template").setMaxStackSize(1).setCreativeTab(MainRegistry.tabMachine).setTextureName(RefStrings.MODID + ":assembly_template"); chemistry_template = new ItemChemistryTemplate().setUnlocalizedName("chemistry_template").setMaxStackSize(1).setCreativeTab(MainRegistry.tabMachine).setTextureName(RefStrings.MODID + ":chemistry_template"); fluid_identifier = new ItemFluidIdentifier().setUnlocalizedName("fluid_identifier").setMaxStackSize(1).setCreativeTab(MainRegistry.tabMachine).setTextureName(RefStrings.MODID + ":fluid_identifier"); + fluid_icon = new ItemFluidIcon().setUnlocalizedName("fluid_icon").setCreativeTab(null).setTextureName(RefStrings.MODID + ":fluid_icon"); fluid_tank_full = new ItemFluidTank().setUnlocalizedName("fluid_tank_full").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":fluid_tank"); fluid_tank_empty = new Item().setUnlocalizedName("fluid_tank_empty").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":fluid_tank"); fluid_barrel_full = new ItemFluidTank().setUnlocalizedName("fluid_barrel_full").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":fluid_barrel"); @@ -2007,6 +2015,7 @@ public class ModItems { //Dusts & Other GameRegistry.registerItem(lithium, lithium.getUnlocalizedName()); + GameRegistry.registerItem(solid_fuel, solid_fuel.getUnlocalizedName()); GameRegistry.registerItem(sulfur, sulfur.getUnlocalizedName()); GameRegistry.registerItem(niter, niter.getUnlocalizedName()); GameRegistry.registerItem(fluorite, fluorite.getUnlocalizedName()); @@ -2054,6 +2063,7 @@ public class ModItems { GameRegistry.registerItem(powder_cerium, powder_cerium.getUnlocalizedName()); GameRegistry.registerItem(powder_lanthanium, powder_lanthanium.getUnlocalizedName()); GameRegistry.registerItem(powder_actinium, powder_actinium.getUnlocalizedName()); + GameRegistry.registerItem(powder_desh_mix, powder_desh_mix.getUnlocalizedName()); GameRegistry.registerItem(powder_desh, powder_desh.getUnlocalizedName()); GameRegistry.registerItem(dust, dust.getUnlocalizedName()); GameRegistry.registerItem(powder_lithium_tiny, powder_lithium_tiny.getUnlocalizedName()); @@ -2365,6 +2375,7 @@ public class ModItems { //Machine Templates GameRegistry.registerItem(fluid_identifier, fluid_identifier.getUnlocalizedName()); + GameRegistry.registerItem(fluid_icon, fluid_icon.getUnlocalizedName()); GameRegistry.registerItem(assembly_template, assembly_template.getUnlocalizedName()); GameRegistry.registerItem(chemistry_template, chemistry_template.getUnlocalizedName()); diff --git a/com/hbm/items/tool/ItemChemistryTemplate.java b/com/hbm/items/tool/ItemChemistryTemplate.java index 9d57ebdc2..bccdecf22 100644 --- a/com/hbm/items/tool/ItemChemistryTemplate.java +++ b/com/hbm/items/tool/ItemChemistryTemplate.java @@ -24,8 +24,9 @@ public class ItemChemistryTemplate extends Item { //CC - Coal Cracking TEST, FP_HEAVYOIL, FP_SMEAR, FP_NAPHTHA, FP_LIGHTOIL, FR_REOIL, FR_PETROIL, - FC_I_NAPHTHA, FC_GAS_PETROLEUM, FC_DIESEL_KEROSENE, FC_KEROSENE_PETROLEUM, CC_I, - CC_HEATING, CC_HEAVY, CC_NAPHTHA; + FC_I_NAPHTHA, FC_GAS_PETROLEUM, FC_DIESEL_KEROSENE, FC_KEROSENE_PETROLEUM, CC_OIL, + CC_I, CC_HEATING, CC_HEAVY, CC_NAPHTHA, ASPHALT, COOLANT, DESH, PEROXIDE, CIRCUIT_4, + CIRCUIT_5; public static EnumChemistryTemplate getEnum(int i) { if(i < EnumChemistryTemplate.values().length) @@ -99,6 +100,8 @@ public class ItemChemistryTemplate extends Item { return 150; case FC_KEROSENE_PETROLEUM: return 150; + case CC_OIL: + return 150; case CC_I: return 200; case CC_HEATING: @@ -107,6 +110,18 @@ public class ItemChemistryTemplate extends Item { return 200; case CC_NAPHTHA: return 300; + case ASPHALT: + return 100; + case COOLANT: + return 50; + case DESH: + return 300; + case PEROXIDE: + return 50; + case CIRCUIT_4: + return 200; + case CIRCUIT_5: + return 250; default: return 100; } diff --git a/com/hbm/items/tool/ItemFluidIcon.java b/com/hbm/items/tool/ItemFluidIcon.java new file mode 100644 index 000000000..4051a0e58 --- /dev/null +++ b/com/hbm/items/tool/ItemFluidIcon.java @@ -0,0 +1,92 @@ +package com.hbm.items.tool; + +import java.util.List; +import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.items.tool.ItemChemistryTemplate.EnumChemistryTemplate; +import com.hbm.tileentity.TileEntityFluidDuct; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.client.resources.I18n; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; + +public class ItemFluidIcon extends Item { + + IIcon overlayIcon; + + public ItemFluidIcon() + { + this.setHasSubtypes(true); + this.setMaxDamage(0); + } + + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs tabs, List list) + { + for (int i = 0; i < FluidType.values().length; ++i) + { + list.add(new ItemStack(item, 1, i)); + } + } + + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) + { + super.addInformation(stack, player, list, bool); + } + + public String getItemStackDisplayName(ItemStack stack) + { + String s = (I18n.format(FluidType.getEnum(stack.getItemDamage()).getUnlocalizedName())).trim(); + + if (s != null) + { + return s; + } + + return "Unknown"; + } + + /* + * @Override + * + * @SideOnly(Side.CLIENT) public boolean requiresMultipleRenderPasses() { + * return true; } + * + * @Override + * + * @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister + * p_94581_1_) { super.registerIcons(p_94581_1_); + * + * this.overlayIcon = + * p_94581_1_.registerIcon("hbm:fluid_identifier_overlay"); } + * + * @Override + * + * @SideOnly(Side.CLIENT) public IIcon getIconFromDamageForRenderPass(int + * p_77618_1_, int p_77618_2_) { return p_77618_2_ == 1 ? this.overlayIcon : + * super.getIconFromDamageForRenderPass(p_77618_1_, p_77618_2_); } + */ + + @Override + @SideOnly(Side.CLIENT) + public int getColorFromItemStack(ItemStack stack, int p_82790_2_) { + int j = FluidType.getEnum(stack.getItemDamage()).getMSAColor(); + + if (j < 0) { + j = 16777215; + } + + return j; + } + +} diff --git a/com/hbm/main/ClientProxy.java b/com/hbm/main/ClientProxy.java index d8082a6c6..4eb1c6eed 100644 --- a/com/hbm/main/ClientProxy.java +++ b/com/hbm/main/ClientProxy.java @@ -179,6 +179,7 @@ import com.hbm.render.tileentity.RenderCyclotron; import com.hbm.render.tileentity.RenderDecoBlock; import com.hbm.render.tileentity.RenderDecoBlockAlt; import com.hbm.render.tileentity.RenderDerrick; +import com.hbm.render.tileentity.RenderFlamerTurret; import com.hbm.render.tileentity.RenderFluidDuct; import com.hbm.render.tileentity.RenderFluidTank; import com.hbm.render.tileentity.RenderGasDuct; @@ -208,6 +209,7 @@ import com.hbm.render.tileentity.RenderRotationTester; import com.hbm.render.tileentity.RenderSteelPoles; import com.hbm.render.tileentity.RenderStructureMaker; import com.hbm.render.tileentity.RenderTapeRecorder; +import com.hbm.render.tileentity.RenderTauTurret; import com.hbm.render.tileentity.RenderTestBombAdvanced; import com.hbm.render.tileentity.RenderTestContainer; import com.hbm.render.tileentity.RenderTestMissile; @@ -259,9 +261,11 @@ import com.hbm.tileentity.TileEntityStructureMarker; import com.hbm.tileentity.TileEntityTestBombAdvanced; import com.hbm.tileentity.TileEntityTestContainer; import com.hbm.tileentity.TileEntityTestRender; +import com.hbm.tileentity.TileEntityTurretFlamer; import com.hbm.tileentity.TileEntityTurretHeavy; import com.hbm.tileentity.TileEntityTurretLight; import com.hbm.tileentity.TileEntityTurretRocket; +import com.hbm.tileentity.TileEntityTurretTau; import com.hbm.tileentity.TileEntityYellowBarrel; import cpw.mods.fml.client.registry.ClientRegistry; @@ -308,6 +312,8 @@ public class ClientProxy extends ServerProxy ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTurretHeavy.class, new RenderHeavyTurret()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTurretRocket.class, new RenderRocketTurret()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTurretLight.class, new RenderLightTurret()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTurretFlamer.class, new RenderFlamerTurret()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTurretTau.class, new RenderTauTurret()); //RenderingRegistry.registerEntityRenderingHandler(EntityRocket.class, new RenderRocket()); RenderingRegistry.registerEntityRenderingHandler(EntityRocket.class, new RenderSnowball(ModItems.man_core)); diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index 86b9b3d0a..efaa9bdfa 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -195,9 +195,11 @@ import com.hbm.tileentity.TileEntityTestBombAdvanced; import com.hbm.tileentity.TileEntityTestContainer; import com.hbm.tileentity.TileEntityTestNuke; import com.hbm.tileentity.TileEntityTestRender; +import com.hbm.tileentity.TileEntityTurretFlamer; import com.hbm.tileentity.TileEntityTurretHeavy; import com.hbm.tileentity.TileEntityTurretLight; import com.hbm.tileentity.TileEntityTurretRocket; +import com.hbm.tileentity.TileEntityTurretTau; import com.hbm.tileentity.TileEntityWatzCore; import com.hbm.tileentity.TileEntityWireCoated; import com.hbm.tileentity.TileEntityYellowBarrel; @@ -479,6 +481,8 @@ public class MainRegistry GameRegistry.registerTileEntity(TileEntityTurretHeavy.class, "tileentity_turret_heavy"); GameRegistry.registerTileEntity(TileEntityTurretRocket.class, "tileentity_turret_rocket"); GameRegistry.registerTileEntity(TileEntityTurretLight.class, "tileentity_turret_light"); + GameRegistry.registerTileEntity(TileEntityTurretFlamer.class, "tileentity_turret_flamer"); + GameRegistry.registerTileEntity(TileEntityTurretTau.class, "tileentity_turret_tau"); EntityRegistry.registerModEntity(EntityRocket.class, "entity_rocket", 0, this, 250, 1, true); EntityRegistry.registerModEntity(EntityNukeExplosion.class, "entity_nuke_explosion", 1, this, 250, 1, true); @@ -812,6 +816,7 @@ public class MainRegistry FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(Items.water_bucket), new ItemStack(Items.bucket), FluidType.WATER, 1000)); FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(Items.lava_bucket), new ItemStack(Items.bucket), FluidType.LAVA, 1000)); + FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.bucket_mud), new ItemStack(Items.bucket), FluidType.WATZ, 1000)); FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.rod_water), new ItemStack(ModItems.rod_empty), FluidType.WATER, 1000)); FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.rod_dual_water), new ItemStack(ModItems.rod_dual_empty), FluidType.WATER, 2000)); diff --git a/com/hbm/main/ResourceManager.java b/com/hbm/main/ResourceManager.java index 77458b696..42065ba4c 100644 --- a/com/hbm/main/ResourceManager.java +++ b/com/hbm/main/ResourceManager.java @@ -13,9 +13,11 @@ public class ResourceManager { //Turrets public static final IModelCustom turret_heavy_base = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/turret_heavy_base.obj")); public static final IModelCustom turret_heavy_rotor = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/turret_heavy_rotor.obj")); + public static final IModelCustom turret_heavy_gun = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/turret_heavy_gun.obj")); - public static final IModelCustom turret_rocket_gun = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/turret_rocket_gun.obj")); public static final IModelCustom turret_light_gun = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/turret_light_gun.obj")); + public static final IModelCustom turret_flamer_gun = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/turret_flamer_gun.obj")); + public static final IModelCustom turret_tau_gun = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/turret_tau_gun.obj")); } diff --git a/com/hbm/render/tileentity/RenderFlamerTurret.java b/com/hbm/render/tileentity/RenderFlamerTurret.java new file mode 100644 index 000000000..f58c4ff4a --- /dev/null +++ b/com/hbm/render/tileentity/RenderFlamerTurret.java @@ -0,0 +1,77 @@ +package com.hbm.render.tileentity; + +import org.lwjgl.opengl.GL11; + +import com.hbm.lib.RefStrings; +import com.hbm.main.ResourceManager; +import com.hbm.tileentity.TileEntityTurretBase; + +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; + +public class RenderFlamerTurret extends TileEntitySpecialRenderer { + + public RenderFlamerTurret() { } + private ResourceLocation gadgetTexture = new ResourceLocation(RefStrings.MODID, "textures/models/TheGadget3_.png"); + + @Override + public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f) + { + GL11.glPushMatrix(); + GL11.glTranslated(x + 0.5D, y, z + 0.5D); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_CULL_FACE); + GL11.glRotatef(180, 0F, 1F, 0F); + + double yaw = 0; + double pitch = 0; + + if(tileEntity instanceof TileEntityTurretBase) { + yaw = ((TileEntityTurretBase)tileEntity).rotationYaw; + pitch = ((TileEntityTurretBase)tileEntity).rotationPitch; + } + + this.bindTexture(gadgetTexture); + ResourceManager.turret_heavy_base.renderAll(); + + GL11.glPopMatrix(); + + renderTileEntityAt2(tileEntity, x, y, z, f, yaw, pitch); + } + + public void renderTileEntityAt2(TileEntity tileEntity, double x, double y, double z, float f, double yaw, double pitch) + { + GL11.glPushMatrix(); + GL11.glTranslated(x + 0.5D, y, z + 0.5D); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_CULL_FACE); + GL11.glRotatef(180, 0F, 1F, 0F); + + GL11.glRotated(yaw + 180, 0F, -1F, 0F); + + this.bindTexture(gadgetTexture); + ResourceManager.turret_heavy_rotor.renderAll(); + + GL11.glPopMatrix(); + + renderTileEntityAt3(tileEntity, x, y, z, f, yaw, pitch); + } + + public void renderTileEntityAt3(TileEntity tileEntity, double x, double y, double z, float f, double yaw, double pitch) + { + GL11.glPushMatrix(); + GL11.glTranslated(x + 0.5D, y + 1, z + 0.5D); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_CULL_FACE); + GL11.glRotatef(180, 0F, 1F, 0F); + + GL11.glRotated(yaw + 180, 0F, -1F, 0F); + GL11.glRotated(pitch, 1F, 0F, 0F); + + this.bindTexture(gadgetTexture); + ResourceManager.turret_flamer_gun.renderAll(); + + GL11.glPopMatrix(); + } +} diff --git a/com/hbm/render/tileentity/RenderTauTurret.java b/com/hbm/render/tileentity/RenderTauTurret.java new file mode 100644 index 000000000..dc87a1a4c --- /dev/null +++ b/com/hbm/render/tileentity/RenderTauTurret.java @@ -0,0 +1,77 @@ +package com.hbm.render.tileentity; + +import org.lwjgl.opengl.GL11; + +import com.hbm.lib.RefStrings; +import com.hbm.main.ResourceManager; +import com.hbm.tileentity.TileEntityTurretBase; + +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; + +public class RenderTauTurret extends TileEntitySpecialRenderer { + + public RenderTauTurret() { } + private ResourceLocation gadgetTexture = new ResourceLocation(RefStrings.MODID, "textures/models/TheGadget3_.png"); + + @Override + public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f) + { + GL11.glPushMatrix(); + GL11.glTranslated(x + 0.5D, y, z + 0.5D); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_CULL_FACE); + GL11.glRotatef(180, 0F, 1F, 0F); + + double yaw = 0; + double pitch = 0; + + if(tileEntity instanceof TileEntityTurretBase) { + yaw = ((TileEntityTurretBase)tileEntity).rotationYaw; + pitch = ((TileEntityTurretBase)tileEntity).rotationPitch; + } + + this.bindTexture(gadgetTexture); + ResourceManager.turret_heavy_base.renderAll(); + + GL11.glPopMatrix(); + + renderTileEntityAt2(tileEntity, x, y, z, f, yaw, pitch); + } + + public void renderTileEntityAt2(TileEntity tileEntity, double x, double y, double z, float f, double yaw, double pitch) + { + GL11.glPushMatrix(); + GL11.glTranslated(x + 0.5D, y, z + 0.5D); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_CULL_FACE); + GL11.glRotatef(180, 0F, 1F, 0F); + + GL11.glRotated(yaw + 180, 0F, -1F, 0F); + + this.bindTexture(gadgetTexture); + ResourceManager.turret_heavy_rotor.renderAll(); + + GL11.glPopMatrix(); + + renderTileEntityAt3(tileEntity, x, y, z, f, yaw, pitch); + } + + public void renderTileEntityAt3(TileEntity tileEntity, double x, double y, double z, float f, double yaw, double pitch) + { + GL11.glPushMatrix(); + GL11.glTranslated(x + 0.5D, y + 1, z + 0.5D); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_CULL_FACE); + GL11.glRotatef(180, 0F, 1F, 0F); + + GL11.glRotated(yaw + 180, 0F, -1F, 0F); + GL11.glRotated(pitch, 1F, 0F, 0F); + + this.bindTexture(gadgetTexture); + ResourceManager.turret_tau_gun.renderAll(); + + GL11.glPopMatrix(); + } +} diff --git a/com/hbm/tileentity/TileEntityMachineChemplant.java b/com/hbm/tileentity/TileEntityMachineChemplant.java index dddbbfcda..7c96be03f 100644 --- a/com/hbm/tileentity/TileEntityMachineChemplant.java +++ b/com/hbm/tileentity/TileEntityMachineChemplant.java @@ -485,10 +485,10 @@ public class TileEntityMachineChemplant extends TileEntity implements ISidedInve if(sta7 != null) sta7.stackSize = 1; - if(slots[5] == null || stacks[0] == null || (stacks[0] != null && ItemStack.areItemStacksEqual(sta0, sta1) && ItemStack.areItemStackTagsEqual(sta0, sta1) && slots[5].stackSize + stacks[0].stackSize <= slots[5].getMaxStackSize()) && - slots[6] == null || stacks[1] == null || (stacks[1] != null && ItemStack.areItemStacksEqual(sta2, sta3) && ItemStack.areItemStackTagsEqual(sta2, sta3) && slots[6].stackSize + stacks[1].stackSize <= slots[6].getMaxStackSize()) && - slots[7] == null || stacks[2] == null || (stacks[2] != null && ItemStack.areItemStacksEqual(sta4, sta5) && ItemStack.areItemStackTagsEqual(sta4, sta5) && slots[7].stackSize + stacks[2].stackSize <= slots[7].getMaxStackSize()) && - slots[8] == null || stacks[3] == null || (stacks[3] != null && ItemStack.areItemStacksEqual(sta6, sta7) && ItemStack.areItemStackTagsEqual(sta6, sta7) && slots[8].stackSize + stacks[3].stackSize <= slots[8].getMaxStackSize())) + if((slots[5] == null || stacks[0] == null || (stacks[0] != null && ItemStack.areItemStacksEqual(sta0, sta1) && ItemStack.areItemStackTagsEqual(sta0, sta1) && slots[5].stackSize + stacks[0].stackSize <= slots[5].getMaxStackSize())) && + (slots[6] == null || stacks[1] == null || (stacks[1] != null && ItemStack.areItemStacksEqual(sta2, sta3) && ItemStack.areItemStackTagsEqual(sta2, sta3) && slots[6].stackSize + stacks[1].stackSize <= slots[6].getMaxStackSize())) && + (slots[7] == null || stacks[2] == null || (stacks[2] != null && ItemStack.areItemStacksEqual(sta4, sta5) && ItemStack.areItemStackTagsEqual(sta4, sta5) && slots[7].stackSize + stacks[2].stackSize <= slots[7].getMaxStackSize())) && + (slots[8] == null || stacks[3] == null || (stacks[3] != null && ItemStack.areItemStacksEqual(sta6, sta7) && ItemStack.areItemStackTagsEqual(sta6, sta7) && slots[8].stackSize + stacks[3].stackSize <= slots[8].getMaxStackSize()))) return true; return false; diff --git a/com/hbm/tileentity/TileEntityTurretFlamer.java b/com/hbm/tileentity/TileEntityTurretFlamer.java new file mode 100644 index 000000000..013f055a3 --- /dev/null +++ b/com/hbm/tileentity/TileEntityTurretFlamer.java @@ -0,0 +1,10 @@ +package com.hbm.tileentity; + +import com.hbm.entity.particle.EntityGasFlameFX; + +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Vec3; + +public class TileEntityTurretFlamer extends TileEntityTurretBase { + +} diff --git a/com/hbm/tileentity/TileEntityTurretTau.java b/com/hbm/tileentity/TileEntityTurretTau.java new file mode 100644 index 000000000..6b86c96aa --- /dev/null +++ b/com/hbm/tileentity/TileEntityTurretTau.java @@ -0,0 +1,7 @@ +package com.hbm.tileentity; + +import net.minecraft.tileentity.TileEntity; + +public class TileEntityTurretTau extends TileEntityTurretBase { + +}