diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index c72f2f857..6068eb60e 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -1469,13 +1469,16 @@ item.ammo_20gauge_wither.name=Kaliber 20 Schrot (Wither) item.ammo_5mm.name=5mm Patrone item.ammo_5mm_explosive.name=5mm Patrone (Explosiv) item.ammo_5mm_du.name=5mm Patrone (DU) +item.ammo_5mm_star.name=5mm Patrone (Sternenmetall) item.ammo_50ae.name=.50 AE Patrone item.ammo_50ae_ap.name=.50 AE Patrone (Panzerbrechend) item.ammo_50ae_du.name=.50 AE Patrone (DU) +item.ammo_50ae_star.name=.50 AE Patrone (Sternenmetall) item.ammo_50bmg.name=.50 BMG Patrone item.ammo_50bmg_incendiary.name=.50 BMG Patrone (Brand) item.ammo_50bmg_explosive.name=.50 BMG Patrone (Explosiv) item.ammo_50bmg_du.name=.50 BMG Patrone (DU) +item.ammo_50bmg_star.name=.50 BMG Patrone (Sternenmetall) item.ammo_9mm.name=9mm Patrone item.ammo_9mm_ap.name=9mm Patrone (Panzerbrechend) item.ammo_9mm_du.name=9mm Patrone (DU) @@ -1489,6 +1492,7 @@ item.ammo_357_desh.name=.357 Magnum Deshkugel item.ammo_44.name=.44 Magnum Patrone item.ammo_44_ap.name=.44 Magnum Patrone (Panzerbrechend) item.ammo_44_du.name=.44 Magnum Patrone (DU) +item.ammo_44_star.name=.44 Magnum Patrone (Sternenmetall) item.ammo_44_pip.name=.44 Magnum Patrone (Güterwagon) item.ammo_44_bj.name=.44 Magnum Patrone (Boot) item.ammo_44_rocket.name=.44 Magnum Rakete @@ -2286,7 +2290,7 @@ item.letter.name=Eilbrief item.polaroid.name=Das Polaroid item.glitch.name=Glitch item.book_secret.name=3-596-50802-9 -item.book_of_.name=Das Buch der +item.book_of_.name=Das Buch der Güterwaggons item.burnt_bark.name=Verbrannte Rinde item.loot_10.name=Größe 10 Raketen-Lootbox diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 820d49f4b..f744d2ce6 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -1469,13 +1469,16 @@ item.ammo_20gauge_wither.name=20 Gauge Buckshot (Withering) item.ammo_5mm.name=5mm Round item.ammo_5mm_explosive.name=5mm Round (Explosive) item.ammo_5mm_du.name=5mm Round (DU) +item.ammo_5mm_star.name=5mm Round (Starmetal) item.ammo_50ae.name=.50 AE Round item.ammo_50ae_ap.name=.50 AE Round (Armor Piercing) item.ammo_50ae_du.name=.50 AE Round (DU) +item.ammo_50ae_star.name=.50 AE Round (Starmetal) item.ammo_50bmg.name=.50 BMG Round item.ammo_50bmg_incendiary.name=.50 BMG Round (Incendiary) item.ammo_50bmg_explosive.name=.50 BMG Round (Explosive) item.ammo_50bmg_du.name=.50 BMG Round (DU) +item.ammo_50bmg_star.name=.50 BMG Round (Starmetal) item.ammo_9mm.name=9mm Round item.ammo_9mm_ap.name=9mm Round (Armor Piercing) item.ammo_9mm_du.name=9mm Round (DU) @@ -1489,6 +1492,7 @@ item.ammo_357_desh.name=.357 Magnum Desh Bullet item.ammo_44.name=.44 Magnum Bullet item.ammo_44_ap.name=.44 Magnum Bullet (Armor Piercing) item.ammo_44_du.name=.44 Magnum Bullet (DU) +item.ammo_44_star.name=.44 Magnum Bullet (Starmetal) item.ammo_44_pip.name=.44 Magnum Bullet (Boxcar) item.ammo_44_bj.name=.44 Magnum Bullet (Boat) item.ammo_44_rocket.name=.44 Magnum Rocket @@ -2286,7 +2290,7 @@ item.letter.name=Express Mail item.polaroid.name=The Polaroid item.glitch.name=Glitch item.book_secret.name=3-596-50802-9 -item.book_of_.name=The Book of +item.book_of_.name=The Book of Boxcars item.burnt_bark.name=Burnt Bark item.loot_10.name=Size 10 Missile Loot Crate diff --git a/assets/hbm/models/weapons/deagle.obj b/assets/hbm/models/weapons/deagle.obj new file mode 100644 index 000000000..56f4297f8 --- /dev/null +++ b/assets/hbm/models/weapons/deagle.obj @@ -0,0 +1,2213 @@ +# Blender v2.76 (sub 0) OBJ File: '' +# www.blender.org +o Cylinder.005_Cylinder.042 +v -0.109711 0.225768 -1.599982 +v -0.109711 0.454809 -1.689450 +v 0.109711 0.225768 -1.599982 +v -0.109711 0.423462 -1.505400 +v -0.109711 0.621156 -1.410818 +v -0.109711 0.544724 -1.667087 +v 0.109711 0.423462 -1.505400 +v 0.109711 0.621156 -1.410818 +v 0.109711 0.544724 -1.667087 +v 0.109711 0.454809 -1.689450 +v 0.109711 0.634639 -1.644725 +v 0.109711 0.662526 -1.780998 +v 0.109711 0.632528 -1.796514 +v 0.109711 0.674518 -1.746657 +v -0.109711 0.662526 -1.780998 +v -0.109711 0.632528 -1.796514 +v -0.109711 0.674518 -1.746657 +v -0.109711 0.634639 -1.644725 +v 0.000000 0.851168 0.003579 +v 0.091507 0.835033 0.003579 +v 0.000000 0.851168 0.638677 +v -0.091507 0.835033 0.003579 +v -0.171977 0.788573 0.003579 +v -0.091507 0.835033 0.638677 +v -0.171977 0.790610 0.653952 +v 0.091507 0.835033 0.638677 +v 0.171977 0.790610 0.653952 +v 0.171977 0.788574 0.003579 +v 0.231704 0.725540 0.678187 +v 0.231704 0.717394 0.003579 +v 0.263484 0.650445 0.713829 +v -0.231704 0.725540 0.678187 +v -0.263484 0.650445 0.713829 +v -0.231704 0.717393 0.003579 +v -0.263484 0.630078 0.003579 +v -0.263484 0.537160 0.003579 +v -0.231704 0.449844 0.003579 +v -0.263484 0.582984 0.751507 +v -0.231704 0.509926 0.816679 +v 0.263484 0.582984 0.751507 +v 0.263484 0.537160 0.003579 +v 0.231704 0.509926 0.816679 +v 0.231704 0.449844 0.003579 +v 0.171977 0.459112 0.922585 +v 0.171977 0.378665 0.003579 +v 0.091507 0.412653 0.922585 +v -0.171977 0.459112 0.922585 +v -0.091507 0.412653 0.922585 +v -0.171977 0.378664 0.003579 +v -0.091507 0.332205 0.003579 +v 0.000000 0.316070 0.003579 +v 0.091507 0.332205 0.003579 +v 0.000000 0.316070 0.538677 +v 0.263484 0.630078 0.003579 +v -0.256097 0.393645 2.813138 +v -0.256097 0.394229 2.302340 +v 0.256097 0.393645 2.813138 +v -0.247427 0.477817 2.847726 +v -0.200569 0.110690 2.700910 +v -0.200569 0.117608 2.308361 +v 0.200569 0.110690 2.700910 +v -0.155010 0.069582 2.700185 +v -0.077784 0.028475 2.699461 +v -0.155010 0.076501 2.307636 +v 0.155010 0.069582 2.700185 +v 0.077784 0.028475 2.699461 +v 0.155010 0.076501 2.307636 +v 0.077784 0.035393 2.306912 +v 0.200569 0.117608 2.308361 +v 0.256097 0.394229 2.302340 +v 0.256097 0.396179 0.596178 +v 0.247427 0.479449 2.328658 +v 0.247427 0.477817 2.847726 +v 0.247427 0.484899 0.594871 +v 0.223196 0.748473 2.314847 +v 0.223196 0.753144 2.830875 +v 0.223196 0.732872 0.591215 +v 0.144839 0.783886 2.314526 +v 0.144839 0.788557 2.830554 +v 0.144839 0.768285 0.590894 +v 0.144839 0.799085 2.313976 +v 0.144839 0.803755 2.830004 +v 0.144839 0.783484 0.590344 +v 0.166263 0.826504 2.313728 +v 0.166263 0.831174 2.829756 +v 0.166263 0.810903 0.590096 +v 0.166263 0.864471 2.313384 +v 0.166263 0.869142 2.829412 +v 0.166263 0.848870 0.589752 +v -0.166263 0.864471 2.313384 +v -0.166263 0.848870 0.589752 +v -0.166263 0.869142 2.829412 +v -0.166263 0.826504 2.313728 +v -0.166263 0.810903 0.590096 +v -0.166263 0.831174 2.829756 +v -0.144839 0.799085 2.313976 +v -0.144839 0.783886 2.314526 +v -0.144839 0.783484 0.590344 +v -0.144839 0.803755 2.830004 +v -0.144839 0.788557 2.830554 +v -0.223196 0.753144 2.830875 +v -0.223196 0.748473 2.314847 +v -0.223196 0.732872 0.591215 +v -0.247427 0.479449 2.328658 +v -0.247427 0.484899 0.594871 +v -0.256097 0.396179 0.596178 +v -0.144839 0.768285 0.590894 +v -0.166263 0.805472 -0.009880 +v 0.166263 0.805472 -0.009880 +v -0.166263 0.843440 -0.010223 +v 0.166263 0.843440 -0.010223 +v -0.077784 0.035393 2.306912 +v 0.237206 0.073140 -1.706179 +v 0.237206 0.026845 -1.937500 +v 0.237206 0.095699 -0.284299 +v 0.237206 -0.024013 -1.755874 +v 0.237206 -0.030227 -1.987212 +v 0.164659 -0.094732 -1.686827 +v 0.237206 -0.222860 -1.362254 +v 0.237206 -0.208553 -0.334540 +v 0.164659 -0.214674 -0.261820 +v 0.237206 -0.415199 -0.375721 +v 0.237206 -0.500743 -0.315807 +v 0.164659 -0.429076 -0.304546 +v 0.194589 -0.472976 -0.265565 +v 0.164659 0.094767 -0.210592 +v 0.124185 -0.545500 -0.201169 +v 0.124185 -0.584470 -0.082052 +v 0.124185 -0.571518 0.337890 +v 0.124185 -0.444468 0.397614 +v 0.124185 -0.244742 0.385670 +v 0.124185 -0.085255 0.230188 +v 0.124185 -0.117733 -0.118302 +v 0.124185 -0.279252 -0.449195 +v 0.124185 0.002443 -0.475447 +v 0.124185 0.163961 -0.144554 +v 0.124185 0.196439 0.203936 +v 0.124185 0.192102 0.768345 +v 0.124185 0.213945 2.526602 +v 0.124185 0.029418 2.528959 +v 0.099018 0.008483 0.786776 +v 0.124185 0.008785 0.811941 +v 0.124185 0.002699 0.752432 +v 0.099018 -0.240762 0.502620 +v 0.124185 -0.241730 0.474184 +v 0.099018 -0.440488 0.475154 +v 0.124185 -0.441939 0.446899 +v 0.099018 -0.567538 0.466930 +v 0.099018 -0.636476 0.514297 +v 0.124185 -0.613768 0.469834 +v 0.099018 -0.642981 0.368143 +v 0.124185 -0.618771 0.357894 +v 0.099018 -0.664150 -0.107494 +v 0.124185 -0.639191 -0.099525 +v 0.099018 -0.615610 -0.246783 +v 0.164659 -0.719357 -0.350159 +v 0.192885 -0.678672 -0.309620 +v 0.237206 -0.707811 -0.436228 +v 0.164659 -1.562335 -0.529561 +v 0.237206 -1.542649 -0.614472 +v 0.164659 -1.754606 -0.453545 +v 0.237206 -1.742931 -0.536751 +v 0.164659 -1.811685 -0.596396 +v 0.164659 -1.801592 -1.625142 +v 0.237206 -1.802282 -1.554775 +v 0.164659 -1.575586 -1.729347 +v 0.237206 -1.586036 -1.654873 +v 0.164659 -1.290624 -1.701541 +v 0.237206 -1.307623 -1.628219 +v 0.164659 -0.579543 -1.392388 +v 0.164659 -0.393285 -1.366627 +v 0.237206 -0.361413 -1.285084 +v 0.164659 -0.200945 -1.474656 +v 0.237206 -0.589723 -1.316506 +v 0.164659 -0.104538 -2.051939 +v 0.237206 -1.810578 -0.709247 +v 0.237206 -0.647689 -0.338898 +v 0.139561 -0.629724 -0.260846 +v 0.124185 -0.593034 -0.232095 +v 0.124185 -0.568408 0.438734 +v 0.124185 0.033524 0.784262 +v -0.237206 0.073140 -1.706179 +v 0.000000 0.073140 -1.706179 +v -0.237206 0.026845 -1.937500 +v -0.237206 0.095699 -0.284299 +v -0.237206 -0.024013 -1.755874 +v -0.237206 -0.030227 -1.987212 +v -0.164659 -0.094732 -1.686827 +v -0.237206 -0.222860 -1.362254 +v -0.237206 -0.208553 -0.334540 +v -0.164659 -0.214674 -0.261820 +v -0.237206 -0.415199 -0.375721 +v -0.237206 -0.500743 -0.315807 +v -0.164659 -0.429076 -0.304546 +v -0.194589 -0.472976 -0.265565 +v 0.000000 -0.429076 -0.304546 +v 0.000000 -0.545500 -0.201169 +v 0.000000 -0.214674 -0.261820 +v 0.000000 0.094767 -0.210592 +v -0.164659 0.094767 -0.210592 +v -0.124185 -0.545500 -0.201169 +v 0.000000 -0.584470 -0.082052 +v -0.124185 -0.584470 -0.082052 +v 0.000000 -0.571518 0.337890 +v -0.124185 -0.571518 0.337890 +v 0.000000 -0.444468 0.397614 +v -0.124185 -0.444468 0.397614 +v 0.000000 -0.244742 0.385670 +v -0.124185 -0.244742 0.385670 +v 0.000000 -0.085255 0.230188 +v -0.124185 -0.085255 0.230188 +v 0.000000 -0.117733 -0.118302 +v -0.124185 -0.117733 -0.118302 +v 0.000000 -0.279252 -0.449195 +v -0.124185 -0.279252 -0.449195 +v 0.000000 0.002443 -0.475447 +v -0.124185 0.002443 -0.475447 +v 0.000000 0.163961 -0.144554 +v -0.124185 0.163961 -0.144554 +v 0.000000 0.196439 0.203936 +v -0.124185 0.196439 0.203936 +v 0.000000 0.192102 0.768345 +v -0.124185 0.192102 0.768345 +v 0.000000 0.213945 2.526602 +v -0.124185 0.213945 2.526602 +v 0.000000 0.029418 2.528959 +v -0.124185 0.029418 2.528959 +v 0.000000 0.008483 0.786776 +v 0.000000 -0.240762 0.502620 +v -0.099018 0.008483 0.786776 +v -0.124185 0.008785 0.811941 +v -0.124185 0.002699 0.752432 +v -0.099018 -0.240762 0.502620 +v -0.124185 -0.241730 0.474184 +v -0.099018 -0.440488 0.475154 +v -0.124185 -0.441939 0.446899 +v -0.099018 -0.567538 0.466930 +v 0.000000 -0.440488 0.475154 +v 0.000000 -0.567538 0.466930 +v 0.000000 -0.636476 0.514297 +v 0.000000 -0.642981 0.368143 +v -0.099018 -0.636476 0.514297 +v -0.124185 -0.613768 0.469834 +v -0.099018 -0.642981 0.368143 +v -0.124185 -0.618771 0.357894 +v -0.099018 -0.664150 -0.107494 +v -0.124185 -0.639191 -0.099525 +v -0.099018 -0.615610 -0.246783 +v 0.000000 -0.664150 -0.107494 +v 0.000000 -0.615610 -0.246783 +v 0.000000 -0.719357 -0.350159 +v 0.000000 -1.562335 -0.529561 +v -0.164659 -0.719357 -0.350159 +v -0.192885 -0.678672 -0.309620 +v -0.237206 -0.707811 -0.436228 +v -0.164659 -1.562335 -0.529561 +v -0.237206 -1.542649 -0.614472 +v -0.164659 -1.754606 -0.453545 +v -0.237206 -1.742931 -0.536751 +v -0.164659 -1.811685 -0.596396 +v 0.000000 -1.754606 -0.453545 +v 0.000000 -1.811685 -0.596396 +v 0.000000 -1.801592 -1.625142 +v 0.000000 -1.575586 -1.729347 +v -0.164659 -1.801592 -1.625142 +v -0.237206 -1.802282 -1.554775 +v -0.164659 -1.575586 -1.729347 +v -0.237206 -1.586036 -1.654873 +v -0.164659 -1.290624 -1.701541 +v -0.237206 -1.307623 -1.628219 +v -0.164659 -0.579543 -1.392388 +v 0.000000 -1.290624 -1.701541 +v 0.000000 -0.579543 -1.392388 +v 0.000000 -0.393285 -1.366627 +v 0.000000 -0.200945 -1.474656 +v -0.164659 -0.393285 -1.366627 +v -0.237206 -0.361413 -1.285084 +v -0.164659 -0.200945 -1.474656 +v -0.237206 -0.589723 -1.316506 +v 0.000000 -0.094732 -1.686827 +v 0.000000 -0.104538 -2.051939 +v 0.000000 0.026845 -1.937500 +v -0.164659 -0.104538 -2.051939 +v -0.237206 -1.810578 -0.709247 +v -0.237206 -0.647689 -0.338898 +v -0.139561 -0.629724 -0.260846 +v -0.124185 -0.593034 -0.232095 +v -0.124185 -0.568408 0.438734 +v -0.124185 0.033524 0.784262 +v -0.081156 -0.221353 -0.085255 +v -0.081156 -0.221353 -0.206952 +v -0.081156 -0.059041 -0.050284 +v 0.081156 -0.221353 -0.085255 +v -0.081156 -0.367992 -0.064726 +v -0.081156 -0.367992 -0.186423 +v 0.081156 -0.367992 -0.064726 +v -0.081156 -0.514630 0.009986 +v -0.081156 -0.514630 -0.049976 +v 0.081156 -0.514630 0.009986 +v 0.081156 -0.514630 -0.049976 +v 0.081156 -0.367992 -0.186423 +v 0.081156 -0.221353 -0.206952 +v 0.081156 -0.059041 -0.212596 +v -0.081156 -0.059041 -0.212596 +v 0.081156 -0.059041 -0.050284 +v -0.000000 0.754362 2.557954 +v -0.000000 0.725395 2.557955 +v 0.052795 0.745053 2.557954 +v 0.042888 0.717833 2.557955 +v 0.099222 0.718249 2.557955 +v 0.080602 0.696059 2.557955 +v 0.133681 0.677181 2.557955 +v 0.108595 0.662698 2.557955 +v 0.152017 0.626805 2.557955 +v 0.123490 0.621775 2.557955 +v 0.152017 0.573196 2.557955 +v 0.123490 0.578226 2.557955 +v 0.133681 0.522820 2.557955 +v 0.108595 0.537303 2.557955 +v 0.099222 0.481753 2.557955 +v 0.080602 0.503943 2.557955 +v 0.052795 0.454948 2.557955 +v 0.042888 0.482168 2.557955 +v -0.000000 0.445639 2.557955 +v -0.000000 0.474606 2.557955 +v -0.052795 0.454948 2.557955 +v -0.042888 0.482168 2.557955 +v -0.099222 0.481753 2.557955 +v -0.080602 0.503943 2.557955 +v -0.133681 0.522820 2.557955 +v -0.108595 0.537303 2.557955 +v -0.152017 0.573196 2.557955 +v -0.123490 0.578226 2.557955 +v -0.152017 0.626805 2.557955 +v -0.123490 0.621775 2.557955 +v -0.133681 0.677181 2.557955 +v -0.108595 0.662698 2.557955 +v -0.099222 0.718248 2.557955 +v -0.080602 0.696059 2.557955 +v -0.052795 0.745053 2.557954 +v -0.042888 0.717833 2.557955 +v 0.052795 0.745053 2.866678 +v -0.000000 0.754362 2.866678 +v 0.099222 0.718249 2.866678 +v 0.133681 0.677182 2.866678 +v 0.152017 0.626805 2.866678 +v 0.152017 0.573196 2.866678 +v 0.133681 0.522820 2.866678 +v 0.099222 0.481753 2.866678 +v 0.052795 0.454948 2.866678 +v -0.000000 0.445639 2.866678 +v -0.052795 0.454948 2.866678 +v -0.099222 0.481753 2.866678 +v -0.133681 0.522820 2.866678 +v -0.152017 0.573196 2.866678 +v -0.152017 0.626805 2.866678 +v -0.133681 0.677181 2.866678 +v -0.099222 0.718249 2.866678 +v -0.052795 0.745053 2.866678 +v 0.042888 0.717833 2.866678 +v -0.000000 0.725395 2.866678 +v 0.080602 0.696059 2.866678 +v 0.108595 0.662698 2.866678 +v 0.123490 0.621775 2.866678 +v 0.123490 0.578226 2.866678 +v 0.108595 0.537303 2.866678 +v 0.080602 0.503943 2.866678 +v 0.042888 0.482168 2.866678 +v -0.000000 0.474606 2.866678 +v -0.042888 0.482168 2.866678 +v -0.080602 0.503943 2.866678 +v -0.108595 0.537303 2.866678 +v -0.123490 0.578226 2.866678 +v -0.123490 0.621775 2.866678 +v -0.108595 0.662698 2.866678 +v -0.080602 0.696059 2.866678 +v -0.042888 0.717833 2.866678 +v 0.048367 0.898367 2.531633 +v 0.048367 0.958367 2.708366 +v 0.048367 0.881634 2.571633 +v -0.048367 0.898367 2.531633 +v -0.048367 0.958367 2.708366 +v -0.048367 0.881634 2.571633 +v -0.048367 0.881634 2.708366 +v -0.048367 0.851634 2.571633 +v -0.048367 0.851634 2.708366 +v 0.048367 0.851634 2.571633 +v 0.048367 0.851634 2.708366 +v 0.048367 0.881634 2.708366 +v 0.048367 0.885202 2.728366 +v 0.048367 0.934799 2.728366 +v -0.048367 0.885202 2.728366 +v -0.048367 0.934799 2.728366 +vt 0.500000 0.000000 +vt 0.500000 0.125000 +vt 0.375000 0.125000 +vt 0.375000 0.625000 +vt 0.375000 0.750000 +vt 0.125000 0.750000 +vt 0.500000 0.750000 +vt 0.500000 1.000000 +vt 0.375000 1.000000 +vt 0.625000 0.000000 +vt 0.625000 0.125000 +vt 0.625000 0.750000 +vt 0.625000 1.000000 +vt 0.500000 0.625000 +vt 0.625000 0.625000 +vt 0.375000 0.500000 +vt 0.500000 0.500000 +vt 0.625000 0.500000 +vt 0.500000 0.250000 +vt 0.625000 0.250000 +vt 0.375000 0.250000 +vt 0.875000 0.500000 +vt 0.875000 0.625000 +vt 0.875000 0.750000 +vt 0.125000 0.625000 +vt 0.957846 0.370000 +vt 0.513646 0.208324 +vt 0.542154 0.370000 +vt 1.000000 1.000000 +vt 0.944444 1.000000 +vt 0.944444 0.500000 +vt 0.055555 1.000000 +vt -0.000000 1.000000 +vt -0.000000 0.500000 +vt 0.111111 0.500000 +vt 0.111111 1.000000 +vt 0.888889 1.000000 +vt 0.888889 0.500000 +vt 0.833333 1.000000 +vt 0.833333 0.500000 +vt 0.166666 1.000000 +vt 0.777778 1.000000 +vt 0.777778 0.500000 +vt 0.222222 0.500000 +vt 0.222222 1.000000 +vt 0.166666 0.500000 +vt 0.277778 0.500000 +vt 0.277778 1.000000 +vt 0.333333 0.500000 +vt 0.333333 1.000000 +vt 0.722222 1.000000 +vt 0.722222 0.500000 +vt 0.666667 1.000000 +vt 0.666667 0.500000 +vt 0.611111 1.000000 +vt 0.611111 0.500000 +vt 0.388889 1.000000 +vt 0.555555 1.000000 +vt 0.444444 1.000000 +vt 0.388889 0.500000 +vt 0.444444 0.500000 +vt 0.555555 0.500000 +vt 0.375000 0.000000 +vt 0.440876 0.000000 +vt 0.440876 0.057601 +vt 0.375000 0.057601 +vt 0.440876 0.750000 +vt 0.440876 1.000000 +vt 0.375000 0.692399 +vt 0.125000 0.692399 +vt 0.440876 0.500000 +vt 0.440876 0.692399 +vt 0.625000 0.692399 +vt 0.875000 0.692399 +vt 0.625000 0.057601 +vt 0.440876 0.250000 +vt 0.750000 0.750000 +vt 0.663230 0.750000 +vt 0.625000 0.737679 +vt 0.750000 0.500000 +vt 0.604234 0.500000 +vt 0.608352 0.500000 +vt 0.586676 0.737242 +vt 0.586676 0.461770 +vt 0.599010 0.506053 +vt 0.566086 0.524015 +vt 0.566086 0.461770 +vt 0.566086 0.788230 +vt 0.566086 0.734793 +vt 0.586676 0.788230 +vt 0.566086 0.750000 +vt 0.542497 0.750000 +vt 0.532159 0.530792 +vt 0.470543 0.729355 +vt 0.566086 0.875000 +vt 0.586676 0.875000 +vt 0.625000 0.788230 +vt 0.625000 0.875000 +vt 0.566086 0.775332 +vt 0.470543 0.875000 +vt 0.470543 0.775332 +vt 0.503644 0.750000 +vt 0.502911 0.750000 +vt 0.501308 0.750000 +vt 0.470543 0.788230 +vt 0.470543 0.750000 +vt 0.422771 0.875000 +vt 0.470176 0.750000 +vt 0.494131 0.750000 +vt 0.422771 0.788230 +vt 0.422771 0.731887 +vt 0.375000 0.788230 +vt 0.375000 0.733695 +vt 0.375000 0.875000 +vt 0.375000 0.722576 +vt 0.375000 0.517100 +vt 0.250000 0.500000 +vt 0.375000 0.461770 +vt 0.375000 0.375000 +vt 0.375000 0.514594 +vt 0.422771 0.515641 +vt 0.422772 0.375000 +vt 0.422771 0.461770 +vt 0.470543 0.461770 +vt 0.470543 0.375000 +vt 0.518314 0.375000 +vt 0.518314 0.461770 +vt 0.566086 0.375000 +vt 0.470543 0.518202 +vt 0.586676 0.375000 +vt 0.625000 0.375000 +vt 0.500471 0.750000 +vt 0.250000 0.750000 +vt 0.081158 0.152519 +vt 0.316681 0.066795 +vt 0.442001 0.283855 +vt 0.595731 0.066149 +vt 0.316681 0.433205 +vt 0.332085 0.475526 +vt 0.250000 0.490000 +vt 0.375319 0.399350 +vt 0.404269 0.433851 +vt 0.418843 0.347481 +vt 0.457846 0.370000 +vt 0.486354 0.291676 +vt 0.442001 0.216145 +vt 0.486354 0.208324 +vt 0.418843 0.152519 +vt 0.457846 0.130000 +vt 0.375319 0.100650 +vt 0.404269 0.066149 +vt 0.332085 0.024474 +vt 0.250000 0.055037 +vt 0.250000 0.010000 +vt 0.183319 0.066795 +vt 0.167915 0.024474 +vt 0.124680 0.100650 +vt 0.095731 0.066149 +vt 0.042154 0.130000 +vt 0.057999 0.216145 +vt 0.013646 0.208324 +vt 0.057999 0.283855 +vt 0.013646 0.291675 +vt 0.081157 0.347481 +vt 0.042154 0.370000 +vt 0.124680 0.399350 +vt 0.095731 0.433851 +vt 0.183319 0.433205 +vt 0.167915 0.475526 +vt 0.250000 0.444963 +vt 0.125000 0.500000 +vt 0.667915 0.475526 +vt 0.750000 0.490000 +vt 0.832085 0.475526 +vt 0.904269 0.433851 +vt 0.986354 0.291676 +vt 0.986354 0.208324 +vt 0.957846 0.130000 +vt 0.904269 0.066149 +vt 0.832085 0.024474 +vt 0.750000 0.010000 +vt 0.667915 0.024474 +vt 0.542154 0.130000 +vt 0.513646 0.291675 +vt 0.595731 0.433851 +vt 1.000000 0.500000 +vt 0.055555 0.500000 +vt 0.602253 0.489575 +vt 0.336770 0.500000 +vt 0.336770 0.750000 +vn -1.000000 -0.000000 0.000000 +vn 0.000000 -0.441500 -0.897200 +vn 0.000000 -0.363800 -0.931500 +vn 0.000000 -0.431600 0.902100 +vn 1.000000 -0.000000 0.000000 +vn 0.000000 0.459400 -0.888200 +vn 0.000000 0.944100 -0.329700 +vn 0.000000 0.931300 0.364300 +vn 0.000000 0.976900 0.213600 +vn 0.000000 0.998300 0.057500 +vn 0.000000 -0.516000 -0.856600 +vn -0.000000 -0.000000 -1.000000 +vn -0.000000 1.000000 -0.000000 +vn 0.341800 0.939800 -0.001300 +vn 0.342000 0.939700 -0.000000 +vn -0.341800 0.939800 -0.001300 +vn -0.642300 0.766500 -0.001200 +vn -0.637400 0.770500 -0.005600 +vn -0.000000 0.344600 0.938800 +vn -0.000000 0.305800 0.952100 +vn 0.000000 0.000000 1.000000 +vn 0.637400 0.770500 -0.005600 +vn 0.642300 0.766500 -0.001200 +vn 0.862200 0.506400 -0.009700 +vn 0.865700 0.500600 -0.003400 +vn 0.000000 0.404600 0.914500 +vn 0.989600 0.143700 -0.004100 +vn 0.985000 0.172300 -0.002300 +vn -0.000000 0.462300 0.886700 +vn -0.985000 0.172300 -0.002300 +vn -0.989600 0.143700 -0.004100 +vn -0.862200 0.506400 -0.009700 +vn -0.865700 0.500600 -0.003400 +vn -0.983600 -0.180200 0.011000 +vn -0.967300 -0.253000 0.018500 +vn -0.861300 -0.506900 0.035500 +vn -0.782800 -0.620100 0.052500 +vn -0.000000 0.570100 0.821500 +vn -0.000000 0.766500 0.642200 +vn 0.967300 -0.253000 0.018500 +vn 0.983600 -0.180200 0.011000 +vn 0.782800 -0.620100 0.052500 +vn 0.861300 -0.506900 0.035500 +vn 0.568400 -0.819600 0.071700 +vn 0.634700 -0.770200 0.063400 +vn -0.000000 0.901600 0.432600 +vn 0.308700 -0.939100 0.150900 +vn -0.308700 -0.939100 0.150900 +vn -0.568400 -0.819600 0.071700 +vn -0.634700 -0.770200 0.063400 +vn 0.000000 -0.995400 0.095400 +vn -0.363900 -0.930500 0.042300 +vn 0.363900 -0.930500 0.042300 +vn -1.000000 -0.009900 0.000100 +vn -0.995600 0.094100 0.000300 +vn -0.995400 0.095300 0.000000 +vn -1.000000 0.003300 -0.000600 +vn -0.980400 -0.196900 -0.003500 +vn -0.981000 -0.193900 -0.001200 +vn 0.000000 -0.374600 0.927200 +vn 0.000000 -0.268600 0.963300 +vn 0.000000 -0.176700 0.984300 +vn -0.670000 -0.742300 -0.013100 +vn -0.574200 -0.818600 -0.014400 +vn 0.000000 -0.017600 0.999800 +vn -0.242200 -0.970100 -0.017100 +vn 0.670000 -0.742300 -0.013100 +vn 0.574200 -0.818600 -0.014400 +vn 0.242200 -0.970100 -0.017100 +vn 0.000000 0.017600 -0.999800 +vn 0.000000 -0.010200 -0.999900 +vn 1.000000 0.003300 -0.000600 +vn 1.000000 -0.009900 0.000100 +vn 0.981000 -0.193900 -0.001200 +vn 0.000000 -0.021800 -0.999800 +vn 0.000000 -1.000000 -0.001100 +vn 0.995300 0.096900 -0.000300 +vn 0.995400 0.095300 0.000000 +vn 0.995600 0.094100 0.000300 +vn 0.995900 0.090000 -0.000300 +vn 0.996100 0.088300 -0.000100 +vn 0.995300 0.097200 -0.000900 +vn 0.411800 0.911200 -0.008200 +vn 0.788000 -0.615700 0.005600 +vn 0.000000 1.000000 -0.009100 +vn -0.788000 -0.615700 0.005600 +vn 0.000000 0.020300 0.999800 +vn 0.000000 0.009100 1.000000 +vn 0.000000 0.019000 0.999800 +vn 0.000000 0.050500 0.998700 +vn -0.411800 0.911200 -0.008200 +vn -0.996100 0.088300 -0.000100 +vn -0.995900 0.090000 -0.000300 +vn -0.995300 0.097200 -0.000900 +vn -0.995300 0.096900 -0.000300 +vn 0.000000 -0.014700 -0.999900 +vn 0.000000 -0.013600 -0.999900 +vn 0.000000 -0.019000 -0.999800 +vn 0.000000 -0.020300 -0.999800 +vn 0.000000 -0.009000 -1.000000 +vn 0.000000 -1.000000 0.009100 +vn 0.000000 -0.009100 -1.000000 +vn -0.000000 1.000000 -0.009300 +vn 0.000000 0.999900 0.012600 +vn -0.006100 0.999900 -0.008900 +vn 0.000000 0.994300 -0.106500 +vn 0.000000 0.980600 -0.196200 +vn 0.707100 -0.706900 0.019000 +vn 0.402800 -0.818000 -0.410700 +vn 0.394200 -0.820300 -0.414400 +vn 0.248500 -0.865300 -0.435300 +vn 0.706900 -0.138200 0.693600 +vn 0.707000 -0.138200 0.693600 +vn 0.707500 -0.127100 0.695100 +vn 0.707600 -0.126200 0.695200 +vn 0.708600 -0.115200 0.696200 +vn 0.646300 0.575500 0.501100 +vn 0.702500 0.676200 0.222200 +vn 0.643700 0.571700 0.508800 +vn 0.000000 0.664000 0.747800 +vn 0.000000 -0.179400 0.983800 +vn 0.000000 -0.195400 0.980700 +vn 0.000000 -0.163300 0.986600 +vn 0.000000 0.950400 0.310900 +vn 0.000000 0.989800 0.142200 +vn 0.000000 0.999500 -0.030800 +vn 0.000000 0.425400 -0.905000 +vn 0.000000 0.188700 -0.982000 +vn 0.000000 -0.059700 -0.998200 +vn 0.000000 -0.698100 -0.716000 +vn 0.000000 -0.995700 0.092800 +vn 0.000000 -0.962800 0.270100 +vn 0.000000 -0.898700 0.438700 +vn 0.000000 -0.092800 -0.995700 +vn 0.000000 0.962800 -0.270100 +vn 0.000000 0.898700 -0.438700 +vn 0.000000 0.999100 -0.042600 +vn 0.000000 1.000000 -0.002400 +vn 0.000000 0.999900 -0.012400 +vn 0.000000 0.012800 0.999900 +vn 0.000000 -0.999900 0.012000 +vn 0.000000 -0.751800 0.659400 +vn 0.692000 -0.699000 0.180400 +vn 0.595800 -0.597000 0.537300 +vn 0.706400 -0.707300 0.026200 +vn 0.582800 -0.610500 0.536300 +vn 0.582600 -0.610600 0.536400 +vn 0.743400 -0.068600 0.665300 +vn 0.743500 -0.065100 0.665600 +vn 0.743900 -0.091000 0.662100 +vn 0.000000 -0.100500 0.994900 +vn 0.000000 -0.136200 0.990700 +vn 0.732600 0.211400 0.647000 +vn 0.000000 -0.064600 0.997900 +vn 0.000000 0.566300 0.824200 +vn 0.000000 -0.999000 0.044500 +vn 0.686900 0.411600 0.599000 +vn 0.686700 0.411500 0.599200 +vn 0.699900 -0.713600 0.031800 +vn 0.699900 -0.713500 0.031800 +vn 0.699700 -0.713800 0.031800 +vn 0.699600 -0.713800 0.031800 +vn 0.717200 -0.688200 -0.109500 +vn 0.000000 -0.989400 -0.144900 +vn 0.720500 -0.654800 -0.228200 +vn 0.720600 -0.654700 -0.228100 +vn 0.000000 -0.944300 -0.329100 +vn -0.000000 -0.705800 0.708400 +vn 0.015900 -0.682400 0.730800 +vn 0.000000 -0.208200 0.978100 +vn 0.626400 -0.690800 0.361200 +vn 0.604500 -0.677700 0.418600 +vn 0.627300 -0.691300 0.358600 +vn 0.747800 0.089100 0.657900 +vn 0.756700 0.028900 0.653200 +vn 0.766700 -0.133700 0.628000 +vn 0.709700 0.259000 0.655100 +vn 0.708300 0.258400 0.657000 +vn 0.000000 0.367700 0.930000 +vn 0.501600 -0.804700 0.317500 +vn 0.503100 -0.804600 0.315500 +vn 0.500100 -0.804900 0.319500 +vn 0.000000 -0.928600 0.371000 +vn 0.000000 -0.982900 0.184100 +vn 0.000000 -0.988000 0.154200 +vn 0.000000 -1.000000 -0.009800 +vn 0.000000 -0.418700 -0.908100 +vn 0.697700 -0.151100 -0.700300 +vn 0.659000 -0.315900 -0.682500 +vn 0.658600 -0.315900 -0.683000 +vn 0.720100 0.175400 -0.671400 +vn 0.705800 -0.096700 -0.701800 +vn 0.000000 0.251000 -0.968000 +vn 0.000000 0.097100 -0.995300 +vn 0.719900 0.173100 -0.672200 +vn 0.722100 0.193300 -0.664300 +vn 0.000000 0.270400 -0.962800 +vn 0.000000 0.137000 -0.990600 +vn 0.000000 -0.489700 -0.871900 +vn 0.768400 -0.312800 -0.558300 +vn 0.765800 -0.133700 -0.629100 +vn 0.762500 -0.095900 -0.639900 +vn 0.722800 0.181300 -0.666900 +vn 0.000000 -0.894200 -0.447600 +vn 0.000000 -0.976200 -0.216900 +vn 0.000000 -0.999600 0.026800 +vn 0.000000 0.656800 -0.754100 +vn 0.658700 -0.180500 0.730400 +vn 0.711000 -0.231900 0.663800 +vn 0.733300 -0.265400 0.626000 +vn 0.069300 -0.597200 0.799100 +vn 0.022300 -0.672800 0.739500 +vn 0.006100 0.999900 -0.008900 +vn -0.000000 0.994300 -0.106400 +vn -0.707100 -0.706900 0.019000 +vn -0.402800 -0.818000 -0.410700 +vn -0.186200 -0.932000 -0.311100 +vn -0.248500 -0.865300 -0.435300 +vn -0.707500 -0.127100 0.695100 +vn -0.707000 -0.138200 0.693600 +vn -0.706900 -0.138200 0.693600 +vn -0.708600 -0.115200 0.696200 +vn -0.707600 -0.126200 0.695200 +vn -0.643700 0.571700 0.508800 +vn -0.702500 0.676200 0.222200 +vn -0.646300 0.575500 0.501100 +vn -0.692000 -0.699000 0.180400 +vn -0.559600 -0.617900 -0.552300 +vn -0.706400 -0.707300 0.026200 +vn -0.595800 -0.597000 0.537300 +vn -0.582600 -0.610600 0.536400 +vn -0.582800 -0.610500 0.536300 +vn -0.743900 -0.091000 0.662100 +vn -0.743500 -0.065100 0.665600 +vn -0.743400 -0.068600 0.665300 +vn -0.732600 0.211400 0.647000 +vn -0.739000 0.159000 0.654700 +vn -0.686700 0.411500 0.599200 +vn -0.699700 -0.713800 0.031800 +vn -0.699900 -0.713500 0.031800 +vn -0.699900 -0.713600 0.031800 +vn -0.717200 -0.688200 -0.109500 +vn -0.699600 -0.713800 0.031800 +vn -0.715500 -0.692800 -0.089900 +vn -0.720600 -0.654700 -0.228100 +vn -0.022300 -0.672800 0.739500 +vn -0.015900 -0.682400 0.730800 +vn -0.626400 -0.690800 0.361200 +vn -0.660400 -0.707900 0.250600 +vn -0.627300 -0.691300 0.358600 +vn -0.766700 -0.133700 0.628000 +vn -0.756700 0.028900 0.653200 +vn -0.747800 0.089100 0.657900 +vn -0.708300 0.258400 0.657000 +vn -0.500100 -0.804900 0.319500 +vn -0.503100 -0.804600 0.315500 +vn -0.501600 -0.804700 0.317500 +vn -0.697700 -0.151100 -0.700300 +vn -0.705800 -0.096700 -0.701800 +vn -0.658600 -0.315900 -0.683000 +vn -0.720100 0.175400 -0.671400 +vn -0.719900 0.173100 -0.672200 +vn -0.722100 0.193300 -0.664300 +vn -0.768400 -0.312800 -0.558300 +vn -0.769000 -0.313000 -0.557400 +vn -0.762500 -0.095900 -0.639900 +vn -0.722800 0.181300 -0.666900 +vn -0.733300 -0.265400 0.626000 +vn -0.711000 -0.231900 0.663800 +vn -0.658700 -0.180500 0.730400 +vn -0.069300 -0.597200 0.799100 +vn 0.000000 -0.210600 0.977600 +vn 0.000000 -0.036600 0.999300 +vn 0.000000 0.300400 0.953800 +vn 0.000000 0.454000 0.891000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -0.681200 -0.732100 +vn 0.000000 -0.086800 -0.996200 +vn 0.000000 -0.138600 -0.990300 +vn 0.000000 -0.034700 -0.999400 +vn 0.642800 0.766000 -0.000000 +vn 0.866000 0.500000 -0.000000 +vn 0.984800 0.173600 0.000000 +vn 0.984800 -0.173600 0.000000 +vn 0.866000 -0.500000 0.000000 +vn 0.642800 -0.766000 0.000000 +vn 0.342000 -0.939700 0.000000 +vn -0.342000 -0.939700 0.000000 +vn -0.642800 -0.766000 0.000000 +vn -0.866000 -0.500000 0.000000 +vn -0.984800 -0.173600 0.000000 +vn -0.984800 0.173600 -0.000000 +vn -0.866000 0.500000 -0.000000 +vn -0.642800 0.766000 -0.000000 +vn -0.342000 0.939700 -0.000000 +vn 0.000000 -0.946900 0.321500 +vn 0.000000 0.922500 0.385900 +vn 0.000000 0.984500 -0.175600 +vn 0.000000 -0.647000 -0.762500 +vn -0.173600 -0.984800 0.000000 +vn 0.173600 -0.984800 0.000000 +vn 0.980400 -0.196900 -0.003500 +vn 0.995300 0.097300 0.000100 +vn -0.995300 0.097300 0.000100 +vn 0.186200 -0.932000 -0.311100 +vn 0.708700 -0.115200 0.696100 +vn 0.570100 0.471300 0.673000 +vn 0.559600 -0.617900 -0.552300 +vn 0.744200 -0.091000 0.661700 +vn 0.739000 0.159000 0.654700 +vn 0.715500 -0.692800 -0.089900 +vn 0.660400 -0.707900 0.250600 +vn 0.766500 -0.133700 0.628200 +vn 0.498500 -0.805000 0.321700 +vn 0.769000 -0.313000 -0.557400 +vn 0.652200 -0.180000 0.736400 +vn 0.605600 -0.123500 0.786100 +vn 0.798900 -0.328000 0.504100 +vn -0.394200 -0.820300 -0.414400 +vn -0.708700 -0.115200 0.696100 +vn -0.570100 0.471300 0.673000 +vn -0.744200 -0.091000 0.661700 +vn -0.686900 0.411600 0.599000 +vn -0.720500 -0.654800 -0.228200 +vn -0.604500 -0.677700 0.418600 +vn -0.766500 -0.133700 0.628200 +vn -0.709700 0.259000 0.655100 +vn -0.498500 -0.805000 0.321700 +vn -0.659000 -0.315900 -0.682500 +vn -0.765800 -0.133700 -0.629100 +vn -0.605600 -0.123500 0.786100 +vn -0.652200 -0.180000 0.736400 +vn -0.798900 -0.328000 0.504100 +s 1 +f 4/1/1 6/2/1 2/3/1 +f 10/4/2 3/5/3 1/6/3 +f 7/7/4 4/8/4 1/9/4 +f 5/10/1 18/11/1 6/2/1 +f 8/12/4 5/13/4 4/8/4 +f 10/4/5 9/14/5 7/7/5 +f 9/14/5 11/15/5 8/12/5 +f 13/16/5 12/17/5 9/14/5 +f 14/18/5 11/15/5 9/14/5 +f 15/19/6 12/17/6 13/16/6 +f 17/20/7 14/18/7 12/17/7 +f 6/2/1 15/19/1 16/21/1 +f 6/2/1 18/11/1 17/20/1 +f 17/22/8 18/23/9 11/15/9 +f 18/23/9 5/24/10 8/12/10 +f 13/16/11 10/4/2 2/25/2 +f 30/26/12 36/27/12 34/28/12 +f 21/29/13 26/30/14 20/31/15 +f 24/32/16 21/33/13 19/34/13 +f 23/35/17 25/36/18 24/32/16 +f 27/37/19 26/30/20 24/32/20 +f 21/33/21 24/32/20 26/30/20 +f 26/30/14 27/37/22 28/38/23 +f 27/37/22 29/39/24 30/40/25 +f 27/37/19 25/36/19 32/41/26 +f 29/39/24 31/42/27 54/43/28 +f 31/42/29 29/39/26 32/41/26 +f 35/44/30 33/45/31 32/41/32 +f 34/46/33 32/41/32 25/36/18 +f 36/47/34 38/48/35 33/45/31 +f 37/49/36 39/50/37 38/48/35 +f 40/51/38 38/48/38 39/50/39 +f 31/42/29 33/45/29 38/48/38 +f 31/42/27 40/51/40 41/52/41 +f 40/51/40 42/53/42 43/54/43 +f 42/53/42 44/55/44 45/56/45 +f 42/53/39 39/50/39 47/57/46 +f 45/56/45 44/55/44 46/58/47 +f 44/55/21 47/57/21 48/59/21 +f 48/59/48 47/57/49 49/60/50 +f 49/60/50 47/57/49 39/50/37 +f 53/8/51 48/59/48 50/61/52 +f 52/62/53 46/58/47 53/8/51 +f 53/8/51 46/58/47 48/59/48 +f 55/63/54 58/64/55 104/65/56 +f 56/66/57 60/66/58 59/63/59 +f 55/9/60 59/9/61 61/5/61 +f 57/5/60 73/67/62 58/68/62 +f 59/63/63 60/66/63 64/66/64 +f 59/9/61 62/9/65 65/5/65 +f 64/66/64 112/66/66 63/63/66 +f 62/9/65 63/9/65 66/5/65 +f 61/5/67 65/5/68 67/69/68 +f 67/69/68 65/5/68 66/5/69 +f 67/69/70 68/69/70 112/70/70 +f 69/69/71 67/69/70 64/70/70 +f 70/69/72 57/5/73 61/5/74 +f 70/69/75 69/69/71 60/70/71 +f 71/16/76 70/69/76 56/70/76 +f 74/71/77 72/72/78 70/69/72 +f 72/72/78 73/67/79 57/5/73 +f 72/72/78 75/73/80 76/12/81 +f 74/71/77 77/18/82 75/73/80 +f 75/73/83 78/73/83 79/12/83 +f 77/18/83 80/18/83 78/73/83 +f 78/73/5 81/73/5 82/12/5 +f 80/18/5 83/18/5 81/73/5 +f 81/73/84 84/73/84 85/12/84 +f 83/18/84 86/18/84 84/73/84 +f 84/73/5 87/73/5 88/12/5 +f 84/73/5 86/18/5 89/18/5 +f 90/74/85 92/24/85 88/12/85 +f 91/22/85 90/74/85 87/73/85 +f 93/75/1 90/75/1 91/20/1 +f 93/75/1 95/10/1 92/10/1 +f 96/75/86 93/75/86 94/20/86 +f 99/10/86 95/10/86 93/75/86 +f 97/75/1 100/10/1 99/10/1 +f 107/20/1 97/75/1 96/75/1 +f 82/12/87 85/12/88 95/13/88 +f 79/12/89 82/12/87 99/13/87 +f 76/12/90 79/12/89 100/13/89 +f 102/75/91 101/10/91 100/10/91 +f 101/10/92 102/75/93 104/65/56 +f 76/12/90 101/13/90 58/68/62 +f 102/75/91 97/75/91 107/20/91 +f 102/75/93 103/20/94 105/76/95 +f 56/66/57 104/65/56 105/76/95 +f 106/21/96 105/76/96 74/71/96 +f 103/20/97 77/18/97 74/71/96 +f 103/20/97 107/20/98 80/18/98 +f 107/20/98 98/20/99 83/18/99 +f 98/20/99 94/20/100 86/18/100 +f 85/12/88 88/12/88 92/13/88 +f 94/20/101 108/20/101 109/18/101 +f 91/20/1 110/20/1 108/20/1 +f 108/20/102 110/20/102 111/18/102 +f 89/18/85 111/18/85 110/22/85 +f 86/18/5 109/18/5 111/18/5 +f 68/69/69 66/5/69 63/6/66 +f 199/77/103 126/78/104 115/79/105 +f 113/18/106 114/18/107 282/80/107 +f 116/81/5 117/82/5 114/18/5 +f 113/18/5 115/79/5 120/83/5 +f 116/81/108 118/84/108 175/84/108 +f 116/85/109 119/86/110 173/87/111 +f 119/86/5 116/85/5 120/83/5 +f 124/88/112 122/89/113 120/83/114 +f 121/90/115 120/83/114 115/79/116 +f 124/91/117 125/91/118 123/92/119 +f 172/93/5 122/89/5 158/94/5 +f 196/95/120 197/95/120 127/91/120 +f 121/90/121 198/96/121 196/95/122 +f 126/97/123 199/98/123 198/96/121 +f 197/95/124 202/95/125 128/91/125 +f 202/95/125 204/95/126 129/91/126 +f 204/95/127 206/95/128 130/91/128 +f 206/95/128 208/95/129 131/91/129 +f 208/95/130 210/95/130 132/91/130 +f 210/95/131 212/95/132 133/91/132 +f 212/95/132 214/95/133 134/91/133 +f 214/95/134 216/95/134 135/91/134 +f 136/91/135 135/91/136 216/95/136 +f 137/91/137 136/91/135 218/95/135 +f 220/95/137 222/95/138 138/91/138 +f 222/95/138 224/95/139 139/91/139 +f 140/91/140 139/91/140 224/95/140 +f 142/91/141 140/91/141 226/95/141 +f 144/99/142 141/99/142 228/95/142 +f 141/99/143 143/91/144 181/91/145 +f 144/99/146 145/91/147 143/91/144 +f 146/99/148 147/91/149 145/91/150 +f 146/99/151 144/99/152 229/95/152 +f 147/91/149 146/99/148 148/99/153 +f 148/99/154 146/99/151 238/95/151 +f 148/99/155 239/95/155 240/100/155 +f 151/101/156 149/101/156 240/100/156 +f 148/99/153 149/101/157 150/102/158 +f 150/102/159 149/101/160 151/101/161 +f 152/103/162 151/101/161 153/101/163 +f 153/101/164 151/101/156 241/100/156 +f 153/101/163 155/101/165 179/104/166 +f 155/101/167 153/101/164 249/100/164 +f 156/105/168 178/106/169 251/100/168 +f 156/105/170 251/100/170 252/107/170 +f 156/105/171 158/108/172 177/109/173 +f 159/110/174 160/111/175 158/94/176 +f 159/110/174 161/112/177 162/113/178 +f 159/110/179 252/107/179 261/114/179 +f 163/112/180 176/115/181 162/113/182 +f 261/114/183 262/114/184 163/112/185 +f 165/116/186 176/115/186 263/117/186 +f 166/118/187 164/118/187 263/119/187 +f 167/120/188 165/116/189 164/118/190 +f 169/121/191 167/120/188 166/118/192 +f 272/122/193 168/123/193 166/118/194 +f 169/121/191 168/123/195 170/124/196 +f 168/123/193 272/122/193 273/125/197 +f 274/126/198 171/127/198 170/124/197 +f 275/128/199 173/87/199 171/127/199 +f 119/86/200 172/93/201 171/127/202 +f 174/129/203 170/124/196 171/127/202 +f 173/87/111 275/128/204 280/130/205 +f 174/129/5 158/94/5 160/111/5 +f 280/130/205 281/130/206 175/84/206 +f 282/131/207 117/82/207 175/84/207 +f 167/120/5 169/121/5 160/111/5 +f 167/120/5 162/113/5 176/115/5 +f 123/92/208 125/91/209 179/104/210 +f 179/104/211 155/106/212 178/106/169 +f 127/91/5 128/91/5 154/132/5 +f 154/132/5 128/91/5 129/91/5 +f 152/103/5 129/91/5 180/91/5 +f 180/91/5 129/91/5 130/91/5 +f 147/91/5 130/91/5 131/91/5 +f 145/91/5 131/91/5 132/91/5 +f 143/91/5 137/91/5 138/91/5 +f 138/91/5 139/91/5 142/91/5 +f 132/91/5 133/91/5 136/91/5 +f 133/91/5 134/91/5 135/91/5 +f 185/79/213 199/77/103 183/80/214 +f 282/80/107 184/18/107 182/18/106 +f 184/18/1 187/82/1 186/81/1 +f 190/83/1 185/79/1 182/18/1 +f 283/84/215 188/84/215 186/81/215 +f 186/85/216 188/84/217 278/87/218 +f 189/86/1 192/89/1 190/83/1 +f 190/83/219 192/89/220 194/88/221 +f 185/79/222 190/83/219 191/90/223 +f 193/92/224 195/91/225 194/91/226 +f 255/94/1 192/89/1 277/93/1 +f 201/91/120 196/95/120 194/88/120 +f 196/95/122 198/96/121 191/90/121 +f 198/96/121 199/98/123 200/97/123 +f 203/91/125 202/95/125 197/95/124 +f 205/91/126 204/95/126 202/95/125 +f 207/91/128 206/95/128 204/95/127 +f 209/91/129 208/95/129 206/95/128 +f 211/91/130 210/95/130 208/95/130 +f 213/91/132 212/95/132 210/95/131 +f 215/91/133 214/95/133 212/95/132 +f 217/91/134 216/95/134 214/95/134 +f 216/95/136 217/91/136 219/91/135 +f 218/95/135 219/91/135 221/91/137 +f 223/91/138 222/95/138 220/95/137 +f 225/91/139 224/95/139 222/95/138 +f 224/95/140 225/91/140 227/91/140 +f 226/95/141 231/91/141 228/95/141 +f 228/95/142 230/99/142 233/99/142 +f 230/99/227 231/91/228 289/91/229 +f 232/91/230 234/91/231 233/99/232 +f 234/91/233 236/91/234 235/99/235 +f 229/95/152 233/99/152 235/99/151 +f 237/99/236 235/99/235 236/91/234 +f 238/95/151 235/99/151 237/99/154 +f 240/100/155 239/95/155 237/99/155 +f 240/100/156 242/101/156 244/101/156 +f 237/99/236 288/91/237 243/102/238 +f 244/101/239 242/101/240 243/102/241 +f 246/101/242 244/101/239 245/103/243 +f 241/100/156 244/101/156 246/101/164 +f 246/101/242 247/132/244 287/104/245 +f 249/100/164 246/101/164 248/101/167 +f 248/101/246 286/106/247 251/100/168 +f 252/107/170 251/100/170 253/105/170 +f 253/105/248 254/106/249 285/109/250 +f 255/94/251 257/111/252 256/110/253 +f 256/110/253 257/111/252 259/113/254 +f 261/114/179 252/107/179 256/110/179 +f 259/113/255 284/115/256 260/112/257 +f 260/112/185 262/114/184 261/114/183 +f 262/133/184 284/115/186 263/117/186 +f 263/119/187 265/118/187 267/118/187 +f 268/120/258 267/118/259 265/118/260 +f 270/121/261 269/123/262 267/118/259 +f 267/118/194 269/123/193 272/122/193 +f 271/124/263 269/123/262 270/121/261 +f 273/125/197 272/122/193 269/123/193 +f 271/124/197 276/127/198 274/126/198 +f 276/127/199 278/87/199 275/128/199 +f 189/86/264 278/87/265 276/127/266 +f 276/127/266 271/124/263 279/129/267 +f 280/130/205 275/128/204 278/87/218 +f 257/111/1 255/94/1 279/129/1 +f 283/84/206 281/130/206 280/130/205 +f 187/82/207 184/18/207 282/131/207 +f 268/120/1 259/113/1 257/111/1 +f 268/120/1 266/116/1 284/115/1 +f 287/104/268 195/91/269 193/92/270 +f 287/104/271 286/106/247 248/106/246 +f 247/132/1 203/91/1 201/91/1 +f 247/132/1 245/103/1 205/91/1 +f 245/103/1 243/102/1 288/91/1 +f 288/91/1 236/91/1 207/91/1 +f 236/91/1 234/91/1 209/91/1 +f 234/91/1 232/91/1 211/91/1 +f 221/91/1 211/91/1 232/91/1 +f 225/91/1 223/91/1 231/91/1 +f 219/91/1 213/91/1 211/91/1 +f 217/91/1 215/91/1 213/91/1 +f 290/63/1 291/21/1 295/21/1 +f 290/63/1 292/10/1 304/20/1 +f 305/12/272 292/13/272 290/9/273 +f 290/9/273 294/9/274 296/5/274 +f 294/63/1 295/21/1 298/21/1 +f 294/9/274 297/9/275 299/5/275 +f 300/16/276 299/5/276 297/6/276 +f 296/5/5 299/5/5 300/16/5 +f 301/16/277 300/16/277 298/21/277 +f 302/16/278 301/16/279 295/21/279 +f 293/5/5 296/5/5 301/16/5 +f 304/20/280 303/18/280 302/16/278 +f 303/18/5 305/12/5 293/5/5 +f 304/22/13 292/24/13 305/12/13 +f 343/29/13 342/30/15 308/31/15 +f 342/30/15 344/37/281 310/38/281 +f 310/38/281 344/37/281 345/39/282 +f 345/39/282 346/42/283 314/43/283 +f 346/42/283 347/51/284 316/52/284 +f 347/51/284 348/53/285 318/54/285 +f 318/54/285 348/53/285 349/55/286 +f 349/55/286 350/58/287 322/62/287 +f 350/58/287 351/8/276 324/17/276 +f 351/8/276 352/59/288 326/61/288 +f 352/59/288 353/57/289 328/60/289 +f 353/57/289 354/50/290 330/49/290 +f 354/50/290 355/48/291 332/47/291 +f 355/48/291 356/45/292 334/44/292 +f 356/45/292 357/41/293 336/46/293 +f 357/41/293 358/36/294 338/35/294 +f 331/134/21 323/135/21 315/136/21 +f 338/35/294 358/36/294 359/32/295 +f 359/32/295 343/33/13 306/34/13 +f 312/26/12 328/137/12 336/28/12 +f 360/138/21 342/139/21 343/140/21 +f 362/141/21 344/142/21 342/139/21 +f 363/143/21 345/144/21 344/142/21 +f 364/136/21 346/145/21 345/144/21 +f 365/146/21 347/147/21 346/145/21 +f 366/148/21 348/149/21 347/147/21 +f 366/148/21 367/150/21 349/151/21 +f 367/150/21 368/135/21 350/152/21 +f 368/135/21 369/153/21 351/154/21 +f 370/155/21 352/156/21 351/154/21 +f 371/157/21 353/158/21 352/156/21 +f 371/157/21 372/134/21 354/159/21 +f 372/134/21 373/160/21 355/161/21 +f 373/160/21 374/162/21 356/163/21 +f 374/162/21 375/164/21 357/165/21 +f 376/166/21 358/167/21 357/165/21 +f 376/166/21 377/168/21 359/169/21 +f 377/168/21 361/170/21 343/140/21 +f 309/138/288 360/138/288 361/170/276 +f 311/141/289 362/141/289 360/138/288 +f 313/143/290 363/143/290 362/141/289 +f 315/136/291 364/136/291 363/143/290 +f 317/146/292 365/146/292 364/136/291 +f 319/148/293 366/148/293 365/146/292 +f 321/150/294 367/150/294 366/148/293 +f 323/135/295 368/135/295 367/150/294 +f 325/153/13 369/153/13 368/135/295 +f 327/155/15 370/155/15 369/153/13 +f 329/157/281 371/157/281 370/155/15 +f 331/134/282 372/134/282 371/157/281 +f 333/160/283 373/160/283 372/134/282 +f 335/162/284 374/162/284 373/160/283 +f 337/164/285 375/164/285 374/162/284 +f 339/166/286 376/166/286 375/164/285 +f 341/168/287 377/168/287 376/166/286 +f 341/168/287 307/170/276 361/170/276 +f 382/16/296 381/5/296 378/6/296 +f 380/10/1 389/20/1 379/21/1 +f 383/12/297 380/13/297 378/9/297 +f 382/16/5 384/18/5 383/12/5 +f 384/18/5 386/18/5 385/12/5 +f 383/12/21 385/12/21 387/13/21 +f 388/22/13 387/24/13 385/12/13 +f 380/10/1 387/10/1 388/20/1 +f 389/22/12 388/22/12 386/18/12 +f 389/20/1 390/20/1 391/21/1 +f 384/18/298 392/18/298 390/22/298 +f 390/20/12 392/18/12 393/16/12 +f 384/18/5 382/16/5 393/16/5 +f 379/171/299 391/171/299 393/16/299 +f 1/63/1 4/1/1 2/3/1 +f 2/25/2 10/4/2 1/6/3 +f 3/5/4 7/7/4 1/9/4 +f 4/1/1 5/10/1 6/2/1 +f 7/7/4 8/12/4 4/8/4 +f 3/5/5 10/4/5 7/7/5 +f 7/7/5 9/14/5 8/12/5 +f 10/4/5 13/16/5 9/14/5 +f 12/17/5 14/18/5 9/14/5 +f 16/21/6 15/19/6 13/16/6 +f 15/19/7 17/20/7 12/17/7 +f 2/3/1 6/2/1 16/21/1 +f 15/19/1 6/2/1 17/20/1 +f 14/18/8 17/22/8 11/15/9 +f 11/15/9 18/23/9 8/12/10 +f 16/171/11 13/16/11 2/25/2 +f 22/172/12 19/173/12 20/174/12 +f 20/174/12 28/175/12 30/26/12 +f 30/26/12 54/176/12 41/177/12 +f 41/177/12 43/178/12 45/179/12 +f 45/179/12 52/180/12 51/181/12 +f 51/181/12 50/182/12 49/137/12 +f 49/137/12 37/183/12 36/27/12 +f 36/27/12 35/184/12 34/28/12 +f 34/28/12 23/185/12 22/172/12 +f 22/172/12 20/174/12 30/26/12 +f 30/26/12 41/177/12 45/179/12 +f 45/179/12 51/181/12 49/137/12 +f 49/137/12 36/27/12 30/26/12 +f 34/28/12 22/172/12 30/26/12 +f 30/26/12 45/179/12 49/137/12 +f 19/186/13 21/29/13 20/31/15 +f 22/187/295 24/32/16 19/34/13 +f 22/187/295 23/35/17 24/32/16 +f 25/36/19 27/37/19 24/32/20 +f 20/31/15 26/30/14 28/38/23 +f 28/38/23 27/37/22 30/40/25 +f 29/39/26 27/37/19 32/41/26 +f 30/40/25 29/39/24 54/43/28 +f 33/45/29 31/42/29 32/41/26 +f 34/46/33 35/44/30 32/41/32 +f 23/35/17 34/46/33 25/36/18 +f 35/44/30 36/47/34 33/45/31 +f 36/47/34 37/49/36 38/48/35 +f 42/53/39 40/51/38 39/50/39 +f 40/51/38 31/42/29 38/48/38 +f 54/43/28 31/42/27 41/52/41 +f 41/52/41 40/51/40 43/54/43 +f 43/54/43 42/53/42 45/56/45 +f 44/55/46 42/53/39 47/57/46 +f 52/62/53 45/56/45 46/58/47 +f 46/58/21 44/55/21 48/59/21 +f 50/61/52 48/59/48 49/60/50 +f 37/49/36 49/60/50 39/50/37 +f 51/17/300 53/8/51 50/61/52 +f 51/17/301 52/62/53 53/8/51 +f 56/66/57 55/63/54 104/65/56 +f 55/63/54 56/66/57 59/63/59 +f 57/5/60 55/9/60 61/5/61 +f 55/9/60 57/5/60 58/68/62 +f 62/63/64 59/63/63 64/66/64 +f 61/5/61 59/9/61 65/5/65 +f 62/63/64 64/66/64 63/63/66 +f 65/5/65 62/9/65 66/5/65 +f 69/69/67 61/5/67 67/69/68 +f 68/69/69 67/69/68 66/5/69 +f 64/70/70 67/69/70 112/70/70 +f 60/70/71 69/69/71 64/70/70 +f 69/69/302 70/69/72 61/5/74 +f 56/70/75 70/69/75 60/70/71 +f 106/171/76 71/16/76 56/70/76 +f 71/16/303 74/71/77 70/69/72 +f 70/69/72 72/72/78 57/5/73 +f 73/67/79 72/72/78 76/12/81 +f 72/72/78 74/71/77 75/73/80 +f 76/12/83 75/73/83 79/12/83 +f 75/73/83 77/18/83 78/73/83 +f 79/12/5 78/73/5 82/12/5 +f 78/73/5 80/18/5 81/73/5 +f 82/12/84 81/73/84 85/12/84 +f 81/73/84 83/18/84 84/73/84 +f 85/12/5 84/73/5 88/12/5 +f 87/73/5 84/73/5 89/18/5 +f 87/73/85 90/74/85 88/12/85 +f 89/18/85 91/22/85 87/73/85 +f 94/20/1 93/75/1 91/20/1 +f 90/75/1 93/75/1 92/10/1 +f 98/20/86 96/75/86 94/20/86 +f 96/75/86 99/10/86 93/75/86 +f 96/75/1 97/75/1 99/10/1 +f 98/20/1 107/20/1 96/75/1 +f 99/13/87 82/12/87 95/13/88 +f 100/13/89 79/12/89 99/13/87 +f 101/13/90 76/12/90 100/13/89 +f 97/75/91 102/75/91 100/10/91 +f 58/64/55 101/10/92 104/65/56 +f 73/67/62 76/12/90 58/68/62 +f 103/20/91 102/75/91 107/20/91 +f 104/65/56 102/75/93 105/76/95 +f 106/21/304 56/66/57 105/76/95 +f 71/16/96 106/21/96 74/71/96 +f 105/76/96 103/20/97 74/71/96 +f 77/18/97 103/20/97 80/18/98 +f 80/18/98 107/20/98 83/18/99 +f 83/18/99 98/20/99 86/18/100 +f 95/13/88 85/12/88 92/13/88 +f 86/18/101 94/20/101 109/18/101 +f 94/20/1 91/20/1 108/20/1 +f 109/18/102 108/20/102 111/18/102 +f 91/22/85 89/18/85 110/22/85 +f 89/18/5 86/18/5 111/18/5 +f 112/70/66 68/69/69 63/6/66 +f 115/79/105 113/18/106 183/80/214 +f 183/80/214 199/77/103 115/79/105 +f 183/80/214 113/18/106 282/80/107 +f 113/18/5 116/81/5 114/18/5 +f 116/188/5 113/18/5 120/83/5 +f 117/82/108 116/81/108 175/84/108 +f 118/84/305 116/85/109 173/87/111 +f 122/89/5 119/86/5 120/83/5 +f 121/90/115 124/88/112 120/83/114 +f 126/97/306 121/90/115 115/79/116 +f 122/89/307 124/91/117 123/92/119 +f 158/94/5 174/129/5 172/93/5 +f 172/93/5 119/86/5 122/89/5 +f 122/89/5 123/92/5 158/94/5 +f 177/109/5 158/94/5 123/92/5 +f 127/91/120 125/91/120 124/88/120 +f 124/88/120 196/95/120 127/91/120 +f 124/88/122 121/90/121 196/95/122 +f 121/90/121 126/97/123 198/96/121 +f 127/91/124 197/95/124 128/91/125 +f 128/91/125 202/95/125 129/91/126 +f 129/91/127 204/95/127 130/91/128 +f 130/91/128 206/95/128 131/91/129 +f 131/91/130 208/95/130 132/91/130 +f 132/91/131 210/95/131 133/91/132 +f 133/91/132 212/95/132 134/91/133 +f 134/91/134 214/95/134 135/91/134 +f 218/95/135 136/91/135 216/95/136 +f 220/95/137 137/91/137 218/95/135 +f 137/91/137 220/95/137 138/91/138 +f 138/91/138 222/95/138 139/91/139 +f 226/95/140 140/91/140 224/95/140 +f 226/95/141 228/95/141 142/91/141 +f 141/99/141 142/91/141 228/95/141 +f 229/95/142 144/99/142 228/95/142 +f 142/91/308 141/99/143 181/91/145 +f 141/99/143 144/99/146 143/91/144 +f 144/99/309 146/99/148 145/91/150 +f 238/95/151 146/99/151 229/95/152 +f 180/91/310 147/91/149 148/99/153 +f 239/95/154 148/99/154 238/95/151 +f 149/101/155 148/99/155 240/100/155 +f 241/100/156 151/101/156 240/100/156 +f 180/91/310 148/99/153 150/102/158 +f 152/103/162 150/102/159 151/101/161 +f 154/132/311 152/103/162 153/101/163 +f 249/100/164 153/101/164 241/100/156 +f 154/132/311 153/101/163 179/104/166 +f 250/100/167 155/101/167 249/100/164 +f 250/100/168 251/100/168 155/101/212 +f 156/105/168 157/106/168 178/106/169 +f 178/106/169 155/101/212 251/100/168 +f 159/110/170 156/105/170 252/107/170 +f 157/106/312 156/105/171 177/109/173 +f 156/105/313 159/110/174 158/94/176 +f 160/111/175 159/110/174 162/113/178 +f 161/112/179 159/110/179 261/114/179 +f 161/112/314 163/112/180 162/113/182 +f 161/112/183 261/114/183 163/112/185 +f 262/133/184 263/117/186 176/115/186 +f 164/189/186 165/116/186 263/117/186 +f 176/115/186 163/190/185 262/133/184 +f 264/119/187 166/118/187 263/119/187 +f 166/118/192 167/120/188 164/118/190 +f 168/123/195 169/121/191 166/118/192 +f 264/119/194 272/122/193 166/118/194 +f 174/129/203 169/121/191 170/124/196 +f 170/124/197 168/123/193 273/125/197 +f 273/125/197 274/126/198 170/124/197 +f 274/126/199 275/128/199 171/127/199 +f 173/87/315 119/86/200 171/127/202 +f 172/93/201 174/129/203 171/127/202 +f 118/84/305 173/87/111 280/130/205 +f 169/121/5 174/129/5 160/111/5 +f 118/84/305 280/130/205 175/84/206 +f 175/84/207 281/130/207 282/131/207 +f 282/131/207 114/18/207 117/82/207 +f 162/113/5 167/120/5 160/111/5 +f 165/116/5 167/120/5 176/115/5 +f 178/106/316 157/106/317 177/109/317 +f 177/109/317 123/92/208 178/106/316 +f 125/91/209 127/91/318 179/104/210 +f 179/104/210 178/106/316 123/92/208 +f 179/104/5 127/91/5 154/132/5 +f 152/103/5 154/132/5 129/91/5 +f 150/102/5 152/103/5 180/91/5 +f 147/91/5 180/91/5 130/91/5 +f 145/91/5 147/91/5 131/91/5 +f 143/91/5 145/91/5 132/91/5 +f 138/91/5 181/91/5 143/91/5 +f 143/91/5 132/91/5 137/91/5 +f 140/91/5 142/91/5 139/91/5 +f 181/91/5 138/91/5 142/91/5 +f 137/91/5 132/91/5 136/91/5 +f 136/91/5 133/91/5 135/91/5 +f 183/80/214 182/18/106 185/79/213 +f 185/79/213 200/78/104 199/77/103 +f 183/80/214 282/80/107 182/18/106 +f 182/18/1 184/18/1 186/81/1 +f 186/188/1 190/83/1 182/18/1 +f 187/82/215 283/84/215 186/81/215 +f 189/86/319 186/85/216 278/87/218 +f 186/85/1 189/86/1 190/83/1 +f 191/90/223 190/83/219 194/88/221 +f 200/97/320 185/79/222 191/90/223 +f 192/89/321 193/92/224 194/91/226 +f 277/93/1 279/129/1 255/94/1 +f 255/94/1 285/109/1 193/92/1 +f 193/92/1 192/89/1 255/94/1 +f 189/86/1 277/93/1 192/89/1 +f 194/88/120 195/91/120 201/91/120 +f 201/91/120 197/95/120 196/95/120 +f 194/88/122 196/95/122 191/90/121 +f 191/90/121 198/96/121 200/97/123 +f 201/91/124 203/91/125 197/95/124 +f 203/91/125 205/91/126 202/95/125 +f 205/91/127 207/91/128 204/95/127 +f 207/91/128 209/91/129 206/95/128 +f 209/91/130 211/91/130 208/95/130 +f 211/91/131 213/91/132 210/95/131 +f 213/91/132 215/91/133 212/95/132 +f 215/91/134 217/91/134 214/95/134 +f 218/95/135 216/95/136 219/91/135 +f 220/95/137 218/95/135 221/91/137 +f 221/91/137 223/91/138 220/95/137 +f 223/91/138 225/91/139 222/95/138 +f 226/95/140 224/95/140 227/91/140 +f 230/99/141 228/95/141 231/91/141 +f 226/95/141 227/91/141 231/91/141 +f 229/95/142 228/95/142 233/99/142 +f 232/91/230 230/99/227 289/91/229 +f 230/99/227 232/91/230 233/99/232 +f 233/99/322 234/91/233 235/99/235 +f 238/95/151 229/95/152 235/99/151 +f 288/91/237 237/99/236 236/91/234 +f 239/95/154 238/95/151 237/99/154 +f 242/101/155 240/100/155 237/99/155 +f 241/100/156 240/100/156 244/101/156 +f 242/101/323 237/99/236 243/102/238 +f 245/103/243 244/101/239 243/102/241 +f 247/132/244 246/101/242 245/103/243 +f 249/100/164 241/100/156 246/101/164 +f 248/101/324 246/101/242 287/104/245 +f 250/100/167 249/100/164 248/101/167 +f 253/105/168 251/100/168 286/106/247 +f 250/100/168 248/101/246 251/100/168 +f 286/106/247 254/106/168 253/105/168 +f 256/110/170 252/107/170 253/105/170 +f 255/108/325 253/105/248 285/109/250 +f 253/105/326 255/94/251 256/110/253 +f 258/112/327 256/110/253 259/113/254 +f 258/112/179 261/114/179 256/110/179 +f 258/112/328 259/113/255 260/112/257 +f 258/112/183 260/112/185 261/114/183 +f 265/189/186 263/117/186 266/116/186 +f 262/133/184 260/190/185 284/115/186 +f 284/115/186 266/116/186 263/117/186 +f 264/119/187 263/119/187 267/118/187 +f 266/116/329 268/120/258 265/118/260 +f 268/120/258 270/121/261 267/118/259 +f 264/119/194 267/118/194 272/122/193 +f 279/129/267 271/124/263 270/121/261 +f 271/124/197 273/125/197 269/123/193 +f 273/125/197 271/124/197 274/126/198 +f 274/126/199 276/127/199 275/128/199 +f 277/93/330 189/86/264 276/127/266 +f 277/93/330 276/127/266 279/129/267 +f 188/84/217 280/130/205 278/87/218 +f 270/121/1 257/111/1 279/129/1 +f 188/84/217 283/84/206 280/130/205 +f 282/131/207 281/130/207 283/84/207 +f 283/84/207 187/82/207 282/131/207 +f 270/121/1 268/120/1 257/111/1 +f 259/113/1 268/120/1 284/115/1 +f 285/109/331 254/106/331 286/106/332 +f 286/106/332 287/104/268 193/92/270 +f 201/91/333 195/91/269 287/104/268 +f 193/92/270 285/109/331 286/106/332 +f 287/104/1 247/132/1 201/91/1 +f 203/91/1 247/132/1 205/91/1 +f 205/91/1 245/103/1 288/91/1 +f 205/91/1 288/91/1 207/91/1 +f 207/91/1 236/91/1 209/91/1 +f 209/91/1 234/91/1 211/91/1 +f 232/91/1 289/91/1 223/91/1 +f 223/91/1 221/91/1 232/91/1 +f 289/91/1 231/91/1 223/91/1 +f 227/91/1 225/91/1 231/91/1 +f 221/91/1 219/91/1 211/91/1 +f 219/91/1 217/91/1 213/91/1 +f 294/63/1 290/63/1 295/21/1 +f 291/21/1 290/63/1 304/20/1 +f 293/5/273 305/12/272 290/9/273 +f 293/5/273 290/9/273 296/5/274 +f 297/63/1 294/63/1 298/21/1 +f 296/5/274 294/9/274 299/5/275 +f 298/171/276 300/16/276 297/6/276 +f 301/16/5 296/5/5 300/16/5 +f 295/21/277 301/16/277 298/21/277 +f 291/21/278 302/16/278 295/21/279 +f 302/16/5 293/5/5 301/16/5 +f 291/21/278 304/20/280 302/16/278 +f 302/16/5 303/18/5 293/5/5 +f 303/18/13 304/22/13 305/12/13 +f 306/186/13 343/29/13 308/31/15 +f 308/31/15 342/30/15 310/38/281 +f 312/40/282 310/38/281 345/39/282 +f 312/40/282 345/39/282 314/43/283 +f 314/43/283 346/42/283 316/52/284 +f 316/52/284 347/51/284 318/54/285 +f 320/56/286 318/54/285 349/55/286 +f 320/56/286 349/55/286 322/62/287 +f 322/62/287 350/58/287 324/17/276 +f 324/17/276 351/8/276 326/61/288 +f 326/61/288 352/59/288 328/60/289 +f 328/60/289 353/57/289 330/49/290 +f 330/49/290 354/50/290 332/47/291 +f 332/47/291 355/48/291 334/44/292 +f 334/44/292 356/45/292 336/46/293 +f 336/46/293 357/41/293 338/35/294 +f 311/141/21 309/138/21 307/170/21 +f 307/170/21 341/168/21 339/166/21 +f 339/166/21 337/164/21 331/134/21 +f 335/162/21 333/160/21 331/134/21 +f 331/134/21 329/157/21 327/155/21 +f 327/155/21 325/153/21 331/134/21 +f 323/135/21 321/150/21 315/136/21 +f 319/148/21 317/146/21 315/136/21 +f 315/136/21 313/143/21 311/141/21 +f 311/141/21 307/170/21 315/136/21 +f 337/164/21 335/162/21 331/134/21 +f 331/134/21 325/153/21 323/135/21 +f 321/150/21 319/148/21 315/136/21 +f 315/136/21 307/170/21 339/166/21 +f 339/166/21 331/134/21 315/136/21 +f 340/187/295 338/35/294 359/32/295 +f 340/187/295 359/32/295 306/34/13 +f 340/172/12 306/173/12 308/174/12 +f 308/174/12 310/175/12 312/26/12 +f 312/26/12 314/176/12 316/177/12 +f 316/177/12 318/178/12 312/26/12 +f 320/179/12 322/180/12 324/181/12 +f 324/181/12 326/182/12 328/137/12 +f 328/137/12 330/183/12 332/27/12 +f 332/27/12 334/184/12 336/28/12 +f 336/28/12 338/185/12 340/172/12 +f 340/172/12 308/174/12 312/26/12 +f 312/26/12 318/178/12 320/179/12 +f 320/179/12 324/181/12 312/26/12 +f 328/137/12 332/27/12 336/28/12 +f 336/28/12 340/172/12 312/26/12 +f 312/26/12 324/181/12 328/137/12 +f 361/170/21 360/138/21 343/140/21 +f 360/138/21 362/141/21 342/139/21 +f 362/141/21 363/143/21 344/142/21 +f 363/143/21 364/136/21 345/144/21 +f 364/136/21 365/146/21 346/145/21 +f 365/146/21 366/148/21 347/147/21 +f 348/149/21 366/148/21 349/151/21 +f 349/151/21 367/150/21 350/152/21 +f 350/152/21 368/135/21 351/154/21 +f 369/153/21 370/155/21 351/154/21 +f 370/155/21 371/157/21 352/156/21 +f 353/158/21 371/157/21 354/159/21 +f 354/159/21 372/134/21 355/161/21 +f 355/161/21 373/160/21 356/163/21 +f 356/163/21 374/162/21 357/165/21 +f 375/164/21 376/166/21 357/165/21 +f 358/167/21 376/166/21 359/169/21 +f 359/169/21 377/168/21 343/140/21 +f 307/170/276 309/138/288 361/170/276 +f 309/138/288 311/141/289 360/138/288 +f 311/141/289 313/143/290 362/141/289 +f 313/143/290 315/136/291 363/143/290 +f 315/136/291 317/146/292 364/136/291 +f 317/146/292 319/148/293 365/146/292 +f 319/148/293 321/150/294 366/148/293 +f 321/150/294 323/135/295 367/150/294 +f 323/135/295 325/153/13 368/135/295 +f 325/153/13 327/155/15 369/153/13 +f 327/155/15 329/157/281 370/155/15 +f 329/157/281 331/134/282 371/157/281 +f 331/134/282 333/160/283 372/134/282 +f 333/160/283 335/162/284 373/160/283 +f 335/162/284 337/164/285 374/162/284 +f 337/164/285 339/166/286 375/164/285 +f 339/166/286 341/168/287 376/166/286 +f 377/168/287 341/168/287 361/170/276 +f 379/171/296 382/16/296 378/6/296 +f 378/63/1 380/10/1 379/21/1 +f 381/5/297 383/12/297 378/9/297 +f 381/5/5 382/16/5 383/12/5 +f 383/12/5 384/18/5 385/12/5 +f 380/13/21 383/12/21 387/13/21 +f 386/18/13 388/22/13 385/12/13 +f 389/20/1 380/10/1 388/20/1 +f 384/18/12 389/22/12 386/18/12 +f 379/21/1 389/20/1 391/21/1 +f 389/22/298 384/18/298 390/22/298 +f 391/21/12 390/20/12 393/16/12 +f 392/18/5 384/18/5 393/16/5 +f 382/16/299 379/171/299 393/16/299 +o Cube.002_Cube.021 +v 0.303146 0.085577 -0.001710 +v 0.303146 0.872109 0.004624 +v 0.303146 0.081354 -0.731230 +v 0.303146 0.862907 -0.711023 +v 0.303146 0.080847 -0.856947 +v 0.303146 0.822177 -0.800855 +v 0.303146 0.075826 -1.072472 +v 0.303146 0.796075 -0.891782 +v 0.303146 0.073710 -1.163270 +v 0.303146 0.787864 -0.976240 +v 0.303146 0.063710 -1.514404 +v 0.303146 0.777864 -1.327374 +v 0.251926 0.068142 -1.617266 +v 0.251926 0.627846 -1.468171 +v 0.214030 0.069637 -1.669251 +v 0.214030 0.545147 -1.542584 +v 0.267651 0.098661 2.312539 +v 0.285278 0.534732 2.304053 +v 0.267651 0.099883 -0.001090 +v 0.285278 0.533506 -0.000044 +v 0.293394 0.276088 -0.002001 +v 0.293394 0.277307 2.304053 +v 0.293394 0.404797 -0.001023 +v 0.293394 0.406020 2.304053 +v 0.262294 0.762169 -1.000000 +v 0.131147 0.762169 -1.000000 +v 0.262294 0.762169 -1.200000 +v 0.262294 0.962169 -1.200000 +v 0.131147 0.962169 -1.200000 +v 0.262294 0.962169 -1.085338 +v 0.262294 0.876831 -1.000000 +v 0.131147 0.762169 -1.200000 +v 0.131147 0.962169 -1.085338 +v 0.131147 0.876831 -1.000000 +v 0.125075 0.876831 -1.000000 +v 0.125075 0.762169 -1.200000 +v 0.125075 0.762169 -1.000000 +v 0.125075 0.882169 -1.200000 +v 0.125075 0.882169 -1.085338 +v -0.262294 0.762169 -1.000000 +v -0.131147 0.762169 -1.000000 +v -0.262294 0.762169 -1.200000 +v -0.262294 0.962169 -1.200000 +v -0.131147 0.962169 -1.200000 +v -0.262294 0.962169 -1.085338 +v -0.262294 0.876831 -1.000000 +v -0.131147 0.762169 -1.200000 +v -0.131147 0.962169 -1.085338 +v -0.131147 0.876831 -1.000000 +v -0.125075 0.876831 -1.000000 +v -0.125075 0.762169 -1.200000 +v -0.125075 0.762169 -1.000000 +v -0.125075 0.882169 -1.200000 +v -0.125075 0.882169 -1.085338 +v -0.303146 0.085577 -0.001710 +v -0.303146 0.872109 0.004624 +v -0.303146 0.081354 -0.731230 +v -0.303146 0.862907 -0.711023 +v -0.303146 0.080847 -0.856947 +v -0.303146 0.822177 -0.800855 +v -0.303146 0.075826 -1.072472 +v -0.303146 0.796075 -0.891782 +v -0.303146 0.073710 -1.163270 +v -0.303146 0.787864 -0.976240 +v -0.303146 0.063710 -1.514404 +v -0.303146 0.777864 -1.327374 +v -0.251926 0.068142 -1.617266 +v -0.251926 0.627846 -1.468171 +v -0.214030 0.069637 -1.669251 +v -0.214030 0.545147 -1.542584 +v -0.267651 0.098661 2.312539 +v -0.285278 0.534732 2.304053 +v -0.267651 0.099883 -0.001090 +v -0.285278 0.533506 -0.000044 +v 0.000000 0.065712 -0.002312 +v 0.000000 0.533506 -0.000044 +v 0.000000 0.065712 2.312539 +v 0.000000 0.534732 2.304053 +v -0.293394 0.276088 -0.002001 +v -0.293394 0.277307 2.304053 +v 0.000000 0.277307 2.304053 +v 0.000000 0.276088 -0.002001 +v -0.293394 0.404797 -0.001023 +v -0.293394 0.406020 2.304053 +v 0.000000 0.406020 2.304053 +v 0.000000 0.404797 -0.001023 +v 0.000000 0.081354 -0.731230 +v 0.000000 0.862907 -0.711023 +v 0.000000 0.085577 -0.001710 +v 0.000000 0.872109 0.004624 +v 0.000000 0.080847 -0.856947 +v 0.000000 0.822177 -0.800855 +v 0.000000 0.075826 -1.072472 +v 0.000000 0.796075 -0.891782 +v 0.000000 0.073710 -1.163270 +v 0.000000 0.787864 -0.976240 +v 0.000000 0.063710 -1.514404 +v 0.000000 0.777864 -1.327374 +v 0.000000 0.068142 -1.617266 +v 0.000000 0.627846 -1.468171 +v 0.000000 0.069637 -1.669251 +v 0.000000 0.545147 -1.542584 +v -0.262294 0.762169 -1.000000 +v -0.131147 0.762169 -1.000000 +v -0.262294 0.762169 -1.200000 +v -0.262294 0.962169 -1.200000 +v -0.131147 0.962169 -1.200000 +v -0.262294 0.962169 -1.085338 +v -0.262294 0.876831 -1.000000 +v -0.131147 0.762169 -1.200000 +v -0.131147 0.962169 -1.085338 +v -0.131147 0.876831 -1.000000 +v -0.125075 0.876831 -1.000000 +v -0.125075 0.762169 -1.200000 +v -0.125075 0.762169 -1.000000 +v -0.125075 0.882169 -1.200000 +v -0.125075 0.882169 -1.085338 +v 0.262294 0.762169 -1.000000 +v 0.131147 0.762169 -1.000000 +v 0.262294 0.762169 -1.200000 +v 0.262294 0.962169 -1.200000 +v 0.000000 0.762169 -1.200000 +v 0.000000 0.878055 -1.200000 +v 0.000000 0.762169 -1.000000 +v 0.131147 0.962169 -1.200000 +v 0.262294 0.962169 -1.085338 +v 0.262294 0.876831 -1.000000 +v 0.000000 0.876831 -1.000000 +v 0.000000 0.878055 -1.085338 +v 0.131147 0.762169 -1.200000 +v 0.131147 0.962169 -1.085338 +v 0.131147 0.876831 -1.000000 +v 0.125075 0.876831 -1.000000 +v 0.125075 0.762169 -1.200000 +v 0.125075 0.762169 -1.000000 +v 0.125075 0.882169 -1.200000 +v 0.125075 0.882169 -1.085338 +vt 0.375000 0.500000 +vt 0.625000 0.500000 +vt 0.625000 0.750000 +vt 0.375000 0.750000 +vt 0.250000 0.750000 +vt 0.750000 0.500000 +vt 0.625000 0.375000 +vt 0.562500 0.375000 +vt 0.562500 0.750000 +vt 0.750000 0.750000 +vt 0.625000 0.875000 +vt 0.562500 0.875000 +vt 0.500000 0.750000 +vt 0.500000 0.875000 +vt 0.500000 0.500000 +vt 0.500000 0.375000 +vt 0.562500 0.500000 +vt 0.250000 0.500000 +vt 0.375000 0.875000 +vt 0.625000 0.437500 +vt 0.518327 0.815394 +vt 0.518327 0.875000 +vt 0.312500 0.750000 +vt 0.625000 0.643327 +vt 0.518327 0.750000 +vt 0.687500 0.500000 +vt 0.687500 0.643327 +vt 0.750000 0.643327 +vt 0.690394 0.750000 +vt 0.690394 0.643327 +vt 0.687500 0.750000 +vt 0.312500 0.500000 +vt 0.309606 0.750000 +vt 0.518327 0.812500 +vt 0.375000 0.812500 +vt 0.625000 0.434606 +vt 0.375000 0.437500 +vt 0.375000 0.434606 +vt 0.309606 0.500000 +vt 0.690394 0.500000 +vt 0.375000 0.815394 +vt 0.375000 0.375000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 -1.000000 0.004900 +vn 0.000000 -1.000000 0.005800 +vn 0.000000 0.976100 -0.217500 +vn 0.000000 0.938500 -0.345400 +vn 0.000000 0.982300 -0.187100 +vn 0.000000 0.998000 -0.062700 +vn 0.000000 0.999600 -0.028500 +vn 0.962800 0.069400 -0.261100 +vn 0.843300 0.138300 -0.519300 +vn 0.873100 0.124000 -0.471400 +vn 0.994200 0.027300 -0.104300 +vn 0.000000 0.676700 -0.736300 +vn 0.000000 0.678100 -0.735000 +vn 0.000000 0.496300 -0.868200 +vn 0.000000 0.684300 -0.729200 +vn 0.000000 0.476400 -0.879200 +vn 0.000000 0.257400 -0.966300 +vn 0.800500 0.154300 -0.579100 +vn 0.000000 0.007600 -1.000000 +vn 0.998000 0.062900 -0.000000 +vn 0.999500 0.031500 -0.000000 +vn 0.126300 -0.992000 -0.000000 +vn 0.122200 -0.992500 -0.000500 +vn 0.000000 -1.000000 -0.000500 +vn 0.000000 1.000000 -0.000500 +vn 0.000000 0.000000 1.000000 +vn -0.001900 0.044600 0.999000 +vn 0.000000 0.022600 0.999700 +vn 0.000000 0.021400 0.999800 +vn 0.989500 -0.144500 0.000100 +vn 0.997400 -0.072600 0.000000 +vn 0.000000 0.003300 -1.000000 +vn 0.000000 0.001500 -1.000000 +vn 0.001700 -0.002600 -1.000000 +vn 0.999500 0.031300 -0.000000 +vn 0.000000 -0.999400 -0.035900 +vn 0.000000 -0.999600 -0.028700 +vn 0.000000 -1.000000 -0.007300 +vn 0.000000 -0.999300 -0.038500 +vn 0.000000 -0.999700 0.025900 +vn 0.000000 -1.000000 -0.001100 +vn 0.000000 -0.999700 0.023300 +vn 0.000000 -0.999900 0.013700 +vn 0.000000 0.999900 -0.012900 +vn 0.000000 -0.008100 1.000000 +vn -0.000000 0.000000 -1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn -0.022700 0.999600 0.016400 +vn 0.000000 0.999900 0.014300 +vn -0.020300 0.998800 0.044100 +vn -0.032900 0.999500 0.000000 +vn -0.032900 0.999000 0.031200 +vn 0.000000 0.707100 0.707100 +vn -0.997100 0.075700 0.000000 +vn -0.994400 0.097600 0.039700 +vn -0.996800 0.075700 0.025200 +vn 0.000000 0.998000 0.062400 +vn -0.420100 0.903400 0.086400 +vn -1.000000 0.000000 0.000000 +vn 0.020300 0.998800 0.044100 +vn 0.022700 0.999600 0.016400 +vn 0.032900 0.999000 0.031200 +vn 0.032900 0.999500 0.000000 +vn 0.996800 0.075700 0.025200 +vn 0.994400 0.097600 0.039700 +vn 0.997100 0.075700 0.000000 +vn 0.420100 0.903400 0.086400 +vn -0.873100 0.124000 -0.471400 +vn -0.843300 0.138300 -0.519300 +vn -0.962800 0.069400 -0.261100 +vn -0.994200 0.027300 -0.104300 +vn -0.800500 0.154300 -0.579100 +vn -0.999500 0.031500 -0.000000 +vn -0.998000 0.062900 -0.000000 +vn -0.122200 -0.992500 -0.000500 +vn -0.126300 -0.992000 -0.000000 +vn 0.001900 0.044600 0.999000 +vn 0.000000 0.040100 0.999200 +vn -0.989500 -0.144500 0.000100 +vn -0.989800 -0.142600 -0.000100 +vn -0.997400 -0.072600 -0.000000 +vn -0.001700 -0.002600 -1.000000 +vn -0.999500 0.031300 -0.000000 +vn 0.989800 -0.142600 -0.000100 +s 1 +f 396/191/334 398/191/334 399/192/334 +f 397/192/334 395/193/334 394/194/334 +f 396/191/335 394/194/336 482/195/336 +f 398/191/334 400/191/334 401/192/334 +f 397/192/337 399/192/338 485/196/338 +f 401/192/339 403/192/340 489/196/340 +f 399/192/338 401/192/339 487/196/339 +f 403/192/340 405/192/341 491/196/341 +f 400/191/334 402/191/334 403/192/334 +f 404/191/342 406/191/343 407/192/344 +f 402/191/334 404/191/342 405/192/345 +f 493/196/346 407/192/347 409/192/348 +f 491/196/349 405/192/349 407/192/347 +f 495/197/350 409/192/348 408/191/351 +f 406/191/343 408/191/352 409/192/352 +f 479/198/353 469/197/353 413/192/353 +f 413/192/354 411/193/354 417/199/355 +f 412/191/356 410/194/357 470/195/358 +f 469/196/359 471/200/359 411/193/359 +f 411/193/360 471/201/360 478/202/360 +f 410/194/361 415/203/362 474/204/363 +f 412/191/364 414/205/365 415/203/365 +f 475/206/366 414/205/367 412/191/368 +f 417/199/360 478/202/360 474/204/363 +f 416/207/369 417/199/355 415/203/365 +f 479/198/353 416/207/353 414/205/367 +f 492/208/370 494/208/371 408/191/371 +f 490/208/372 492/208/370 406/191/373 +f 488/208/374 490/208/372 404/191/375 +f 486/208/376 488/208/374 402/191/374 +f 484/208/377 486/208/376 400/191/376 +f 480/208/335 484/208/377 398/191/377 +f 481/196/337 483/200/378 395/193/378 +f 395/193/379 483/201/379 482/209/379 +f 422/210/380 421/192/380 420/191/380 +f 428/211/360 521/212/360 517/209/360 +f 420/191/381 418/194/381 419/213/381 +f 423/214/334 424/215/334 420/191/334 +f 422/216/382 426/217/382 423/214/382 +f 522/218/383 521/200/384 428/219/385 +f 516/196/386 522/218/383 432/220/387 +f 426/217/388 427/221/388 424/193/388 +f 425/222/381 419/213/381 430/223/381 +f 424/215/360 427/224/360 419/225/360 +f 431/226/380 422/210/380 425/227/380 +f 516/197/380 431/226/380 429/228/380 +f 429/229/381 430/223/381 517/195/381 +f 431/230/389 432/220/390 426/217/391 +f 432/220/390 428/219/392 427/221/393 +f 427/224/360 428/211/360 430/231/360 +f 435/191/380 436/192/380 437/210/380 +f 517/209/360 521/212/360 443/211/360 +f 434/213/381 433/194/381 435/191/381 +f 439/215/394 438/214/394 435/191/394 +f 438/214/382 441/217/382 437/216/382 +f 443/219/395 521/200/384 522/218/396 +f 447/220/397 522/218/396 516/196/398 +f 439/193/388 442/221/388 441/217/388 +f 445/223/381 434/213/381 440/222/381 +f 434/225/360 442/224/360 439/215/360 +f 440/227/380 437/210/380 446/226/380 +f 444/228/380 446/226/380 516/197/380 +f 517/195/381 445/223/381 444/229/381 +f 441/217/399 447/220/400 446/230/401 +f 442/221/402 443/219/392 447/220/400 +f 445/231/360 443/211/360 442/224/360 +f 453/192/394 452/191/394 450/191/394 +f 448/194/394 449/193/394 451/192/394 +f 482/195/336 448/194/336 450/191/335 +f 455/192/394 454/191/394 452/191/394 +f 485/196/338 453/192/338 451/192/337 +f 489/196/340 457/192/340 455/192/339 +f 487/196/339 455/192/339 453/192/338 +f 491/196/341 459/192/341 457/192/340 +f 457/192/394 456/191/394 454/191/394 +f 461/192/403 460/191/404 458/191/405 +f 459/192/406 458/191/405 456/191/394 +f 493/196/346 495/196/350 463/192/348 +f 491/196/349 493/196/346 461/192/347 +f 462/191/351 463/192/348 495/197/350 +f 463/192/407 462/191/407 460/191/404 +f 479/198/353 476/207/353 467/192/353 +f 477/199/408 465/193/409 467/192/409 +f 470/195/358 464/194/410 466/191/411 +f 465/193/359 471/200/359 469/196/359 +f 478/202/360 471/201/360 465/193/360 +f 464/194/412 470/209/413 474/204/363 +f 466/191/414 464/194/415 473/203/416 +f 466/191/417 472/205/367 475/206/366 +f 474/204/363 478/202/360 477/199/360 +f 473/203/416 477/199/408 476/207/418 +f 472/205/367 476/207/353 479/198/353 +f 462/191/371 494/208/371 492/208/370 +f 460/191/373 492/208/370 490/208/372 +f 458/191/375 490/208/372 488/208/374 +f 456/191/374 488/208/374 486/208/376 +f 454/191/376 486/208/376 484/208/377 +f 452/191/377 484/208/377 480/208/335 +f 449/193/378 483/200/378 481/196/337 +f 482/209/379 483/201/379 449/193/379 +f 498/191/380 499/192/380 500/210/380 +f 517/209/360 521/212/360 506/211/360 +f 497/213/381 496/194/381 498/191/381 +f 502/215/394 501/214/394 498/191/394 +f 501/214/382 504/217/382 500/216/382 +f 506/219/395 521/200/384 522/218/396 +f 510/220/397 522/218/396 516/196/398 +f 502/193/388 505/221/388 504/217/388 +f 508/223/381 497/213/381 503/222/381 +f 497/225/360 505/224/360 502/215/360 +f 503/227/380 500/210/380 509/226/380 +f 507/228/380 509/226/380 516/197/380 +f 517/195/381 508/223/381 507/229/381 +f 504/217/399 510/220/400 509/230/401 +f 505/221/402 506/219/392 510/220/400 +f 508/231/360 506/211/360 505/224/360 +f 518/210/380 514/192/380 513/191/380 +f 526/211/360 521/212/360 517/209/360 +f 513/191/381 511/194/381 512/213/381 +f 519/214/334 520/215/334 513/191/334 +f 518/216/382 524/217/382 519/214/382 +f 522/218/383 521/200/384 526/219/385 +f 516/196/386 522/218/383 530/220/387 +f 524/217/388 525/221/388 520/193/388 +f 523/222/381 512/213/381 528/223/381 +f 520/215/360 525/224/360 512/225/360 +f 529/226/380 518/210/380 523/227/380 +f 516/197/380 529/226/380 527/228/380 +f 527/229/381 528/223/381 517/195/381 +f 529/230/389 530/220/390 524/217/391 +f 530/220/390 526/219/392 525/221/393 +f 525/224/360 526/211/360 528/231/360 +f 397/192/334 396/191/334 399/192/334 +f 396/191/334 397/192/334 394/194/334 +f 480/208/335 396/191/335 482/195/336 +f 399/192/334 398/191/334 401/192/334 +f 481/196/337 397/192/337 485/196/338 +f 487/196/339 401/192/339 489/196/340 +f 485/196/338 399/192/338 487/196/339 +f 489/196/340 403/192/340 491/196/341 +f 401/192/334 400/191/334 403/192/334 +f 405/192/345 404/191/342 407/192/344 +f 403/192/334 402/191/334 405/192/345 +f 495/196/350 493/196/346 409/192/348 +f 493/196/346 491/196/349 407/192/347 +f 494/232/351 495/197/350 408/191/351 +f 407/192/344 406/191/343 409/192/352 +f 416/207/353 479/198/353 413/192/353 +f 416/207/369 413/192/354 417/199/355 +f 468/208/381 412/191/356 470/195/358 +f 413/192/359 469/196/359 411/193/359 +f 417/199/360 411/193/360 478/202/360 +f 470/209/413 410/194/361 474/204/363 +f 410/194/419 412/191/364 415/203/365 +f 468/232/367 475/206/366 412/191/368 +f 415/203/362 417/199/360 474/204/363 +f 414/205/365 416/207/369 415/203/365 +f 475/206/366 479/198/353 414/205/367 +f 406/191/373 492/208/370 408/191/371 +f 404/191/375 490/208/372 406/191/373 +f 402/191/374 488/208/374 404/191/375 +f 400/191/376 486/208/376 402/191/374 +f 398/191/377 484/208/377 400/191/376 +f 396/191/335 480/208/335 398/191/377 +f 397/192/337 481/196/337 395/193/378 +f 394/194/379 395/193/379 482/209/379 +f 425/227/380 422/210/380 420/191/380 +f 430/231/360 428/211/360 517/209/360 +f 425/222/381 420/191/381 419/213/381 +f 418/194/334 420/191/334 424/215/334 +f 421/192/334 423/214/334 420/191/334 +f 421/192/382 422/216/382 423/214/382 +f 432/220/387 522/218/383 428/219/385 +f 431/230/386 516/196/386 432/220/387 +f 423/214/388 426/217/388 424/193/388 +f 429/229/381 425/222/381 430/223/381 +f 418/194/360 424/215/360 419/225/360 +f 429/228/380 431/226/380 425/227/380 +f 515/232/380 516/197/380 429/228/380 +f 515/208/381 429/229/381 517/195/381 +f 422/216/389 431/230/389 426/217/391 +f 426/217/391 432/220/390 427/221/393 +f 419/225/360 427/224/360 430/231/360 +f 440/227/380 435/191/380 437/210/380 +f 445/231/360 517/209/360 443/211/360 +f 440/222/381 434/213/381 435/191/381 +f 436/192/394 435/191/394 438/214/394 +f 433/194/394 439/215/394 435/191/394 +f 436/192/382 438/214/382 437/216/382 +f 447/220/397 443/219/395 522/218/396 +f 446/230/398 447/220/397 516/196/398 +f 438/214/388 439/193/388 441/217/388 +f 444/229/381 445/223/381 440/222/381 +f 433/194/360 434/225/360 439/215/360 +f 444/228/380 440/227/380 446/226/380 +f 515/232/380 444/228/380 516/197/380 +f 515/208/381 517/195/381 444/229/381 +f 437/216/401 441/217/399 446/230/401 +f 441/217/399 442/221/402 447/220/400 +f 434/225/360 445/231/360 442/224/360 +f 451/192/394 453/192/394 450/191/394 +f 450/191/394 448/194/394 451/192/394 +f 480/208/335 482/195/336 450/191/335 +f 453/192/394 455/192/394 452/191/394 +f 481/196/337 485/196/338 451/192/337 +f 487/196/339 489/196/340 455/192/339 +f 485/196/338 487/196/339 453/192/338 +f 489/196/340 491/196/341 457/192/340 +f 455/192/394 457/192/394 454/191/394 +f 459/192/406 461/192/403 458/191/405 +f 457/192/394 459/192/406 456/191/394 +f 461/192/347 493/196/346 463/192/348 +f 459/192/349 491/196/349 461/192/347 +f 494/232/351 462/191/351 495/197/350 +f 461/192/403 463/192/407 460/191/404 +f 469/197/353 479/198/353 467/192/353 +f 476/207/418 477/199/408 467/192/409 +f 468/208/381 470/195/358 466/191/411 +f 467/192/359 465/193/359 469/196/359 +f 477/199/360 478/202/360 465/193/360 +f 473/203/362 464/194/412 474/204/363 +f 472/205/416 466/191/414 473/203/416 +f 468/232/367 466/191/417 475/206/366 +f 473/203/362 474/204/363 477/199/360 +f 472/205/416 473/203/416 476/207/418 +f 475/206/366 472/205/367 479/198/353 +f 460/191/373 462/191/371 492/208/370 +f 458/191/375 460/191/373 490/208/372 +f 456/191/374 458/191/375 488/208/374 +f 454/191/376 456/191/374 486/208/376 +f 452/191/377 454/191/376 484/208/377 +f 450/191/335 452/191/377 480/208/335 +f 451/192/337 449/193/378 481/196/337 +f 448/194/379 482/209/379 449/193/379 +f 503/227/380 498/191/380 500/210/380 +f 508/231/360 517/209/360 506/211/360 +f 503/222/381 497/213/381 498/191/381 +f 499/192/394 498/191/394 501/214/394 +f 496/194/394 502/215/394 498/191/394 +f 499/192/382 501/214/382 500/216/382 +f 510/220/397 506/219/395 522/218/396 +f 509/230/398 510/220/397 516/196/398 +f 501/214/388 502/193/388 504/217/388 +f 507/229/381 508/223/381 503/222/381 +f 496/194/360 497/225/360 502/215/360 +f 507/228/380 503/227/380 509/226/380 +f 515/232/380 507/228/380 516/197/380 +f 515/208/381 517/195/381 507/229/381 +f 500/216/401 504/217/399 509/230/401 +f 504/217/399 505/221/402 510/220/400 +f 497/225/360 508/231/360 505/224/360 +f 523/227/380 518/210/380 513/191/380 +f 528/231/360 526/211/360 517/209/360 +f 523/222/381 513/191/381 512/213/381 +f 511/194/334 513/191/334 520/215/334 +f 514/192/334 519/214/334 513/191/334 +f 514/192/382 518/216/382 519/214/382 +f 530/220/387 522/218/383 526/219/385 +f 529/230/386 516/196/386 530/220/387 +f 519/214/388 524/217/388 520/193/388 +f 527/229/381 523/222/381 528/223/381 +f 511/194/360 520/215/360 512/225/360 +f 527/228/380 529/226/380 523/227/380 +f 515/232/380 516/197/380 527/228/380 +f 515/208/381 527/229/381 517/195/381 +f 518/216/389 529/230/389 524/217/391 +f 524/217/391 530/220/390 525/221/393 +f 512/225/360 525/224/360 528/231/360 diff --git a/assets/hbm/models/weapons/hk69.obj b/assets/hbm/models/weapons/hk69.obj index 10ed34d50..8f464cfcc 100644 --- a/assets/hbm/models/weapons/hk69.obj +++ b/assets/hbm/models/weapons/hk69.obj @@ -97,90 +97,36 @@ v 0.025000 0.450000 -0.585000 v 0.025000 0.450000 -0.535000 v -0.025000 0.450000 -0.585000 v -0.025000 0.450000 -0.535000 -vt 0.760870 0.130435 -vt 0.456522 0.217391 -vt 0.326087 0.130435 vt 0.108696 0.891304 vt 0.239130 0.891304 vt 0.239130 0.956522 -vt 0.326087 0.391304 -vt 0.456522 0.304348 -vt 0.760870 0.391304 -vt 0.239130 0.217391 -vt 0.326087 0.217391 -vt 0.326087 0.304348 -vt 0.760870 0.217391 -vt 0.760870 0.304348 -vt 0.760870 0.043478 -vt 0.108696 0.586957 -vt 0.108696 0.521739 -vt 0.760870 0.521739 -vt 0.108696 0.456522 -vt 0.760870 0.456522 vt 0.217391 0.847826 vt 0.130435 0.847826 vt 0.130435 0.782609 -vt 0.108696 0.391304 -vt 0.108696 0.782609 -vt 0.108696 0.717391 -vt 0.760870 0.717391 vt 0.007716 0.472674 vt 0.007716 0.419018 vt 0.100650 0.419018 -vt 0.108696 0.652174 -vt 0.760870 0.586957 -vt 0.760870 0.652174 vt 0.217391 0.978261 vt 0.130435 0.978261 vt 0.108696 0.956522 -vt 0.760870 0.434783 -vt 0.826087 0.434783 -vt 0.826087 0.543478 -vt 0.760870 0.413043 -vt 0.826087 0.413043 -vt 0.826087 0.347826 -vt 0.826087 0.304348 -vt 0.760870 0.347826 -vt 0.826087 0.239130 -vt 0.826087 0.739130 -vt 0.826087 0.847826 -vt 0.760870 0.847826 -vt 0.760870 0.673913 -vt 0.826087 0.673913 -vt 0.760870 0.630435 -vt 0.826087 0.630435 -vt 0.760870 0.565217 -vt 0.826087 0.565217 vt 0.369565 0.891304 vt 0.260870 0.847826 vt 0.347826 0.782609 vt 0.347826 0.847826 -vt 0.847826 0.413043 -vt 0.847826 0.391304 -vt 0.934783 0.391304 +vt 0.826087 0.413043 +vt 0.826087 0.239130 vt 0.847826 0.326087 vt 0.934783 0.326087 -vt 0.847826 0.239130 vt 0.956522 0.239130 vt 0.956522 0.413043 vt 0.000063 0.000063 vt 0.086957 0.000000 vt 0.086957 0.217391 -vt 0.130435 0.217391 +vt 0.130435 0.043478 vt 0.130435 0.173913 +vt 0.260870 0.217391 vt 0.217391 0.173913 vt 0.217391 0.043478 -vt 0.130435 0.043478 -vt 0.130435 0.000000 -vt 0.260870 0.217391 -vt 0.152174 0.304348 -vt -0.000000 0.304348 -vt -0.000000 0.260870 -vt 0.152174 0.260870 -vt -0.000000 0.217391 -vt -0.000000 0.347826 -vt -0.000000 0.391304 -vt 0.152174 0.347826 vt 0.869565 0.478261 vt 0.869565 0.456522 vt 0.913043 0.456522 @@ -204,7 +150,9 @@ vt 0.978261 0.239130 vt 0.913043 0.239130 vt 0.065217 0.608696 vt 0.108696 0.608696 +vt 0.108696 0.652174 vt 0.065217 0.652174 +vt 0.108696 0.717391 vt 0.065217 0.543478 vt 0.000000 0.500000 vt 0.021739 0.500000 @@ -215,183 +163,278 @@ vt 0.043478 0.521739 vt 0.347826 0.978261 vt 0.260870 0.978261 vt 0.369565 0.956522 +vt 0.217391 0.782609 +vt 0.100650 0.472674 +vt 0.054183 0.499502 +vt 0.054183 0.392190 +vt 0.260870 0.782609 +vt 0.847826 0.391304 +vt 0.934783 0.391304 +vt 0.000000 0.217391 +vt 0.260870 -0.000000 +vt 0.913043 0.478261 +vt 0.869565 0.043478 +vt 0.760870 0.239130 +vt 0.065217 0.717391 +vt 0.108696 0.543478 +vt 0.000000 0.521739 +vt 0.760870 0.130435 +vt 0.456522 0.217391 +vt 0.326087 0.130435 +vt 0.326087 0.391304 +vt 0.456522 0.304348 +vt 0.760870 0.391304 +vt 0.239130 0.217391 +vt 0.326087 0.217391 +vt 0.326087 0.304348 +vt 0.760870 0.217391 +vt 0.760870 0.304348 +vt 0.760870 0.043478 +vt 0.108696 0.586957 +vt 0.108696 0.521739 +vt 0.760870 0.521739 +vt 0.108696 0.456522 +vt 0.760870 0.456522 +vt 0.108696 0.391304 +vt 0.108696 0.782609 +vt 0.760870 0.717391 +vt 0.760870 0.586957 +vt 0.760870 0.652174 +vt 0.760870 0.434783 +vt 0.826087 0.434783 +vt 0.826087 0.543478 +vt 0.760870 0.413043 +vt 0.826087 0.347826 +vt 0.826087 0.304348 +vt 0.760870 0.347826 +vt 0.826087 0.739130 +vt 0.826087 0.847826 +vt 0.760870 0.847826 +vt 0.760870 0.673913 +vt 0.826087 0.673913 +vt 0.760870 0.630435 +vt 0.826087 0.630435 +vt 0.760870 0.565217 +vt 0.826087 0.565217 +vt 0.847826 0.413043 +vt 0.847826 0.239130 +vt 0.130435 0.217391 +vt 0.130435 0.000000 +vt 0.152174 0.304348 +vt -0.000000 0.304348 +vt -0.000000 0.260870 +vt 0.152174 0.260870 +vt -0.000000 0.347826 +vt -0.000000 0.391304 +vt 0.152174 0.347826 vt 0.326087 0.173913 vt 0.326087 0.347826 vt 0.239130 0.304348 vt 0.326087 0.043478 -vt 0.217391 0.782609 vt 0.760870 0.782609 -vt 0.100650 0.472674 -vt 0.054183 0.499502 -vt 0.054183 0.392190 vt 0.760870 0.543478 -vt 0.760870 0.239130 vt 0.760870 0.739130 -vt 0.260870 0.782609 vt 0.934783 0.413043 vt 0.934783 0.239130 vt 0.217391 0.217391 vt 0.217391 -0.000000 -vt 0.260870 -0.000000 vt 0.152174 0.217391 vt 0.152174 0.391304 -vt 0.913043 0.478261 -vt 0.869565 0.043478 -vt 0.065217 0.717391 -vt 0.108696 0.543478 -vt 0.000000 0.521739 -vn -1.000000 -0.000000 0.000000 vn 0.000000 0.000000 1.000000 -vn 1.000000 0.000000 0.000000 -vn 0.000000 -1.000000 0.000000 -vn 0.000000 1.000000 0.000000 -vn 0.000000 -0.948700 0.316200 -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.894400 0.447200 0.000000 -vn 0.970100 -0.242500 0.000000 -vn -0.970100 -0.242500 0.000000 -vn -0.894400 0.447200 0.000000 vn 0.000000 0.000000 -1.000000 -vn 0.000000 0.768200 -0.640200 -vn 0.000000 -0.287300 -0.957800 -vn 0.000000 0.707100 -0.707100 +vn 1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 vn 0.000000 -0.707100 -0.707100 -vn 0.707100 0.707100 -0.000000 -vn 0.707100 -0.707100 0.000000 -vn -0.707100 0.707100 -0.000000 -vn -0.707100 -0.707100 0.000000 vn 0.000000 0.707100 0.707100 +vn 0.000000 -1.000000 0.000000 vn 0.000000 -0.274700 0.961500 vn 0.000000 0.274700 -0.961500 +vn 0.000000 1.000000 0.000000 +vn 0.894400 0.447200 0.000000 +vn -0.894400 0.447200 0.000000 +vn -0.707100 0.707100 0.000000 +vn -0.672700 -0.730300 0.118500 +vn -0.577300 0.577300 0.577300 +vn 0.577300 0.577300 0.577300 +vn 0.672700 -0.730300 0.118500 +vn 0.707100 0.707100 0.000000 +vn -0.596200 -0.469400 0.651300 +vn 0.596200 -0.469400 0.651300 +vn -0.707100 -0.707100 0.000000 +vn 0.707100 -0.707100 0.000000 +vn 0.000000 0.792400 0.610000 +vn 0.686200 0.396200 0.610000 +vn 0.866000 0.500000 0.000000 +vn 0.686200 -0.396200 0.610000 +vn 0.866000 -0.500000 0.000000 +vn 0.000000 -0.792400 0.610000 +vn -0.686200 -0.396200 0.610000 +vn -0.866000 -0.500000 0.000000 +vn -0.686200 0.396200 0.610000 +vn -0.866000 0.500000 0.000000 +vn 0.418300 0.676800 0.605700 +vn 0.418300 0.676800 -0.605700 +vn -0.418300 0.676800 -0.605700 +vn 0.732100 0.172800 0.658900 +vn 0.732100 0.172800 -0.658900 +vn 0.727100 -0.089500 -0.680600 +vn 0.672300 -0.082700 -0.735600 +vn 0.727100 -0.089500 0.680600 +vn 0.577300 -0.577300 -0.577300 +vn 0.672300 -0.082700 0.735600 +vn -0.577300 -0.577300 -0.577300 +vn 0.577300 -0.577300 0.577300 +vn -0.672300 -0.082700 0.735600 +vn -0.672300 -0.082700 -0.735600 +vn -0.727100 -0.089500 0.680600 +vn -0.727100 -0.089500 -0.680600 +vn -0.732100 0.172800 0.658900 +vn -0.732100 0.172800 -0.658900 +vn 0.487100 0.670900 -0.559100 +vn 0.622900 0.331800 -0.708400 +vn -0.622900 0.331800 -0.708400 +vn 0.675800 -0.107000 -0.729200 +vn -0.675800 -0.107000 -0.729200 +vn 0.182400 -0.282500 -0.941700 +vn 0.546900 0.773400 0.320400 +vn 0.630200 0.297100 -0.717300 +vn -0.630200 0.297100 -0.717300 +vn -0.630200 -0.297100 -0.717300 +vn 0.630200 -0.297100 -0.717300 +vn 0.546900 -0.773400 0.320400 +vn -0.418300 0.676800 0.605700 +vn -0.577300 -0.577300 0.577300 +vn -0.487100 0.670900 -0.559100 +vn -0.182400 -0.282500 -0.941700 +vn -0.546900 0.773400 0.320400 +vn -0.546900 -0.773400 0.320400 s off -f 4/1/1 9/2/1 2/3/1 -f 29/4/2 30/5/2 32/6/2 -f 6/7/3 10/8/3 8/9/3 -f 2/10/2 1/11/2 5/12/2 -f 3/13/4 7/14/4 10/8/4 -f 8/15/5 4/1/5 2/3/5 -f 9/2/6 10/8/6 5/12/6 -f 14/16/7 16/17/7 15/18/7 -f 16/17/3 18/19/3 17/20/3 -f 25/21/2 26/22/2 12/23/2 -f 17/20/8 18/19/8 20/24/8 -f 26/22/2 25/21/2 30/5/2 -f 20/25/9 22/26/9 21/27/9 -f 24/28/2 22/29/2 18/30/2 -f 24/31/10 14/16/10 13/32/10 -f 22/26/1 24/31/1 23/33/1 -f 27/34/2 28/35/2 31/36/2 -f 27/37/5 37/38/5 38/39/5 -f 32/40/11 42/41/11 37/38/11 -f 40/42/3 42/41/3 32/40/3 -f 35/43/12 40/42/12 30/44/12 -f 33/45/3 35/43/3 25/14/3 -f 34/46/4 33/47/4 11/48/4 -f 26/49/1 36/50/1 34/46/1 -f 29/51/13 39/52/13 36/50/13 -f 31/53/1 41/54/1 39/52/1 -f 38/39/14 41/54/14 31/53/14 -f 39/55/15 40/5/15 35/56/15 -f 34/57/15 36/58/15 35/56/15 -f 46/59/16 48/60/16 47/61/16 -f 48/60/15 50/62/15 49/63/15 -f 49/63/17 50/62/17 44/64/17 -f 46/41/3 44/45/3 50/62/3 -f 49/63/1 43/65/1 45/66/1 -f 53/67/2 54/68/2 52/69/2 -f 52/70/18 56/71/18 55/72/18 -f 57/73/19 58/74/19 54/75/19 -f 56/71/15 58/74/15 57/73/15 -f 58/74/3 56/71/3 52/69/3 -f 51/76/1 55/72/1 57/73/1 -f 59/77/20 60/78/20 62/79/20 -f 61/80/21 62/79/21 64/81/21 -f 66/82/22 60/78/22 59/77/22 -f 64/83/23 66/82/23 65/84/23 -f 68/85/15 70/86/15 69/87/15 -f 70/86/19 74/88/19 73/89/19 -f 71/90/24 72/91/24 68/85/24 -f 72/92/3 74/93/3 70/86/3 -f 69/87/1 73/94/1 71/95/1 -f 80/96/4 82/97/4 81/98/4 -f 81/99/25 82/97/25 78/100/25 -f 76/101/26 80/96/26 79/102/26 -f 81/103/1 77/104/1 75/105/1 -f 76/101/3 78/100/3 82/97/3 -f 87/106/5 89/107/5 90/31/5 -f 88/108/1 90/31/1 85/26/1 -f 89/107/3 87/106/3 84/109/3 -f 94/110/11 93/111/11 91/112/11 -f 91/112/14 95/113/14 96/114/14 -f 93/115/15 95/112/15 91/111/15 -f 94/115/2 92/113/2 96/112/2 -f 38/116/15 37/117/15 42/6/15 -f 41/118/15 42/6/15 40/5/15 -f 1/119/1 2/3/1 9/2/1 -f 4/1/1 3/13/1 9/2/1 -f 31/36/2 29/4/2 32/6/2 -f 7/14/3 8/9/3 10/8/3 -f 6/7/3 5/120/3 10/8/3 -f 6/121/2 2/10/2 5/12/2 -f 9/2/4 3/13/4 10/8/4 -f 6/122/5 8/15/5 2/3/5 -f 1/11/6 9/2/6 5/12/6 -f 13/32/7 14/16/7 15/18/7 -f 15/18/3 16/17/3 17/20/3 -f 11/123/2 25/21/2 12/23/2 -f 19/9/8 17/20/8 20/24/8 -f 29/4/2 26/22/2 30/5/2 -f 19/124/9 20/25/9 21/27/9 -f 18/30/2 16/125/2 14/126/2 -f 14/126/2 24/28/2 18/30/2 -f 22/29/2 20/127/2 18/30/2 -f 23/33/10 24/31/10 13/32/10 -f 21/27/1 22/26/1 23/33/1 -f 32/6/2 27/34/2 31/36/2 -f 28/128/5 27/37/5 38/39/5 -f 27/37/11 32/40/11 37/38/11 -f 30/44/3 40/42/3 32/40/3 -f 25/14/12 35/43/12 30/44/12 -f 11/129/3 33/45/3 25/14/3 -f 12/130/4 34/46/4 11/48/4 -f 12/130/1 26/49/1 34/46/1 -f 26/49/13 29/51/13 36/50/13 -f 29/51/1 31/53/1 39/52/1 -f 28/128/14 38/39/14 31/53/14 -f 36/58/15 39/55/15 35/56/15 -f 33/131/15 34/57/15 35/56/15 -f 45/132/16 46/59/16 47/61/16 -f 47/61/15 48/60/15 49/63/15 -f 43/133/17 49/63/17 44/64/17 -f 48/60/3 46/41/3 50/62/3 -f 47/61/1 49/63/1 45/66/1 -f 51/81/2 53/67/2 52/69/2 -f 51/134/18 52/70/18 55/72/18 -f 53/135/19 57/73/19 54/75/19 -f 55/72/15 56/71/15 57/73/15 -f 54/68/3 58/74/3 52/69/3 -f 53/136/1 51/76/1 57/73/1 -f 61/80/20 59/77/20 62/79/20 -f 63/137/21 61/80/21 64/81/21 -f 65/84/22 66/82/22 59/77/22 -f 63/138/23 64/83/23 65/84/23 -f 67/139/15 68/85/15 69/87/15 -f 69/87/19 70/86/19 73/89/19 -f 67/139/24 71/90/24 68/85/24 -f 68/85/3 72/92/3 70/86/3 -f 67/139/1 69/87/1 71/95/1 -f 79/140/4 80/96/4 81/98/4 -f 77/129/25 81/99/25 78/100/25 -f 75/105/26 76/101/26 79/102/26 -f 79/102/1 81/103/1 75/105/1 -f 80/96/3 76/101/3 82/97/3 -f 88/108/5 87/106/5 90/31/5 -f 83/141/1 88/108/1 85/26/1 -f 86/142/3 89/107/3 84/109/3 -f 92/143/11 94/110/11 91/112/11 -f 92/143/14 91/112/14 96/114/14 -f 41/118/15 38/116/15 42/6/15 -f 39/55/15 41/118/15 40/5/15 +f 29/1/1 30/2/1 32/3/1 +f 25/4/1 26/5/1 12/6/1 +f 26/5/1 25/4/1 30/2/1 +f 24/7/1 22/8/1 18/9/1 +f 27/10/1 28/11/1 31/12/1 +f 39/13/2 40/2/2 35/14/2 +f 34/15/2 36/16/2 35/14/2 +f 46/17/3 44/18/3 50/19/3 +f 49/20/4 43/21/4 45/22/4 +f 53/23/1 54/24/1 52/25/1 +f 58/26/3 56/27/3 52/25/3 +f 51/28/4 55/29/4 57/30/4 +f 68/31/2 70/32/2 69/33/2 +f 70/32/5 74/34/5 73/35/5 +f 71/36/6 72/37/6 68/31/6 +f 72/38/3 74/39/3 70/32/3 +f 69/33/4 73/40/4 71/41/4 +f 80/42/7 82/43/7 81/44/7 +f 81/45/8 82/43/8 78/46/8 +f 76/47/9 80/42/9 79/48/9 +f 81/49/4 77/50/4 75/51/4 +f 76/47/3 78/46/3 82/43/3 +f 87/52/10 89/53/10 90/54/10 +f 88/55/4 90/54/4 85/56/4 +f 89/53/3 87/52/3 84/57/3 +f 94/58/11 93/59/11 91/60/11 +f 91/60/12 95/61/12 96/62/12 +f 93/63/2 95/60/2 91/59/2 +f 94/63/1 92/61/1 96/60/1 +f 38/64/2 37/65/2 42/3/2 +f 41/66/2 42/3/2 40/2/2 +f 31/12/1 29/1/1 32/3/1 +f 11/67/1 25/4/1 12/6/1 +f 29/1/1 26/5/1 30/2/1 +f 18/9/1 16/68/1 14/69/1 +f 14/69/1 24/7/1 18/9/1 +f 22/8/1 20/70/1 18/9/1 +f 32/3/1 27/10/1 31/12/1 +f 36/16/2 39/13/2 35/14/2 +f 33/71/2 34/15/2 35/14/2 +f 48/72/3 46/17/3 50/19/3 +f 47/73/4 49/20/4 45/22/4 +f 51/74/1 53/23/1 52/25/1 +f 54/24/3 58/26/3 52/25/3 +f 53/75/4 51/28/4 57/30/4 +f 67/76/2 68/31/2 69/33/2 +f 69/33/5 70/32/5 73/35/5 +f 67/76/6 71/36/6 68/31/6 +f 68/31/3 72/38/3 70/32/3 +f 67/76/4 69/33/4 71/41/4 +f 79/77/7 80/42/7 81/44/7 +f 77/78/8 81/45/8 78/46/8 +f 75/51/9 76/47/9 79/48/9 +f 79/48/4 81/49/4 75/51/4 +f 80/42/3 76/47/3 82/43/3 +f 88/55/10 87/52/10 90/54/10 +f 83/79/4 88/55/4 85/56/4 +f 86/80/3 89/53/3 84/57/3 +f 92/81/11 94/58/11 91/60/11 +f 92/81/12 91/60/12 96/62/12 +f 41/66/2 38/64/2 42/3/2 +f 39/13/2 41/66/2 40/2/2 +s 1 +f 4/82/13 9/83/14 2/84/15 +f 6/85/16 10/86/17 8/87/18 +f 2/88/15 1/89/19 5/90/20 +f 3/91/21 7/92/22 10/86/17 +f 8/93/18 4/82/13 2/84/15 +f 9/83/14 10/86/17 5/90/20 +f 14/94/23 16/95/24 15/96/25 +f 16/95/24 18/97/26 17/98/27 +f 17/98/27 18/97/26 20/99/28 +f 20/100/28 22/56/29 21/101/30 +f 24/54/31 14/94/23 13/102/10 +f 22/56/29 24/54/31 23/103/32 +f 27/104/33 37/105/34 38/106/35 +f 32/107/36 42/17/37 37/105/34 +f 40/108/38 42/17/37 32/107/36 +f 35/109/39 40/108/38 30/110/40 +f 33/18/41 35/109/39 25/92/42 +f 34/111/43 33/112/41 11/113/44 +f 26/114/45 36/115/46 34/111/43 +f 29/116/47 39/117/48 36/115/46 +f 31/118/49 41/119/50 39/117/48 +f 38/106/35 41/119/50 31/118/49 +f 46/120/51 48/72/52 47/73/53 +f 48/72/52 50/19/54 49/20/55 +f 49/20/55 50/19/54 44/121/56 +f 52/122/57 56/27/58 55/29/59 +f 57/30/60 58/26/61 54/123/62 +f 56/27/58 58/26/61 57/30/60 +f 59/124/10 60/125/10 62/126/3 +f 61/127/3 62/126/3 64/74/7 +f 66/128/4 60/125/10 59/124/10 +f 64/129/7 66/128/4 65/130/4 +f 1/131/19 2/84/15 9/83/14 +f 4/82/13 3/91/21 9/83/14 +f 7/92/22 8/87/18 10/86/17 +f 6/85/16 5/132/20 10/86/17 +f 6/133/16 2/88/15 5/90/20 +f 9/83/14 3/91/21 10/86/17 +f 6/134/16 8/93/18 2/84/15 +f 1/89/19 9/83/14 5/90/20 +f 13/102/10 14/94/23 15/96/25 +f 15/96/25 16/95/24 17/98/27 +f 19/87/7 17/98/27 20/99/28 +f 19/135/7 20/100/28 21/101/30 +f 23/103/32 24/54/31 13/102/10 +f 21/101/30 22/56/29 23/103/32 +f 28/136/63 27/104/33 38/106/35 +f 27/104/33 32/107/36 37/105/34 +f 30/110/40 40/108/38 32/107/36 +f 25/92/42 35/109/39 30/110/40 +f 11/78/44 33/18/41 25/92/42 +f 12/137/64 34/111/43 11/113/44 +f 12/137/64 26/114/45 34/111/43 +f 26/114/45 29/116/47 36/115/46 +f 29/116/47 31/118/49 39/117/48 +f 28/136/63 38/106/35 31/118/49 +f 45/138/65 46/120/51 47/73/53 +f 47/73/53 48/72/52 49/20/55 +f 43/139/66 49/20/55 44/121/56 +f 51/140/67 52/122/57 55/29/59 +f 53/141/68 57/30/60 54/123/62 +f 55/29/59 56/27/58 57/30/60 +f 61/127/3 59/124/10 62/126/3 +f 63/142/7 61/127/3 64/74/7 +f 65/130/4 66/128/4 59/124/10 +f 63/143/7 64/129/7 65/130/4 diff --git a/assets/hbm/sounds.json b/assets/hbm/sounds.json index 42f36b35b..5f01bde16 100644 --- a/assets/hbm/sounds.json +++ b/assets/hbm/sounds.json @@ -115,6 +115,7 @@ "weapon.boat": {"category": "player", "sounds": [{"name": "weapon/boat", "stream": false}]}, "weapon.hkShoot": {"category": "player", "sounds": [{"name": "weapon/hkShoot", "stream": false}]}, "weapon.hkReload": {"category": "player", "sounds": [{"name": "weapon/hkReload", "stream": false}]}, + "weapon.deagleShoot": {"category": "player", "sounds": [{"name": "weapon/deagleShoot", "stream": false}]}, "weapon.reloadTurret": {"category": "player", "sounds": [{"name": "weapon/reloadTurret", "stream": false}]}, "weapon.switchmode1": {"category": "player", "sounds": [{"name": "weapon/switchmode1", "stream": false}]}, diff --git a/assets/hbm/sounds/weapon/deagleShoot.ogg b/assets/hbm/sounds/weapon/deagleShoot.ogg new file mode 100644 index 000000000..ac87a802d Binary files /dev/null and b/assets/hbm/sounds/weapon/deagleShoot.ogg differ diff --git a/assets/hbm/textures/gui/dfc/gui_emitter.png b/assets/hbm/textures/gui/dfc/gui_emitter.png index 03d9a1bc6..1ab46d3dd 100644 Binary files a/assets/hbm/textures/gui/dfc/gui_emitter.png and b/assets/hbm/textures/gui/dfc/gui_emitter.png differ diff --git a/assets/hbm/textures/gui/fluids2.png b/assets/hbm/textures/gui/fluids2.png index 0eccbddcc..a63500e11 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/items/ammo_44_star.png b/assets/hbm/textures/items/ammo_44_star.png new file mode 100644 index 000000000..626767ec4 Binary files /dev/null and b/assets/hbm/textures/items/ammo_44_star.png differ diff --git a/assets/hbm/textures/items/ammo_50ae_star.png b/assets/hbm/textures/items/ammo_50ae_star.png new file mode 100644 index 000000000..78f6bc437 Binary files /dev/null and b/assets/hbm/textures/items/ammo_50ae_star.png differ diff --git a/assets/hbm/textures/items/ammo_50bmg_star.png b/assets/hbm/textures/items/ammo_50bmg_star.png new file mode 100644 index 000000000..c5432573e Binary files /dev/null and b/assets/hbm/textures/items/ammo_50bmg_star.png differ diff --git a/assets/hbm/textures/items/ammo_5mm_star.png b/assets/hbm/textures/items/ammo_5mm_star.png new file mode 100644 index 000000000..b6a78bdf6 Binary files /dev/null and b/assets/hbm/textures/items/ammo_5mm_star.png differ diff --git a/assets/hbm/textures/blocks/book.png b/assets/hbm/textures/items/book.png similarity index 100% rename from assets/hbm/textures/blocks/book.png rename to assets/hbm/textures/items/book.png diff --git a/assets/hbm/textures/items/book_of_.png b/assets/hbm/textures/items/book_of_.png index b2890e301..2cb7744d3 100644 Binary files a/assets/hbm/textures/items/book_of_.png and b/assets/hbm/textures/items/book_of_.png differ diff --git a/assets/hbm/textures/items/book_of_.png.mcmeta b/assets/hbm/textures/items/book_of_.png.mcmeta deleted file mode 100644 index b84e69f2c..000000000 --- a/assets/hbm/textures/items/book_of_.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation": { - "frametime": 4 - } -} diff --git a/assets/hbm/textures/items/ingot_starmetal.png b/assets/hbm/textures/items/ingot_starmetal.png index a92e76085..6843c3959 100644 Binary files a/assets/hbm/textures/items/ingot_starmetal.png and b/assets/hbm/textures/items/ingot_starmetal.png differ diff --git a/assets/hbm/textures/items/ingot_steel.png b/assets/hbm/textures/items/ingot_steel.png index f83666a7f..6692b7d76 100644 Binary files a/assets/hbm/textures/items/ingot_steel.png and b/assets/hbm/textures/items/ingot_steel.png differ diff --git a/assets/hbm/textures/items/ingot_tungsten.png b/assets/hbm/textures/items/ingot_tungsten.png index 6692b7d76..f83666a7f 100644 Binary files a/assets/hbm/textures/items/ingot_tungsten.png and b/assets/hbm/textures/items/ingot_tungsten.png differ diff --git a/assets/hbm/textures/items/plate_steel.png b/assets/hbm/textures/items/plate_steel.png index 962b94623..e29cc7f44 100644 Binary files a/assets/hbm/textures/items/plate_steel.png and b/assets/hbm/textures/items/plate_steel.png differ diff --git a/assets/hbm/textures/models/weapons/deagle.png b/assets/hbm/textures/models/weapons/deagle.png new file mode 100644 index 000000000..0b8acd829 Binary files /dev/null and b/assets/hbm/textures/models/weapons/deagle.png differ diff --git a/com/hbm/blocks/ModBlocks.java b/com/hbm/blocks/ModBlocks.java index 34c8d3cc0..1a86f15e2 100644 --- a/com/hbm/blocks/ModBlocks.java +++ b/com/hbm/blocks/ModBlocks.java @@ -16,18 +16,11 @@ import com.hbm.main.MainRegistry; import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; -import net.minecraft.block.BlockDirt; import net.minecraft.block.BlockFalling; -import net.minecraft.block.BlockSlab; -import net.minecraft.block.BlockStairs; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; import net.minecraft.block.material.MaterialLiquid; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemSlab; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; @@ -472,6 +465,7 @@ public class ModBlocks { public static final int guiID_ams_limiter = 56; public static Block dfc_emitter; + public static final int guiID_dfc_emitter = 87; public static Block dfc_injector; public static Block dfc_receiver; public static Block dfc_core; diff --git a/com/hbm/blocks/machine/CoreComponent.java b/com/hbm/blocks/machine/CoreComponent.java index e4f5fb01a..05eb1493d 100644 --- a/com/hbm/blocks/machine/CoreComponent.java +++ b/com/hbm/blocks/machine/CoreComponent.java @@ -1,20 +1,19 @@ package com.hbm.blocks.machine; import com.hbm.blocks.ModBlocks; -import com.hbm.interfaces.IBomb; -import com.hbm.interfaces.IMultiblock; +import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityCoreEmitter; import com.hbm.tileentity.machine.TileEntityCoreInjector; import com.hbm.tileentity.machine.TileEntityCoreReceiver; -import com.hbm.tileentity.machine.TileEntityVaultDoor; +import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.BlockContainer; import net.minecraft.block.BlockPistonBase; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MathHelper; import net.minecraft.world.World; public class CoreComponent extends BlockContainer { @@ -56,4 +55,21 @@ public class CoreComponent extends BlockContainer { int l = BlockPistonBase.determineOrientation(world, x, y, z, player); world.setBlockMetadataWithNotify(x, y, z, l, 2); } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { + + if(world.isRemote) { + return true; + } else if(!player.isSneaking()) { + + if(this == ModBlocks.dfc_emitter) + FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_dfc_emitter, world, x, y, z); + + return true; + + } else { + return false; + } + } } diff --git a/com/hbm/entity/projectile/EntityBulletBase.java b/com/hbm/entity/projectile/EntityBulletBase.java index 0677caf8d..796aaa2de 100644 --- a/com/hbm/entity/projectile/EntityBulletBase.java +++ b/com/hbm/entity/projectile/EntityBulletBase.java @@ -547,6 +547,12 @@ public class EntityBulletBase extends Entity implements IProjectile { int cfg = nbt.getInteger("config"); this.config = BulletConfigSyncingUtil.pullConfig(cfg); + + if(this.config == null) { + this.setDead(); + return; + } + this.dataWatcher.updateObject(18, cfg); this.dataWatcher.updateObject(16, (byte)this.config.style); diff --git a/com/hbm/handler/BulletConfigSyncingUtil.java b/com/hbm/handler/BulletConfigSyncingUtil.java index 2e8f815c8..b63c51efd 100644 --- a/com/hbm/handler/BulletConfigSyncingUtil.java +++ b/com/hbm/handler/BulletConfigSyncingUtil.java @@ -25,100 +25,107 @@ public class BulletConfigSyncingUtil { } } + static int i = 0; + /// duplicate ids will cause wrong configs to be loaded /// - public static final int TEST_CONFIG = 0x00; - public static final int IRON_REVOLVER = 0x01; - public static final int STEEL_REVOLVER = 0x02; - public static final int LEAD_REVOLVER = 0x03; - public static final int GOLD_REVOLVER = 0x04; - public static final int CURSED_REVOLVER = 0x05; - public static final int SCHRABIDIUM_REVOLVER = 0x06; - public static final int NIGHT_REVOLVER = 0x07; - public static final int NIGHT2_REVOLVER = 0x08; - public static final int SATURNITE_REVOLVER = 0x09; - public static final int DESH_REVOLVER = 0x0A; + public static int TEST_CONFIG = i++; + public static int IRON_REVOLVER = i++; + public static int STEEL_REVOLVER = i++; + public static int LEAD_REVOLVER = i++; + public static int GOLD_REVOLVER = i++; + public static int CURSED_REVOLVER = i++; + public static int SCHRABIDIUM_REVOLVER = i++; + public static int NIGHT_REVOLVER = i++; + public static int NIGHT2_REVOLVER = i++; + public static int SATURNITE_REVOLVER = i++; + public static int DESH_REVOLVER = i++; - public static final int G20_NORMAL = 0x10; - public static final int G20_SLUG = 0x11; - public static final int G20_FLECHETTE = 0x12; - public static final int G20_FIRE = 0x13; - public static final int G20_EXPLOSIVE = 0x14; - public static final int G20_CAUSTIC = 0x15; - public static final int G20_SHOCK = 0x16; - public static final int G20_WITHER = 0x17; + public static int G20_NORMAL = i++; + public static int G20_SLUG = i++; + public static int G20_FLECHETTE = i++; + public static int G20_FIRE = i++; + public static int G20_EXPLOSIVE = i++; + public static int G20_CAUSTIC = i++; + public static int G20_SHOCK = i++; + public static int G20_WITHER = i++; - public static final int ROCKET_NORMAL = 0x20; - public static final int ROCKET_HE = 0x21; - public static final int ROCKET_INCENDIARY = 0x22; - public static final int ROCKET_SHRAPNEL = 0x23; - public static final int ROCKET_EMP = 0x24; - public static final int ROCKET_GLARE = 0x25; - public static final int ROCKET_SLEEK = 0x26; - public static final int ROCKET_NUKE = 0x27; - public static final int ROCKET_CHAINSAW = 0x28; - public static final int ROCKET_TOXIC = 0x29; + public static int ROCKET_NORMAL = i++; + public static int ROCKET_HE = i++; + public static int ROCKET_INCENDIARY = i++; + public static int ROCKET_SHRAPNEL = i++; + public static int ROCKET_EMP = i++; + public static int ROCKET_GLARE = i++; + public static int ROCKET_SLEEK = i++; + public static int ROCKET_NUKE = i++; + public static int ROCKET_CHAINSAW = i++; + public static int ROCKET_TOXIC = i++; - public static final int GRENADE_NORMAL = 0x30; - public static final int GRENADE_HE = 0x31; - public static final int GRENADE_INCENDIARY = 0x32; - public static final int GRENADE_CHEMICAL = 0x33; - public static final int GRENADE_SLEEK = 0x34; - public static final int GRENADE_CONCUSSION = 0x35; - public static final int GRENADE_FINNED = 0x36; - public static final int GRENADE_NUCLEAR = 0x37; + public static int GRENADE_NORMAL = i++; + public static int GRENADE_HE = i++; + public static int GRENADE_INCENDIARY = i++; + public static int GRENADE_CHEMICAL = i++; + public static int GRENADE_SLEEK = i++; + public static int GRENADE_CONCUSSION = i++; + public static int GRENADE_FINNED = i++; + public static int GRENADE_NUCLEAR = i++; - public static final int G12_NORMAL = 0x40; - public static final int G12_INCENDIARY = 0x41; + public static int G12_NORMAL = i++; + public static int G12_INCENDIARY = i++; - public static final int LR22_NORMAL = 0x50; - public static final int LR22_AP = 0x51; - public static final int LR22_NORMAL_FIRE = 0x52; - public static final int LR22_AP_FIRE = 0x53; + public static int LR22_NORMAL = i++; + public static int LR22_AP = i++; + public static int LR22_NORMAL_FIRE = i++; + public static int LR22_AP_FIRE = i++; - public static final int M44_NORMAL = 0x60; - public static final int M44_AP = 0x61; - public static final int M44_DU = 0x62; - public static final int M44_PIP = 0x63; - public static final int M44_BJ = 0x64; - public static final int M44_ROCKET = 0x65; + public static int M44_NORMAL = i++; + public static int M44_AP = i++; + public static int M44_DU = i++; + public static int M44_STAR = i++; + public static int M44_PIP = i++; + public static int M44_BJ = i++; + public static int M44_ROCKET = i++; - public static final int P9_NORMAL = 0x70; - public static final int P9_AP = 0x71; - public static final int P9_DU = 0x72; - public static final int P9_ROCKET = 0x73; + public static int P9_NORMAL = i++; + public static int P9_AP = i++; + public static int P9_DU = i++; + public static int P9_ROCKET = i++; - public static final int BMG50_NORMAL = 0x80; - public static final int BMG50_INCENDIARY = 0x81; - public static final int BMG50_EXPLOSIVE = 0x82; - public static final int BMG50_DU = 0x83; + public static int BMG50_NORMAL = i++; + public static int BMG50_INCENDIARY = i++; + public static int BMG50_EXPLOSIVE = i++; + public static int BMG50_DU = i++; + public static int BMG50_STAR = i++; - public static final int R5_NORMAL = 0x90; - public static final int R5_EXPLOSIVE = 0x91; - public static final int R5_DU = 0x92; - public static final int R5_NORMAL_BOLT = 0x93; - public static final int R5_EXPLOSIVE_BOLT = 0x94; - public static final int R5_DU_BOLT = 0x95; + public static int R5_NORMAL = i++; + public static int R5_EXPLOSIVE = i++; + public static int R5_DU = i++; + public static int R5_STAR = i++; + public static int R5_NORMAL_BOLT = i++; + public static int R5_EXPLOSIVE_BOLT = i++; + public static int R5_DU_BOLT = i++; + public static int R5_STAR_BOLT = i++; - public static final int AE50_NORMAL = 0xA0; - public static final int AE50_AP = 0xA1; - public static final int AE50_DU = 0xA2; + public static int AE50_NORMAL = i++; + public static int AE50_AP = i++; + public static int AE50_DU = i++; + public static int AE50_STAR = i++; - public static final int SPECIAL_OSIPR = 0xB0; - public static final int SPECIAL_GAUSS = 0xB1; - public static final int SPECIAL_GAUSS_CHARGED = 0xB2; + public static int SPECIAL_OSIPR = i++; + public static int SPECIAL_GAUSS = i++; + public static int SPECIAL_GAUSS_CHARGED = i++; - public static final int G20_NORMAL_FIRE = 0xC0; - public static final int G20_SLUG_FIRE = 0xC1; - public static final int G20_FLECHETTE_FIRE = 0xC2; - public static final int G20_EXPLOSIVE_FIRE = 0xC3; - public static final int G20_CAUSTIC_FIRE = 0xC4; - public static final int G20_SHOCK_FIRE = 0xC5; - public static final int G20_WITHER_FIRE = 0xC6; + public static int G20_NORMAL_FIRE = i++; + public static int G20_SLUG_FIRE = i++; + public static int G20_FLECHETTE_FIRE = i++; + public static int G20_EXPLOSIVE_FIRE = i++; + public static int G20_CAUSTIC_FIRE = i++; + public static int G20_SHOCK_FIRE = i++; + public static int G20_WITHER_FIRE = i++; - public static final int NUKE_NORMAL = 0xD0; - public static final int NUKE_MIRV = 0xD1; - public static final int NUKE_AMAT = 0xD2; - public static final int NUKE_PROTO = 0xD3; + public static int NUKE_NORMAL = i++; + public static int NUKE_MIRV = i++; + public static int NUKE_AMAT = i++; + public static int NUKE_PROTO = i++; public static void loadConfigsForSync() { @@ -175,6 +182,7 @@ public class BulletConfigSyncingUtil { configSet.add(new ConfigKeyPair(Gun44MagnumFactory.getNoPipConfig(), M44_NORMAL)); configSet.add(new ConfigKeyPair(Gun44MagnumFactory.getNoPipAPConfig(), M44_AP)); configSet.add(new ConfigKeyPair(Gun44MagnumFactory.getNoPipDUConfig(), M44_DU)); + configSet.add(new ConfigKeyPair(Gun44MagnumFactory.getNoPipStarConfig(), M44_STAR)); configSet.add(new ConfigKeyPair(Gun44MagnumFactory.getPipConfig(), M44_PIP)); configSet.add(new ConfigKeyPair(Gun44MagnumFactory.getBJConfig(), M44_BJ)); configSet.add(new ConfigKeyPair(Gun44MagnumFactory.getRocketConfig(), M44_ROCKET)); @@ -188,17 +196,21 @@ public class BulletConfigSyncingUtil { configSet.add(new ConfigKeyPair(Gun50BMGFactory.get50BMGFireConfig(), BMG50_INCENDIARY)); configSet.add(new ConfigKeyPair(Gun50BMGFactory.get50BMGExplosiveConfig(), BMG50_EXPLOSIVE)); configSet.add(new ConfigKeyPair(Gun50BMGFactory.get50BMGDUConfig(), BMG50_DU)); + configSet.add(new ConfigKeyPair(Gun50BMGFactory.get50BMGStarConfig(), BMG50_STAR)); configSet.add(new ConfigKeyPair(Gun5mmFactory.get5mmConfig(), R5_NORMAL)); configSet.add(new ConfigKeyPair(Gun5mmFactory.get5mmExplosiveConfig(), R5_EXPLOSIVE)); configSet.add(new ConfigKeyPair(Gun5mmFactory.get5mmDUConfig(), R5_DU)); + configSet.add(new ConfigKeyPair(Gun5mmFactory.get5mmStarConfig(), R5_STAR)); configSet.add(new ConfigKeyPair(Gun5mmFactory.get5mmConfig().setToBolt(BulletConfiguration.BOLT_LACUNAE), R5_NORMAL_BOLT)); configSet.add(new ConfigKeyPair(Gun5mmFactory.get5mmExplosiveConfig().setToBolt(BulletConfiguration.BOLT_LACUNAE), R5_EXPLOSIVE_BOLT)); configSet.add(new ConfigKeyPair(Gun5mmFactory.get5mmDUConfig().setToBolt(BulletConfiguration.BOLT_LACUNAE), R5_DU_BOLT)); + configSet.add(new ConfigKeyPair(Gun5mmFactory.get5mmStarConfig().setToBolt(BulletConfiguration.BOLT_LACUNAE), R5_STAR_BOLT)); configSet.add(new ConfigKeyPair(Gun50AEFactory.get50AEConfig(), AE50_NORMAL)); configSet.add(new ConfigKeyPair(Gun50AEFactory.get50APConfig(), AE50_AP)); configSet.add(new ConfigKeyPair(Gun50AEFactory.get50DUConfig(), AE50_DU)); + configSet.add(new ConfigKeyPair(Gun50AEFactory.get50StarConfig(), AE50_STAR)); configSet.add(new ConfigKeyPair(GunOSIPRFactory.getPulseConfig(), SPECIAL_OSIPR)); configSet.add(new ConfigKeyPair(GunGaussFactory.getGaussConfig(), SPECIAL_GAUSS)); @@ -214,6 +226,7 @@ public class BulletConfigSyncingUtil { configSet.add(new ConfigKeyPair(GunFatmanFactory.getNukeConfig(), NUKE_NORMAL)); configSet.add(new ConfigKeyPair(GunFatmanFactory.getNukeProtoConfig(), NUKE_PROTO)); + configSet.add(new ConfigKeyPair(GunFatmanFactory.getBalefireConfig(), NUKE_AMAT)); } public static BulletConfiguration pullConfig(int key) { diff --git a/com/hbm/handler/GUIHandler.java b/com/hbm/handler/GUIHandler.java index 86bd81bd6..dcd25fbd8 100644 --- a/com/hbm/handler/GUIHandler.java +++ b/com/hbm/handler/GUIHandler.java @@ -5,7 +5,6 @@ import com.hbm.inventory.container.*; import com.hbm.inventory.gui.*; import com.hbm.inventory.inv.InventoryLeadBox; import com.hbm.items.ModItems; -import com.hbm.items.tool.ItemLeadBox; import com.hbm.tileentity.bomb.*; import com.hbm.tileentity.machine.*; @@ -778,6 +777,15 @@ public class GUIHandler implements IGuiHandler { } return null; } + + case ModBlocks.guiID_dfc_emitter: + { + if(entity instanceof TileEntityCoreEmitter) + { + return new ContainerCoreEmitter(player.inventory, (TileEntityCoreEmitter) entity); + } + return null; + } } } else { //NON-TE CONTAINERS @@ -1554,6 +1562,15 @@ public class GUIHandler implements IGuiHandler { } return null; } + + case ModBlocks.guiID_dfc_emitter: + { + if(entity instanceof TileEntityCoreEmitter) + { + return new GUICoreEmitter(player.inventory, (TileEntityCoreEmitter) entity); + } + return null; + } } } else { //CLIENTONLY GUIS diff --git a/com/hbm/handler/GunConfiguration.java b/com/hbm/handler/GunConfiguration.java index 54b2052d3..2c4ce4cd6 100644 --- a/com/hbm/handler/GunConfiguration.java +++ b/com/hbm/handler/GunConfiguration.java @@ -1,5 +1,6 @@ package com.hbm.handler; +import java.util.ArrayList; import java.util.List; import com.hbm.render.util.RenderScreenOverlay.Crosshair; @@ -58,6 +59,7 @@ public class GunConfiguration { public String name = ""; public String manufacturer = ""; + public List comment = new ArrayList(); //bullet configs for main and alt fire public List config; diff --git a/com/hbm/handler/guncfg/Gun44MagnumFactory.java b/com/hbm/handler/guncfg/Gun44MagnumFactory.java index e62b033c4..9c95b48ae 100644 --- a/com/hbm/handler/guncfg/Gun44MagnumFactory.java +++ b/com/hbm/handler/guncfg/Gun44MagnumFactory.java @@ -48,6 +48,7 @@ public class Gun44MagnumFactory { config.config.add(BulletConfigSyncingUtil.M44_NORMAL); config.config.add(BulletConfigSyncingUtil.M44_AP); config.config.add(BulletConfigSyncingUtil.M44_DU); + config.config.add(BulletConfigSyncingUtil.M44_STAR); config.config.add(BulletConfigSyncingUtil.M44_ROCKET); return config; @@ -67,6 +68,7 @@ public class Gun44MagnumFactory { config.config.add(BulletConfigSyncingUtil.M44_NORMAL); config.config.add(BulletConfigSyncingUtil.M44_AP); config.config.add(BulletConfigSyncingUtil.M44_DU); + config.config.add(BulletConfigSyncingUtil.M44_STAR); config.config.add(BulletConfigSyncingUtil.M44_ROCKET); return config; @@ -87,6 +89,7 @@ public class Gun44MagnumFactory { config.config.add(BulletConfigSyncingUtil.M44_NORMAL); config.config.add(BulletConfigSyncingUtil.M44_AP); config.config.add(BulletConfigSyncingUtil.M44_DU); + config.config.add(BulletConfigSyncingUtil.M44_STAR); config.config.add(BulletConfigSyncingUtil.M44_ROCKET); return config; @@ -106,6 +109,7 @@ public class Gun44MagnumFactory { config.config.add(BulletConfigSyncingUtil.M44_NORMAL); config.config.add(BulletConfigSyncingUtil.M44_AP); config.config.add(BulletConfigSyncingUtil.M44_DU); + config.config.add(BulletConfigSyncingUtil.M44_STAR); config.config.add(BulletConfigSyncingUtil.M44_PIP); config.config.add(BulletConfigSyncingUtil.M44_BJ); config.config.add(BulletConfigSyncingUtil.M44_ROCKET); @@ -150,6 +154,19 @@ public class Gun44MagnumFactory { return bullet; } + public static BulletConfiguration getNoPipStarConfig() { + + BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); + + bullet.ammo = ModItems.ammo_44_star; + bullet.dmgMin = 14; + bullet.dmgMax = 20; + bullet.wear = 25; + bullet.leadChance = 100; + + return bullet; + } + public static BulletConfiguration getPipConfig() { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); diff --git a/com/hbm/handler/guncfg/Gun50AEFactory.java b/com/hbm/handler/guncfg/Gun50AEFactory.java index 6788fbf8a..4963f5de0 100644 --- a/com/hbm/handler/guncfg/Gun50AEFactory.java +++ b/com/hbm/handler/guncfg/Gun50AEFactory.java @@ -29,7 +29,7 @@ public class Gun50AEFactory { config.allowsInfinity = true; config.crosshair = Crosshair.L_CLASSIC; config.reloadSound = GunConfiguration.RSOUND_REVOLVER; - config.firingSound = "hbm:weapon.revolverShootAlt"; + config.firingSound = "hbm:weapon.deagleShoot"; config.reloadSoundEnd = false; return config; @@ -44,10 +44,12 @@ public class Gun50AEFactory { config.name = "IMI Desert Eagle"; config.manufacturer = "Magnum Research / Israel Military Industries"; + config.hasSights = true; config.config = new ArrayList(); config.config.add(BulletConfigSyncingUtil.AE50_NORMAL); config.config.add(BulletConfigSyncingUtil.AE50_AP); config.config.add(BulletConfigSyncingUtil.AE50_DU); + config.config.add(BulletConfigSyncingUtil.AE50_STAR); return config; } @@ -93,4 +95,18 @@ public class Gun50AEFactory { return bullet; } + public static BulletConfiguration get50StarConfig() { + + BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); + + bullet.ammo = ModItems.ammo_50ae_star; + bullet.spread *= inaccuracy; + bullet.dmgMin = 48; + bullet.dmgMax = 56; + bullet.leadChance = 100; + bullet.wear = 25; + + return bullet; + } + } diff --git a/com/hbm/handler/guncfg/Gun50BMGFactory.java b/com/hbm/handler/guncfg/Gun50BMGFactory.java index 709819626..b61314d27 100644 --- a/com/hbm/handler/guncfg/Gun50BMGFactory.java +++ b/com/hbm/handler/guncfg/Gun50BMGFactory.java @@ -41,6 +41,7 @@ public class Gun50BMGFactory { config.config.add(BulletConfigSyncingUtil.BMG50_INCENDIARY); config.config.add(BulletConfigSyncingUtil.BMG50_EXPLOSIVE); config.config.add(BulletConfigSyncingUtil.BMG50_DU); + config.config.add(BulletConfigSyncingUtil.BMG50_STAR); return config; } @@ -75,6 +76,7 @@ public class Gun50BMGFactory { config.config.add(BulletConfigSyncingUtil.BMG50_INCENDIARY); config.config.add(BulletConfigSyncingUtil.BMG50_EXPLOSIVE); config.config.add(BulletConfigSyncingUtil.BMG50_DU); + config.config.add(BulletConfigSyncingUtil.BMG50_STAR); return config; } @@ -134,4 +136,18 @@ public class Gun50BMGFactory { return bullet; } + public static BulletConfiguration get50BMGStarConfig() { + + BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); + + bullet.ammo = ModItems.ammo_50bmg_star; + bullet.spread *= inaccuracy; + bullet.dmgMin = 50; + bullet.dmgMax = 70; + bullet.wear = 25; + bullet.leadChance = 100; + + return bullet; + } + } diff --git a/com/hbm/handler/guncfg/Gun5mmFactory.java b/com/hbm/handler/guncfg/Gun5mmFactory.java index 04ac772b4..0e5167d31 100644 --- a/com/hbm/handler/guncfg/Gun5mmFactory.java +++ b/com/hbm/handler/guncfg/Gun5mmFactory.java @@ -28,13 +28,14 @@ public class Gun5mmFactory { config.reloadType = GunConfiguration.RELOAD_NONE; config.allowsInfinity = true; config.crosshair = Crosshair.L_CIRCLE; - config.durability = 5000; + config.durability = 10000; config.firingSound = "hbm:weapon.lacunaeShoot"; config.config = new ArrayList(); config.config.add(BulletConfigSyncingUtil.R5_NORMAL); config.config.add(BulletConfigSyncingUtil.R5_EXPLOSIVE); config.config.add(BulletConfigSyncingUtil.R5_DU); + config.config.add(BulletConfigSyncingUtil.R5_STAR); return config; } @@ -53,7 +54,7 @@ public class Gun5mmFactory { GunConfiguration config = getMinigunConfig(); - config.durability = 6500; + config.durability = 15000; config.name = "CZ57 Avenger Minigun"; config.manufacturer = "Rockwell International Corporation"; @@ -64,7 +65,7 @@ public class Gun5mmFactory { GunConfiguration config = getMinigunConfig(); - config.durability = 10000; + config.durability = 25000; config.name = "Auntie Lacunae"; config.manufacturer = "Rockwell International Corporation?"; @@ -72,6 +73,7 @@ public class Gun5mmFactory { config.config.add(BulletConfigSyncingUtil.R5_NORMAL_BOLT); config.config.add(BulletConfigSyncingUtil.R5_EXPLOSIVE_BOLT); config.config.add(BulletConfigSyncingUtil.R5_DU_BOLT); + config.config.add(BulletConfigSyncingUtil.R5_STAR_BOLT); return config; } @@ -116,5 +118,19 @@ public class Gun5mmFactory { return bullet; } + + public static BulletConfiguration get5mmStarConfig() { + + BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); + + bullet.ammo = ModItems.ammo_5mm_star; + bullet.spread *= inaccuracy; + bullet.dmgMin = 12; + bullet.dmgMax = 20; + bullet.wear = 25; + bullet.leadChance = 100; + + return bullet; + } } diff --git a/com/hbm/handler/guncfg/GunFatmanFactory.java b/com/hbm/handler/guncfg/GunFatmanFactory.java index 523c0ad17..f098b497c 100644 --- a/com/hbm/handler/guncfg/GunFatmanFactory.java +++ b/com/hbm/handler/guncfg/GunFatmanFactory.java @@ -2,10 +2,15 @@ package com.hbm.handler.guncfg; import java.util.ArrayList; +import com.hbm.entity.logic.EntityBalefire; +import com.hbm.entity.projectile.EntityBulletBase; +import com.hbm.explosion.ExplosionParticleB; import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; +import com.hbm.interfaces.IBulletImpactBehavior; import com.hbm.items.ModItems; +import com.hbm.main.MainRegistry; import com.hbm.render.util.RenderScreenOverlay.Crosshair; public class GunFatmanFactory { @@ -42,6 +47,19 @@ public class GunFatmanFactory { return config; } + public static GunConfiguration getBELConfig() { + + GunConfiguration config = getFatmanConfig(); + + config.name = "Balefire Egg Launcher"; + config.manufacturer = "Fort Strong"; + + config.config = new ArrayList(); + config.config.add(BulletConfigSyncingUtil.NUKE_AMAT); + + return config; + } + public static GunConfiguration getProtoConfig() { GunConfiguration config = new GunConfiguration(); @@ -107,6 +125,23 @@ public class GunFatmanFactory { BulletConfiguration bullet = BulletConfigFactory.standardNukeConfig(); bullet.ammo = ModItems.gun_bf_ammo; + bullet.nuke = 0; + bullet.style = BulletConfiguration.STYLE_BF; + + bullet.bImpact = new IBulletImpactBehavior() { + public void behaveBlockHit(EntityBulletBase bullet, int x, int y, int z) { + + if(!bullet.worldObj.isRemote) { + EntityBalefire bf = new EntityBalefire(bullet.worldObj); + bf.posX = x; + bf.posY = y; + bf.posZ = z; + bf.destructionRange = (int) (MainRegistry.fatmanRadius * 1.25); + bullet.worldObj.spawnEntityInWorld(bf); + ExplosionParticleB.spawnMush(bullet.worldObj, x, y, z); + } + } + }; return bullet; } diff --git a/com/hbm/interfaces/IBulletImpactBehavior.java b/com/hbm/interfaces/IBulletImpactBehavior.java index 52f68c1fd..cc92dbee2 100644 --- a/com/hbm/interfaces/IBulletImpactBehavior.java +++ b/com/hbm/interfaces/IBulletImpactBehavior.java @@ -2,8 +2,6 @@ package com.hbm.interfaces; import com.hbm.entity.projectile.EntityBulletBase; -import net.minecraft.entity.Entity; - public interface IBulletImpactBehavior { //block is hit, bullet dies diff --git a/com/hbm/interfaces/IBulletRicochetBehavior.java b/com/hbm/interfaces/IBulletRicochetBehavior.java index c55c03478..4f4f5c5f6 100644 --- a/com/hbm/interfaces/IBulletRicochetBehavior.java +++ b/com/hbm/interfaces/IBulletRicochetBehavior.java @@ -2,8 +2,6 @@ package com.hbm.interfaces; import com.hbm.entity.projectile.EntityBulletBase; -import net.minecraft.entity.Entity; - public interface IBulletRicochetBehavior { //block is hit, bullet ricochets diff --git a/com/hbm/interfaces/ILaserable.java b/com/hbm/interfaces/ILaserable.java new file mode 100644 index 000000000..9b1feb079 --- /dev/null +++ b/com/hbm/interfaces/ILaserable.java @@ -0,0 +1,7 @@ +package com.hbm.interfaces; + +public interface ILaserable { + + public void addEnergy(long energy); + +} diff --git a/com/hbm/inventory/container/ContainerCoreEmitter.java b/com/hbm/inventory/container/ContainerCoreEmitter.java new file mode 100644 index 000000000..d382f6489 --- /dev/null +++ b/com/hbm/inventory/container/ContainerCoreEmitter.java @@ -0,0 +1,40 @@ +package com.hbm.inventory.container; + +import com.hbm.inventory.SlotMachineOutput; +import com.hbm.tileentity.machine.TileEntityCoreEmitter; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; + +public class ContainerCoreEmitter extends Container { + + private TileEntityCoreEmitter nukeBoy; + + public ContainerCoreEmitter(InventoryPlayer invPlayer, TileEntityCoreEmitter tedf) { + + nukeBoy = tedf; + + this.addSlotToContainer(new Slot(tedf, 0, 8, 17)); + this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 1, 8, 53)); + + for(int i = 0; i < 3; i++) + { + for(int j = 0; j < 9; j++) + { + this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 84 + i * 18 + 56)); + } + } + + for(int i = 0; i < 9; i++) + { + this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 142 + 56)); + } + } + + @Override + public boolean canInteractWith(EntityPlayer player) { + return nukeBoy.isUseableByPlayer(player); + } +} diff --git a/com/hbm/inventory/gui/GUICoreEmitter.java b/com/hbm/inventory/gui/GUICoreEmitter.java new file mode 100644 index 000000000..97e081fd4 --- /dev/null +++ b/com/hbm/inventory/gui/GUICoreEmitter.java @@ -0,0 +1,48 @@ +package com.hbm.inventory.gui; + +import org.lwjgl.opengl.GL11; + +import com.hbm.inventory.container.ContainerCoreEmitter; +import com.hbm.lib.RefStrings; +import com.hbm.tileentity.machine.TileEntityCoreEmitter; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.resources.I18n; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.ResourceLocation; + +public class GUICoreEmitter extends GuiInfoContainer { + + private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/dfc/gui_emitter.png"); + private TileEntityCoreEmitter press; + + public GUICoreEmitter(InventoryPlayer invPlayer, TileEntityCoreEmitter tedf) { + super(new ContainerCoreEmitter(invPlayer, tedf)); + press = tedf; + + this.xSize = 176; + this.ySize = 166; + } + + @Override + public void drawScreen(int mouseX, int mouseY, float f) { + super.drawScreen(mouseX, mouseY, f); + + this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 26, guiTop + 69 - 52, 16, 52, press.power, press.maxPower); + } + + @Override + protected void drawGuiContainerForegroundLayer( int i, int j) { + String name = this.press.hasCustomInventoryName() ? this.press.getInventoryName() : I18n.format(this.press.getInventoryName()); + + this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); + this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + Minecraft.getMinecraft().getTextureManager().bindTexture(texture); + drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); + } +} diff --git a/com/hbm/inventory/gui/GUILaunchPadTier1.java b/com/hbm/inventory/gui/GUILaunchPadTier1.java index e7903ae59..edf101b35 100644 --- a/com/hbm/inventory/gui/GUILaunchPadTier1.java +++ b/com/hbm/inventory/gui/GUILaunchPadTier1.java @@ -1,7 +1,6 @@ package com.hbm.inventory.gui; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GuiInfoContainer.java b/com/hbm/inventory/gui/GuiInfoContainer.java index 5e21b53eb..c408ef126 100644 --- a/com/hbm/inventory/gui/GuiInfoContainer.java +++ b/com/hbm/inventory/gui/GuiInfoContainer.java @@ -7,7 +7,6 @@ import com.hbm.lib.RefStrings; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.resources.I18n; import net.minecraft.inventory.Container; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index c0542e405..fc41c3365 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -1047,12 +1047,14 @@ public class ModItems { public static Item ammo_44; public static Item ammo_44_ap; public static Item ammo_44_du; + public static Item ammo_44_star; public static Item ammo_44_pip; public static Item ammo_44_bj; public static Item ammo_44_rocket; public static Item ammo_5mm; public static Item ammo_5mm_explosive; public static Item ammo_5mm_du; + public static Item ammo_5mm_star; public static Item ammo_9mm; public static Item ammo_9mm_ap; public static Item ammo_9mm_du; @@ -1062,10 +1064,12 @@ public class ModItems { public static Item ammo_50ae; public static Item ammo_50ae_ap; public static Item ammo_50ae_du; + public static Item ammo_50ae_star; public static Item ammo_50bmg; public static Item ammo_50bmg_incendiary; public static Item ammo_50bmg_explosive; public static Item ammo_50bmg_du; + public static Item ammo_50bmg_star; public static Item ammo_folly; public static Item ammo_folly_nuclear; public static Item ammo_folly_du; @@ -2736,6 +2740,7 @@ public class ModItems { ammo_5mm = new ItemAmmo().setUnlocalizedName("ammo_5mm").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_5mm"); ammo_5mm_explosive = new ItemAmmo().setUnlocalizedName("ammo_5mm_explosive").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_5mm_explosive"); ammo_5mm_du = new ItemAmmo().setUnlocalizedName("ammo_5mm_du").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_5mm_du"); + ammo_5mm_star = new ItemAmmo().setUnlocalizedName("ammo_5mm_star").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_5mm_star"); ammo_9mm = new ItemAmmo().setUnlocalizedName("ammo_9mm").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_9mm"); ammo_9mm_ap = new ItemAmmo().setUnlocalizedName("ammo_9mm_ap").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_9mm_ap"); ammo_9mm_du = new ItemAmmo().setUnlocalizedName("ammo_9mm_du").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_9mm_du"); @@ -2743,14 +2748,17 @@ public class ModItems { ammo_50ae = new ItemAmmo().setUnlocalizedName("ammo_50ae").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50ae"); ammo_50ae_ap = new ItemAmmo().setUnlocalizedName("ammo_50ae_ap").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50ae_ap"); ammo_50ae_du = new ItemAmmo().setUnlocalizedName("ammo_50ae_du").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50ae_du"); + ammo_50ae_star = new ItemAmmo().setUnlocalizedName("ammo_50ae_star").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50ae_star"); ammo_50bmg = new ItemAmmo().setUnlocalizedName("ammo_50bmg").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50bmg"); ammo_50bmg_incendiary = new ItemAmmo().setUnlocalizedName("ammo_50bmg_incendiary").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50bmg_incendiary"); ammo_50bmg_explosive = new ItemAmmo().setUnlocalizedName("ammo_50bmg_explosive").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50bmg_explosive"); ammo_50bmg_du = new ItemAmmo().setUnlocalizedName("ammo_50bmg_du").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50bmg_du"); + ammo_50bmg_star = new ItemAmmo().setUnlocalizedName("ammo_50bmg_star").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50bmg_star"); ammo_357_desh = new ItemAmmo().setUnlocalizedName("ammo_357_desh").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_357_desh"); ammo_44 = new ItemAmmo().setUnlocalizedName("ammo_44").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_44"); ammo_44_ap = new ItemAmmo().setUnlocalizedName("ammo_44_ap").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_44_ap"); ammo_44_du = new ItemAmmo().setUnlocalizedName("ammo_44_du").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_44_du"); + ammo_44_star = new ItemAmmo().setUnlocalizedName("ammo_44_star").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_44_star"); ammo_44_pip = new ItemAmmo().setUnlocalizedName("ammo_44_pip").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_44_pip"); ammo_44_bj = new ItemAmmo().setUnlocalizedName("ammo_44_bj").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_44_bj"); ammo_44_rocket = new ItemAmmo().setUnlocalizedName("ammo_44_rocket").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_44_rocket"); @@ -2815,9 +2823,9 @@ public class ModItems { gun_calamity = new ItemGunBase(Gun50BMGFactory.getCalamityConfig()).setUnlocalizedName("gun_calamity").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_calamity"); gun_calamity_dual = new ItemGunBase(Gun50BMGFactory.getSaddleConfig()).setUnlocalizedName("gun_calamity_dual").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_calamity_dual"); gun_lacunae_ammo = new ItemCustomLore().setUnlocalizedName("gun_lacunae_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_lacunae_ammo"); - gun_minigun = new ItemGunBase(Gun5mmFactory.get53Config()).setUnlocalizedName("gun_minigun").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_minigun"); - gun_avenger = new ItemGunBase(Gun5mmFactory.get57Config()).setUnlocalizedName("gun_avenger").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_avenger"); - gun_lacunae = new ItemGunBase(Gun5mmFactory.getLacunaeConfig()).setUnlocalizedName("gun_lacunae").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_lacunae"); + gun_minigun = new ItemGunLacunae(Gun5mmFactory.get53Config()).setUnlocalizedName("gun_minigun").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_minigun"); + gun_avenger = new ItemGunLacunae(Gun5mmFactory.get57Config()).setUnlocalizedName("gun_avenger").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_avenger"); + gun_lacunae = new ItemGunLacunae(Gun5mmFactory.getLacunaeConfig()).setUnlocalizedName("gun_lacunae").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_lacunae"); gun_folly = new GunFolly().setUnlocalizedName("gun_folly").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_folly"); gun_fatman_ammo = new Item().setUnlocalizedName("gun_fatman_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_fatman_ammo"); gun_fatman = new ItemGunBase(GunFatmanFactory.getFatmanConfig()).setUnlocalizedName("gun_fatman").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_fatman"); @@ -2825,7 +2833,7 @@ public class ModItems { gun_mirv_ammo = new Item().setUnlocalizedName("gun_mirv_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_mirv_ammo"); gun_mirv = new ItemGunBase(GunFatmanFactory.getFatmanConfig()).setUnlocalizedName("gun_mirv").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_mirv"); gun_bf_ammo = new Item().setUnlocalizedName("gun_bf_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_bf_ammo"); - gun_bf = new ItemGunBase(GunFatmanFactory.getFatmanConfig()).setUnlocalizedName("gun_bf").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_bf"); + gun_bf = new ItemGunBase(GunFatmanFactory.getBELConfig()).setUnlocalizedName("gun_bf").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_bf"); gun_mp40_ammo = new Item().setUnlocalizedName("gun_mp40_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_mp40_ammo"); gun_mp40 = new ItemGunBase(Gun9mmFactory.getMP40Config()).setUnlocalizedName("gun_mp40").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_mp40"); gun_uzi_ammo = new Item().setUnlocalizedName("gun_uzi_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_uzi_ammo"); @@ -4685,12 +4693,14 @@ public class ModItems { GameRegistry.registerItem(ammo_44, ammo_44.getUnlocalizedName()); GameRegistry.registerItem(ammo_44_ap, ammo_44_ap.getUnlocalizedName()); GameRegistry.registerItem(ammo_44_du, ammo_44_du.getUnlocalizedName()); + GameRegistry.registerItem(ammo_44_star, ammo_44_star.getUnlocalizedName()); GameRegistry.registerItem(ammo_44_pip, ammo_44_pip.getUnlocalizedName()); GameRegistry.registerItem(ammo_44_bj, ammo_44_bj.getUnlocalizedName()); GameRegistry.registerItem(ammo_44_rocket, ammo_44_rocket.getUnlocalizedName()); GameRegistry.registerItem(ammo_5mm, ammo_5mm.getUnlocalizedName()); GameRegistry.registerItem(ammo_5mm_explosive, ammo_5mm_explosive.getUnlocalizedName()); GameRegistry.registerItem(ammo_5mm_du, ammo_5mm_du.getUnlocalizedName()); + GameRegistry.registerItem(ammo_5mm_star, ammo_5mm_star.getUnlocalizedName()); GameRegistry.registerItem(ammo_9mm, ammo_9mm.getUnlocalizedName()); GameRegistry.registerItem(ammo_9mm_ap, ammo_9mm_ap.getUnlocalizedName()); GameRegistry.registerItem(ammo_9mm_du, ammo_9mm_du.getUnlocalizedName()); @@ -4700,10 +4710,12 @@ public class ModItems { GameRegistry.registerItem(ammo_50ae, ammo_50ae.getUnlocalizedName()); GameRegistry.registerItem(ammo_50ae_ap, ammo_50ae_ap.getUnlocalizedName()); GameRegistry.registerItem(ammo_50ae_du, ammo_50ae_du.getUnlocalizedName()); + GameRegistry.registerItem(ammo_50ae_star, ammo_50ae_star.getUnlocalizedName()); GameRegistry.registerItem(ammo_50bmg, ammo_50bmg.getUnlocalizedName()); GameRegistry.registerItem(ammo_50bmg_incendiary, ammo_50bmg_incendiary.getUnlocalizedName()); GameRegistry.registerItem(ammo_50bmg_explosive, ammo_50bmg_explosive.getUnlocalizedName()); GameRegistry.registerItem(ammo_50bmg_du, ammo_50bmg_du.getUnlocalizedName()); + GameRegistry.registerItem(ammo_50bmg_star, ammo_50bmg_star.getUnlocalizedName()); GameRegistry.registerItem(ammo_rocket, ammo_rocket.getUnlocalizedName()); GameRegistry.registerItem(ammo_rocket_he, ammo_rocket_he.getUnlocalizedName()); GameRegistry.registerItem(ammo_rocket_incendiary, ammo_rocket_incendiary.getUnlocalizedName()); diff --git a/com/hbm/items/food/ItemEnergy.java b/com/hbm/items/food/ItemEnergy.java index da324d425..0c5f7603f 100644 --- a/com/hbm/items/food/ItemEnergy.java +++ b/com/hbm/items/food/ItemEnergy.java @@ -325,22 +325,27 @@ public class ItemEnergy extends Item { if(this == ModItems.bottle_nuka) { list.add("Contains about 210 kcal and 1500 mSv."); + list.add("[Requires bottle opener]"); } if(this == ModItems.bottle_cherry) { list.add("Now with severe radiation poisoning in every seventh bottle!"); + list.add("[Requires bottle opener]"); } if(this == ModItems.bottle_quantum) { list.add("Comes with a colorful mix of over 70 isotopes!"); + list.add("[Requires bottle opener]"); } if(this == ModItems.bottle2_korl) { list.add("Contains actual orange juice!"); + list.add("[Requires bottle opener]"); } if(this == ModItems.bottle2_fritz) { list.add("moremore caffeine"); + list.add("[Requires bottle opener]"); } if(this == ModItems.bottle2_korl_special) { @@ -348,6 +353,7 @@ public class ItemEnergy extends Item { list.add("shgehgev u rguer"); else list.add("Contains actual orange juice!"); + list.add("[Requires bottle opener]"); } if(this == ModItems.bottle2_fritz_special) { @@ -355,6 +361,7 @@ public class ItemEnergy extends Item { list.add("ygrogr fgrof bf"); else list.add("moremore caffeine"); + list.add("[Requires bottle opener]"); } if(this == ModItems.bottle_sparkle) { @@ -362,6 +369,7 @@ public class ItemEnergy extends Item { list.add("Contains trace amounts of taint."); else list.add("The most delicious beverage in the wasteland!"); + list.add("[Requires bottle opener]"); } if(this == ModItems.bottle_sparkle) { @@ -369,6 +377,7 @@ public class ItemEnergy extends Item { list.add("Now with 400% more radiation!"); else list.add("Tastes like radish and radiation."); + list.add("[Requires bottle opener]"); } if(this == ModItems.bottle2_sunset) { @@ -384,6 +393,7 @@ public class ItemEnergy extends Item { } else { list.add("The eternal #2. Screw you, Bradberton!"); } + list.add("[Requires bottle opener]"); } } } diff --git a/com/hbm/items/special/ItemCustomLore.java b/com/hbm/items/special/ItemCustomLore.java index fdf0ba9fa..0be6efc8e 100644 --- a/com/hbm/items/special/ItemCustomLore.java +++ b/com/hbm/items/special/ItemCustomLore.java @@ -683,8 +683,7 @@ public class ItemCustomLore extends Item { if(this == ModItems.book_of_) { - list.add("Denn wer den Walzer richtig tritt,"); - list.add("der ist auch für den Abgang fit."); + list.add("Edition 4, gold lined pages"); } if(this == ModItems.missile_skin_camo) diff --git a/com/hbm/items/special/ItemDrop.java b/com/hbm/items/special/ItemDrop.java index e629636ef..ab83d5fb2 100644 --- a/com/hbm/items/special/ItemDrop.java +++ b/com/hbm/items/special/ItemDrop.java @@ -60,7 +60,7 @@ public class ItemDrop extends Item { } } if (stack.getItem() != null && stack.getItem() == ModItems.detonator_de) { - if (!entityItem.worldObj.isRemote) { + if (!entityItem.worldObj.isRemote && MainRegistry.dropDead) { entityItem.worldObj.createExplosion(entityItem, entityItem.posX, entityItem.posY, entityItem.posZ, 15.0F, true); @@ -73,19 +73,19 @@ public class ItemDrop extends Item { if (entityItem.onGround) { - if (stack.getItem() != null && stack.getItem() == ModItems.cell_antimatter) { + if (stack.getItem() != null && stack.getItem() == ModItems.cell_antimatter && MainRegistry.dropCell) { if (!entityItem.worldObj.isRemote) { entityItem.worldObj.createExplosion(entityItem, entityItem.posX, entityItem.posY, entityItem.posZ, 10.0F, true); } } - if (stack.getItem() != null && stack.getItem() == ModItems.pellet_antimatter) { + if (stack.getItem() != null && stack.getItem() == ModItems.pellet_antimatter && MainRegistry.dropCell) { if (!entityItem.worldObj.isRemote) { ExplosionLarge.explodeFire(entityItem.worldObj, entityItem.posX, entityItem.posY, entityItem.posZ, 100, true, true, true); } } - if (stack.getItem() != null && stack.getItem() == ModItems.cell_anti_schrabidium) { + if (stack.getItem() != null && stack.getItem() == ModItems.cell_anti_schrabidium && MainRegistry.dropCell) { if (!entityItem.worldObj.isRemote) { entityItem.worldObj.playSoundEffect(entityItem.posX, entityItem.posY, entityItem.posZ, "random.explode", 100.0f, entityItem.worldObj.rand.nextFloat() * 0.1F + 0.9F); @@ -108,7 +108,7 @@ public class ItemDrop extends Item { entityItem.worldObj.spawnEntityInWorld(cloud); } } - if (stack.getItem() != null && stack.getItem() == ModItems.singularity) { + if (stack.getItem() != null && stack.getItem() == ModItems.singularity && MainRegistry.dropSing) { if (!entityItem.worldObj.isRemote) { EntityVortex bl = new EntityVortex(entityItem.worldObj, 1.5F); @@ -118,7 +118,7 @@ public class ItemDrop extends Item { entityItem.worldObj.spawnEntityInWorld(bl); } } - if (stack.getItem() != null && stack.getItem() == ModItems.singularity_counter_resonant) { + if (stack.getItem() != null && stack.getItem() == ModItems.singularity_counter_resonant && MainRegistry.dropSing) { if (!entityItem.worldObj.isRemote) { EntityVortex bl = new EntityVortex(entityItem.worldObj, 2.5F); @@ -128,7 +128,7 @@ public class ItemDrop extends Item { entityItem.worldObj.spawnEntityInWorld(bl); } } - if (stack.getItem() != null && stack.getItem() == ModItems.singularity_super_heated) { + if (stack.getItem() != null && stack.getItem() == ModItems.singularity_super_heated && MainRegistry.dropSing) { if (!entityItem.worldObj.isRemote) { EntityVortex bl = new EntityVortex(entityItem.worldObj, 2.5F); @@ -138,7 +138,7 @@ public class ItemDrop extends Item { entityItem.worldObj.spawnEntityInWorld(bl); } } - if (stack.getItem() != null && stack.getItem() == ModItems.black_hole) { + if (stack.getItem() != null && stack.getItem() == ModItems.black_hole && MainRegistry.dropSing) { if (!entityItem.worldObj.isRemote) { /*entityItem.worldObj.playSoundEffect(entityItem.posX, entityItem.posY, entityItem.posZ, "random.explode", 100.0f, entityItem.worldObj.rand.nextFloat() * 0.1F + 0.9F); @@ -162,7 +162,7 @@ public class ItemDrop extends Item { entityItem.worldObj.spawnEntityInWorld(bl); } } - if (stack.getItem() != null && stack.getItem() == ModItems.singularity_spark) { + if (stack.getItem() != null && stack.getItem() == ModItems.singularity_spark && MainRegistry.dropSing) { if (!entityItem.worldObj.isRemote) { EntityRagingVortex bl = new EntityRagingVortex(entityItem.worldObj, 3.5F); bl.posX = entityItem.posX ; @@ -171,7 +171,7 @@ public class ItemDrop extends Item { entityItem.worldObj.spawnEntityInWorld(bl); } } - if (stack.getItem() != null && stack.getItem() == ModItems.crystal_xen) { + if (stack.getItem() != null && stack.getItem() == ModItems.crystal_xen && MainRegistry.dropCrys) { if (!entityItem.worldObj.isRemote) { ExplosionChaos.floater(entityItem.worldObj, (int)entityItem.posX, (int)entityItem.posY, (int)entityItem.posZ, 25, 75); ExplosionChaos.move(entityItem.worldObj, (int)entityItem.posX, (int)entityItem.posY, (int)entityItem.posZ, 25, 0, 75, 0); diff --git a/com/hbm/items/special/WatzFuel.java b/com/hbm/items/special/WatzFuel.java index f338b93dc..af15e42da 100644 --- a/com/hbm/items/special/WatzFuel.java +++ b/com/hbm/items/special/WatzFuel.java @@ -45,6 +45,8 @@ public class WatzFuel extends ItemRadioactive { list.add("Heat provided: " + heat + " heat"); list.add("Heat multiplier: " + (heatMultiplier >= 1 ? "+" : "") + (Math.round(heatMultiplier * 1000) * .10 - 100) + "%"); list.add("Decay multiplier: " + (decayMultiplier >= 1 ? "+" : "") + (Math.round(decayMultiplier * 1000) * .10 - 100) + "%"); + + super.addInformation(itemstack, player, list, bool); } public static void setLifeTime(ItemStack stack, int time) { diff --git a/com/hbm/items/tool/ItemCassette.java b/com/hbm/items/tool/ItemCassette.java index ca20b2b47..48a47f902 100644 --- a/com/hbm/items/tool/ItemCassette.java +++ b/com/hbm/items/tool/ItemCassette.java @@ -2,21 +2,15 @@ package com.hbm.items.tool; import java.util.List; -import com.hbm.handler.FluidTypeHandler.FluidType; -import com.hbm.tileentity.conductor.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.ResourceLocation; -import net.minecraft.world.World; public class ItemCassette extends Item { diff --git a/com/hbm/items/tool/ItemCatalog.java b/com/hbm/items/tool/ItemCatalog.java index 338c5ad4a..065258c09 100644 --- a/com/hbm/items/tool/ItemCatalog.java +++ b/com/hbm/items/tool/ItemCatalog.java @@ -1,5 +1,7 @@ package com.hbm.items.tool; +import java.util.List; + import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; @@ -19,4 +21,10 @@ public class ItemCatalog extends Item { return stack; } + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) { + + list.add("For a guide on how to obtain this, visit https://bit.ly/2TPgcqT"); + list.add("No tricks this time, i promise."); + } } diff --git a/com/hbm/items/tool/ItemSatChip.java b/com/hbm/items/tool/ItemSatChip.java index 6c02e17ca..cad7dba8e 100644 --- a/com/hbm/items/tool/ItemSatChip.java +++ b/com/hbm/items/tool/ItemSatChip.java @@ -2,6 +2,8 @@ package com.hbm.items.tool; import java.util.List; +import com.hbm.items.ModItems; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -13,6 +15,30 @@ public class ItemSatChip extends Item { public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) { list.add("Satellite frequency: " + getFreq(itemstack)); + + if(this == ModItems.sat_foeq) + list.add("Gives you an achievement. That's it."); + + if(this == ModItems.sat_gerald) + list.add("Unused (for now)"); + + if(this == ModItems.sat_laser) + list.add("Allows to summon lasers with a 15 second cooldown."); + + if(this == ModItems.sat_mapper) + list.add("Displays currently loaded chunks."); + + if(this == ModItems.sat_miner) + list.add("Will deliver ore powders to a caargo landing pad."); + + if(this == ModItems.sat_radar) + list.add("Shows a map of active entities."); + + if(this == ModItems.sat_resonator) + list.add("Unused"); + + if(this == ModItems.sat_scanner) + list.add("Creates a topdown map of underground ores."); } public static int getFreq(ItemStack stack) { diff --git a/com/hbm/items/weapon/ItemAmmo.java b/com/hbm/items/weapon/ItemAmmo.java index 64c64efb0..134218181 100644 --- a/com/hbm/items/weapon/ItemAmmo.java +++ b/com/hbm/items/weapon/ItemAmmo.java @@ -87,6 +87,11 @@ public class ItemAmmo extends Item { list.add(EnumChatFormatting.BLUE + "+ Rocket"); list.add(EnumChatFormatting.YELLOW + "* Uhhhh"); } + if(this == ModItems.ammo_44_star) { + list.add(EnumChatFormatting.BLUE + "+ Highly increased damage"); + list.add(EnumChatFormatting.YELLOW + "* Starmetal"); + list.add(EnumChatFormatting.RED + "- Highly decreased damage"); + } //5mm if(this == ModItems.ammo_5mm_explosive) { @@ -99,6 +104,11 @@ public class ItemAmmo extends Item { list.add(EnumChatFormatting.YELLOW + "* Heavy metal"); list.add(EnumChatFormatting.RED + "- Highly increased wear"); } + if(this == ModItems.ammo_5mm_star) { + list.add(EnumChatFormatting.BLUE + "+ Highly increased damage"); + list.add(EnumChatFormatting.YELLOW + "* Starmetal"); + list.add(EnumChatFormatting.RED + "- Highly increased wear"); + } //9mm if(this == ModItems.ammo_9mm_ap) { @@ -136,6 +146,11 @@ public class ItemAmmo extends Item { list.add(EnumChatFormatting.YELLOW + "* Heavy metal"); list.add(EnumChatFormatting.RED + "- Highly increased wear"); } + if(this == ModItems.ammo_50bmg_star) { + list.add(EnumChatFormatting.BLUE + "+ Highly increased damage"); + list.add(EnumChatFormatting.YELLOW + "* Starmetal"); + list.add(EnumChatFormatting.RED + "- Highly increased wear"); + } //.50 AE if(this == ModItems.ammo_50ae_ap) { @@ -147,6 +162,11 @@ public class ItemAmmo extends Item { list.add(EnumChatFormatting.YELLOW + "* Heavy metal"); list.add(EnumChatFormatting.RED + "- Highly increased wear"); } + if(this == ModItems.ammo_50ae_star) { + list.add(EnumChatFormatting.BLUE + "+ Highly increased damage"); + list.add(EnumChatFormatting.YELLOW + "* Starmetal"); + list.add(EnumChatFormatting.RED + "- Highly increased wear"); + } //84mm ROCKETS if(this == ModItems.ammo_rocket_he) { diff --git a/com/hbm/items/weapon/ItemGunBase.java b/com/hbm/items/weapon/ItemGunBase.java index 3facbaf47..7374362dc 100644 --- a/com/hbm/items/weapon/ItemGunBase.java +++ b/com/hbm/items/weapon/ItemGunBase.java @@ -30,6 +30,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import net.minecraftforge.client.event.MouseEvent; @@ -476,10 +477,17 @@ public class ItemGunBase extends Item implements IHoldableWeapon { list.add("Durability: " + dura + " / " + mainConfig.durability); - if(MainRegistry.enableDebugMode) { + //if(MainRegistry.enableDebugMode) { list.add(""); list.add("Name: " + mainConfig.name); list.add("Manufacturer: " + mainConfig.manufacturer); + //} + + if(!mainConfig.comment.isEmpty()) { + list.add(""); + for(String s : mainConfig.comment) + list.add(EnumChatFormatting.ITALIC + s); + list.add(""); } if(MainRegistry.enableExtendedLogging) { @@ -652,7 +660,7 @@ public class ItemGunBase extends Item implements IHoldableWeapon { } /// NBT utility /// - protected static void writeNBT(ItemStack stack, String key, int value) { + public static void writeNBT(ItemStack stack, String key, int value) { if(!stack.hasTagCompound()) stack.stackTagCompound = new NBTTagCompound(); @@ -660,7 +668,7 @@ public class ItemGunBase extends Item implements IHoldableWeapon { stack.stackTagCompound.setInteger(key, value); } - protected static int readNBT(ItemStack stack, String key) { + public static int readNBT(ItemStack stack, String key) { if(!stack.hasTagCompound()) return 0; diff --git a/com/hbm/items/weapon/ItemGunGauss.java b/com/hbm/items/weapon/ItemGunGauss.java index 144be1df4..30a95706b 100644 --- a/com/hbm/items/weapon/ItemGunGauss.java +++ b/com/hbm/items/weapon/ItemGunGauss.java @@ -121,4 +121,13 @@ public class ItemGunGauss extends ItemGunBase { public static int getCharge(ItemStack stack) { return readNBT(stack, "gauss_charge"); } + + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) { + + list.add("alt-fire is broken, just yell at me until i fix it ok"); + list.add(""); + + super.addInformation(stack, player, list, bool); + } } diff --git a/com/hbm/items/weapon/ItemGunLacunae.java b/com/hbm/items/weapon/ItemGunLacunae.java new file mode 100644 index 000000000..62312bfdd --- /dev/null +++ b/com/hbm/items/weapon/ItemGunLacunae.java @@ -0,0 +1,68 @@ +package com.hbm.items.weapon; + +import java.util.List; + +import org.lwjgl.input.Keyboard; +import org.lwjgl.input.Mouse; + +import com.hbm.entity.projectile.EntityBulletBase; +import com.hbm.entity.projectile.EntityCombineBall; +import com.hbm.handler.BulletConfigSyncingUtil; +import com.hbm.handler.BulletConfiguration; +import com.hbm.handler.GunConfiguration; +import com.hbm.interfaces.IHoldableWeapon; +import com.hbm.items.ModItems; +import com.hbm.main.MainRegistry; +import com.hbm.packet.GunButtonPacket; +import com.hbm.packet.PacketDispatcher; +import com.hbm.render.util.RenderScreenOverlay.Crosshair; +import com.hbm.sound.AudioWrapper; + +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.Minecraft; +import net.minecraft.client.entity.EntityClientPlayerMP; +import net.minecraft.client.resources.I18n; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; +import net.minecraftforge.client.event.MouseEvent; + +public class ItemGunLacunae extends ItemGunBase { + + public ItemGunLacunae(GunConfiguration config) { + super(config); + } + + @Override + public void startAction(ItemStack stack, World world, EntityPlayer player, boolean main) { + + setDelay(stack, 20); + world.playSoundAtEntity(player, "hbm:weapon.lacunaeSpinup", 1.0F, 1.0F); + } + + @Override + public void endAction(ItemStack stack, World world, EntityPlayer player, boolean main) { + + world.playSoundAtEntity(player, "hbm:weapon.lacunaeSpindown", 1.0F, 1.0F); + } + + protected void updateServer(ItemStack stack, World world, EntityPlayer player, int slot, boolean isCurrentItem) { + + super.updateServer(stack, world, player, slot, isCurrentItem); + + if(getIsMouseDown(stack)) { + + int rot = readNBT(stack, "rot") % 360; + rot += 25; + writeNBT(stack, "rot", rot); + } + } +} diff --git a/com/hbm/items/weapon/WeaponizedCell.java b/com/hbm/items/weapon/WeaponizedCell.java index eb3178d21..27d8cab7b 100644 --- a/com/hbm/items/weapon/WeaponizedCell.java +++ b/com/hbm/items/weapon/WeaponizedCell.java @@ -4,6 +4,7 @@ import java.util.List; import com.hbm.entity.effect.EntityCloudFleijaRainbow; import com.hbm.entity.logic.EntityNukeExplosionMK3; +import com.hbm.main.MainRegistry; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -20,28 +21,31 @@ public class WeaponizedCell extends Item { if(item.ticksExisted > 50 * 20 || item.isBurning()) { if(!world.isRemote) { - world.playSoundEffect(item.posX, item.posY, item.posZ, - "random.explode", 100.0f, world.rand.nextFloat() * 0.1F + 0.9F); - - EntityNukeExplosionMK3 exp = new EntityNukeExplosionMK3(world); - exp.posX = item.posX; - exp.posY = item.posY; - exp.posZ = item.posZ; - exp.destructionRange = 100; - exp.speed = 25; - exp.coefficient = 1.0F; - exp.waste = false; - - world.spawnEntityInWorld(exp); - EntityCloudFleijaRainbow cloud = new EntityCloudFleijaRainbow(world, 100); - cloud.posX = item.posX; - cloud.posY = item.posY; - cloud.posZ = item.posZ; - world.spawnEntityInWorld(cloud); + if(MainRegistry.dropStar) { + + world.playSoundEffect(item.posX, item.posY, item.posZ, "random.explode", 100.0f, world.rand.nextFloat() * 0.1F + 0.9F); + + EntityNukeExplosionMK3 exp = new EntityNukeExplosionMK3(world); + exp.posX = item.posX; + exp.posY = item.posY; + exp.posZ = item.posZ; + exp.destructionRange = 100; + exp.speed = 25; + exp.coefficient = 1.0F; + exp.waste = false; + + world.spawnEntityInWorld(exp); + + EntityCloudFleijaRainbow cloud = new EntityCloudFleijaRainbow(world, 100); + cloud.posX = item.posX; + cloud.posY = item.posY; + cloud.posZ = item.posZ; + world.spawnEntityInWorld(cloud); + } + + item.setDead(); } - - item.setDead(); } int randy = (50 * 20) - item.ticksExisted; diff --git a/com/hbm/lib/RefStrings.java b/com/hbm/lib/RefStrings.java index d4c707371..5bbe2224d 100644 --- a/com/hbm/lib/RefStrings.java +++ b/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ package com.hbm.lib; public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech Mod"; - public static final String VERSION = "1.0.27 BETA (3365)"; + public static final String VERSION = "1.0.27 BETA (3442)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/com/hbm/main/ClientProxy.java b/com/hbm/main/ClientProxy.java index f27b89bba..9e98dbf06 100644 --- a/com/hbm/main/ClientProxy.java +++ b/com/hbm/main/ClientProxy.java @@ -142,6 +142,7 @@ public class ClientProxy extends ServerProxy MinecraftForgeClient.registerItemRenderer(ModItems.gun_stinger, new ItemRenderStinger()); MinecraftForgeClient.registerItemRenderer(ModItems.gun_skystinger, new ItemRenderStinger()); MinecraftForgeClient.registerItemRenderer(ModItems.gun_hk69, new ItemRenderWeaponObj()); + MinecraftForgeClient.registerItemRenderer(ModItems.gun_deagle, new ItemRenderWeaponObj()); //MinecraftForgeClient.registerItemRenderer(ModItems.gun_rpg_ammo, new ItemRenderRocket()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityBombMulti.class, new RenderBombMulti()); diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index af41bb192..8da7ce174 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -913,18 +913,22 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_20gauge_wither, 4), new Object[] { "BCB", "CAC", "BCB", 'B', ModItems.ammo_20gauge, 'A', Blocks.soul_sand, 'C', "dustCoal" })); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_44_ap, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_44, 'A', ModItems.ingot_dura_steel }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_44_du, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_44, 'A', ModItems.ingot_u238 }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_44_star, 4), new Object[] { " B ", "BAB", " B ", 'B', ModItems.ammo_44_du, 'A', ModItems.ingot_starmetal }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_44_pip, 1), new Object[] { " B ", "BAB", " B ", 'A', ModItems.ammo_44, 'B', ModItems.powder_magic }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_44_bj, 1), new Object[] { " C ", "BAB", " C ", 'A', ModItems.ammo_44, 'B', ModItems.powder_magic, 'C', "dustDesh" })); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_5mm_explosive, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_5mm, 'A', Blocks.tnt }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_5mm_du, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_5mm, 'A', ModItems.ingot_u238 }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_5mm_star, 4), new Object[] { " B ", "BAB", " B ", 'B', ModItems.ammo_5mm_du, 'A', ModItems.ingot_starmetal }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_9mm_ap, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_9mm, 'A', ModItems.ingot_dura_steel }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_9mm_du, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_9mm, 'A', ModItems.ingot_u238 }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_22lr_ap, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_22lr, 'A', ModItems.ingot_dura_steel }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_50bmg_incendiary, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_50bmg, 'A', ModItems.powder_fire }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_50bmg_explosive, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_50bmg, 'A', Blocks.tnt }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_50bmg_du, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_50bmg, 'A', ModItems.ingot_u238 }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_50bmg_star, 4), new Object[] { " B ", "BAB", " B ", 'B', ModItems.ammo_50bmg_du, 'A', ModItems.ingot_starmetal }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_50ae_ap, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_50ae, 'A', ModItems.ingot_dura_steel }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_50ae_du, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_50ae, 'A', ModItems.ingot_u238 }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_50ae_star, 4), new Object[] { " B ", "BAB", " B ", 'B', ModItems.ammo_50ae_du, 'A', ModItems.ingot_starmetal }); GameRegistry.addRecipe(new ItemStack(ModItems.folly_bullet, 1), new Object[] { " S ", "STS", "SMS", 'S', ModItems.ingot_starmetal, 'T', ModItems.powder_magic, 'M', ModBlocks.block_meteor }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.folly_bullet_nuclear, 1), new Object[] { " N ", "UTU", "UTU", 'N', ModItems.gun_fatman_ammo, 'U', "ingotIron", 'T', "blockTungsten" })); diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index 1be43d39d..d3a5af338 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -318,6 +318,12 @@ public class MainRegistry public static int generalOverride = 0; public static int polaroidID = 1; + public static boolean dropCell = true; + public static boolean dropSing = true; + public static boolean dropStar = true; + public static boolean dropCrys = true; + public static boolean dropDead = true; + public static int taintID = 62; public static int radiationID = 63; public static int bangID = 64; @@ -1763,6 +1769,13 @@ public class MainRegistry final String CATEGORY_MACHINE = "09_machines"; templateBlacklist = Arrays.asList(createConfigStringList(config, CATEGORY_MACHINE, "9.00_templateBlacklist", "Which machine templates should be prohibited from being created (args: enum names)")); + + final String CATEGORY_DROPS = "10_dangerous_drops"; + dropCell = createConfigBool(config, CATEGORY_DROPS, "10.00_dropCell", "Whether antimatter cells should explode when dropped", true); + dropSing = createConfigBool(config, CATEGORY_DROPS, "10.01_dropBHole", "Whether singularities and blaack holes should spawn when dropped", true); + dropStar = createConfigBool(config, CATEGORY_DROPS, "10.02_dropStar", "Whether rigged star blaster cells should explode when dropped", true); + dropCrys = createConfigBool(config, CATEGORY_DROPS, "10.04_dropCrys", "Whether xen crystals should move blocks when dropped", true); + dropDead = createConfigBool(config, CATEGORY_DROPS, "10.05_dropDead", "Whether dead man's explosives should explode when dropped", true); config.save(); @@ -1809,6 +1822,13 @@ public class MainRegistry return prop.getInt(); } + private static boolean createConfigBool(Configuration config, String category, String name, String comment, boolean def) { + + Property prop = config.get(category, name, def); + prop.comment = comment; + return prop.getBoolean(); + } + private static String[] createConfigStringList(Configuration config, String category, String name, String comment) { Property prop = config.get(category, name, new String[] { "PLACEHOLDER" } ); diff --git a/com/hbm/main/ModEventHandler.java b/com/hbm/main/ModEventHandler.java index 050a83700..214dc7482 100644 --- a/com/hbm/main/ModEventHandler.java +++ b/com/hbm/main/ModEventHandler.java @@ -1,10 +1,8 @@ package com.hbm.main; -import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.ArrayList; -import java.util.Base64; import java.util.List; import java.util.Random; @@ -27,8 +25,6 @@ import com.hbm.saveddata.RadiationSavedData; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; import cpw.mods.fml.common.gameevent.TickEvent.WorldTickEvent; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.EntityCreeper; @@ -52,10 +48,8 @@ import net.minecraft.world.chunk.Chunk; import net.minecraftforge.event.entity.EntityEvent.EnteringChunk; import net.minecraftforge.event.entity.living.LivingDeathEvent; import net.minecraftforge.event.entity.living.LivingSpawnEvent; -import net.minecraftforge.event.entity.player.PlayerDropsEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; -import scala.actors.threadpool.Arrays; public class ModEventHandler { @@ -385,13 +379,15 @@ public class ModEventHandler } String[] hashes = new String[] { - "da07ea0f3b13c2b3357511a7cb6121a7beaab120d0b9d745bb3637a1ff0e4d07", - "1aed2593fe54480eb240d110444131469757429dc7f9dd9ce5768aa4ae8c99c7", - "7bc4ada27654650ebc4a499d7ebd66f6f9fbb0d93b9091aadbe3afd155cc3547", - "3eec01bdbdfb1b9cb6eb66956f2049eac6e257a24e1e84b90da1ee3337c80385" + "7e6fabead604ce497b32c2ff29148254879980c045b97fa627eb074eb2de81e7", + "9031b60664473360593e89c7c9ece297ee3fbee25b0891450d904f15b3255bf6", + "d841ef1ebaf7bdb284fc20be3508a8db1dae78f8630bf9d192bb7cd8384458da", + "7c78f529c5f4748577bd8922753c04135cd733f525172b5a782894cfb9d544a8" }; + static final String salt = "df5fe65986dc0f145a867ad29aee9bfebc3a1cd5afb05f32"; + @SubscribeEvent public void onClickSign(PlayerInteractEvent event) { @@ -404,16 +400,23 @@ public class ModEventHandler TileEntitySign sign = (TileEntitySign)world.getTileEntity(x, y, z); + int correct = 0; + for(int i = 0; i < 4; i++) { - if(!hashes[i].equals(getHash(sign.signText[i]))) { - return; + if(hashes[i].equals(getHash(sign.signText[i] + salt))) { + sign.signText[i] = "Correct!"; + sign.markDirty(); + sign.getWorldObj().markBlockForUpdate(x, y, z); + correct++; } } - world.func_147480_a(x, y, z, false); - EntityItem entityitem = new EntityItem(world, x, y, z, new ItemStack(ModItems.bobmazon_hidden)); - entityitem.delayBeforeCanPickup = 10; - world.spawnEntityInWorld(entityitem); + if(correct == 4) { + world.func_147480_a(x, y, z, false); + EntityItem entityitem = new EntityItem(world, x, y, z, new ItemStack(ModItems.bobmazon_hidden)); + entityitem.delayBeforeCanPickup = 10; + world.spawnEntityInWorld(entityitem); + } } } diff --git a/com/hbm/main/ResourceManager.java b/com/hbm/main/ResourceManager.java index a4bfa867a..7a0a8c7fc 100644 --- a/com/hbm/main/ResourceManager.java +++ b/com/hbm/main/ResourceManager.java @@ -282,7 +282,8 @@ public class ResourceManager { public static final IModelCustom shimmer_axe = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/shimmer_axe.obj")); public static final IModelCustom brimstone = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/brimstone.obj")); - public static final IModelCustom hk69 = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/weapons/hk69.obj")); + public static final IModelCustom hk69 = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/hk69.obj")); + public static final IModelCustom deagle = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/deagle.obj")); ////Texture Items @@ -292,6 +293,7 @@ public class ResourceManager { public static final ResourceLocation brimstone_tex = new ResourceLocation(RefStrings.MODID, "textures/models/brimstone.png"); public static final ResourceLocation hk69_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/hk69.png"); + public static final ResourceLocation deagle_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/deagle.png"); diff --git a/com/hbm/render/item/ItemRenderOverkill.java b/com/hbm/render/item/ItemRenderOverkill.java index 5ab7b1282..25b31678c 100644 --- a/com/hbm/render/item/ItemRenderOverkill.java +++ b/com/hbm/render/item/ItemRenderOverkill.java @@ -4,6 +4,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.items.ModItems; import com.hbm.items.weapon.GunFolly; +import com.hbm.items.weapon.ItemGunBase; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; import com.hbm.render.model.ModelCalBarrel; @@ -203,7 +204,7 @@ public class ItemRenderOverkill implements IItemRenderer { if(item.getItem() == ModItems.gun_lacunae || item.getItem() == ModItems.gun_minigun || item.getItem() == ModItems.gun_avenger) - lacunae.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, f); + lacunae.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, ItemGunBase.readNBT(item, "rot")); if(item.getItem() == ModItems.gun_folly) { int state = GunFolly.getState(item); diff --git a/com/hbm/render/item/ItemRenderWeaponObj.java b/com/hbm/render/item/ItemRenderWeaponObj.java index 8fd27ac32..7302442a0 100644 --- a/com/hbm/render/item/ItemRenderWeaponObj.java +++ b/com/hbm/render/item/ItemRenderWeaponObj.java @@ -10,6 +10,7 @@ import com.hbm.render.model.ModelPanzerschreck; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; @@ -33,7 +34,8 @@ public class ItemRenderWeaponObj implements IItemRenderer { @Override public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return false; + + return type == ItemRenderType.ENTITY && (helper == ItemRendererHelper.ENTITY_ROTATION || helper == ItemRendererHelper.ENTITY_BOBBING); } @Override @@ -41,44 +43,95 @@ public class ItemRenderWeaponObj implements IItemRenderer { GL11.glPushMatrix(); GL11.glDisable(GL11.GL_CULL_FACE); + + EntityPlayer player = Minecraft.getMinecraft().thePlayer; if(item.getItem() == ModItems.gun_hk69) Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.hk69_tex); + + if(item.getItem() == ModItems.gun_deagle) + Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.turbofan_blades_tex); switch(type) { case EQUIPPED_FIRST_PERSON: - GL11.glTranslatef(1.0F, 0.5F, 0.0F); - GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-25F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(-10F, 0.0F, 1.0F, 0.0F); - GL11.glScaled(0.75, 0.75, 0.75); - if(Minecraft.getMinecraft().thePlayer.isSneaking()) { - GL11.glTranslatef(1.16F, 0.35F, -0.8F); - GL11.glRotatef(5.5F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(4F, 1.0F, 0.0F, 0.0F); + + if(item.getItem() == ModItems.gun_hk69) { + GL11.glTranslatef(1.0F, 0.5F, 0.0F); + GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(-25F, 1.0F, 0.0F, 0.0F); + GL11.glRotatef(-10F, 0.0F, 1.0F, 0.0F); + GL11.glScaled(0.75, 0.75, 0.75); + + if(player.isSneaking()) { + GL11.glTranslatef(1.16F, 0.35F, -0.8F); + GL11.glRotatef(5.5F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(4F, 1.0F, 0.0F, 0.0F); + } } + + if(item.getItem() == ModItems.gun_deagle) { + GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(25F, -1.0F, 0.0F, 0.0F); + GL11.glTranslatef(0.2F, 0.2F, 0.8F); + GL11.glScaled(0.2, 0.2, 0.2); + + if(player.isSneaking()) { + GL11.glTranslatef(3.7F, 1.7F, 0F); + GL11.glRotatef(-5F, 0.0F, 1.0F, 0.0F); + } + } + break; case EQUIPPED: - GL11.glRotatef(20F, 1.0F, 0.0F, 1.0F); - GL11.glRotatef(10F, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(0.4F, 0.0F, 0.55F); - GL11.glScaled(0.75, 0.75, 0.75); + + if(item.getItem() == ModItems.gun_hk69) { + GL11.glRotatef(20F, 1.0F, 0.0F, 1.0F); + GL11.glRotatef(10F, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(0.4F, 0.0F, 0.55F); + GL11.glScaled(0.75, 0.75, 0.75); + } + + if(item.getItem() == ModItems.gun_deagle) { + GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(35F, -1.0F, 0.0F, 0.0F); + GL11.glTranslatef(0.0F, -0.1F, 0.8F); + GL11.glScaled(0.15, 0.15, 0.15); + } + break; case ENTITY: - GL11.glTranslatef(0.0F, 0.2F, 0.0F); - GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F); - GL11.glScaled(0.75, 0.75, 0.75); + + if(item.getItem() == ModItems.gun_hk69) { + GL11.glTranslatef(0.0F, 0.2F, 0.0F); + GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F); + GL11.glScaled(0.75, 0.75, 0.75); + } + + if(item.getItem() == ModItems.gun_deagle) { + GL11.glTranslatef(0.0F, 0.2F, 0.0F); + GL11.glScaled(0.25, 0.25, 0.25); + } + break; default: break; } - if(item.getItem() == ModItems.gun_hk69) + if(item.getItem() == ModItems.gun_hk69) { + GL11.glShadeModel(GL11.GL_SMOOTH); ResourceManager.hk69.renderAll(); + GL11.glShadeModel(GL11.GL_FLAT); + } + + if(item.getItem() == ModItems.gun_deagle) { + GL11.glShadeModel(GL11.GL_SMOOTH); + ResourceManager.deagle.renderAll(); + GL11.glShadeModel(GL11.GL_FLAT); + } GL11.glEnable(GL11.GL_CULL_FACE); GL11.glPopMatrix(); diff --git a/com/hbm/render/model/ModelLacunae.java b/com/hbm/render/model/ModelLacunae.java index 396589f87..ba9c0a519 100644 --- a/com/hbm/render/model/ModelLacunae.java +++ b/com/hbm/render/model/ModelLacunae.java @@ -464,7 +464,7 @@ public class ModelLacunae extends ModelBase { super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5, entity); - rot *= 0.0025F; + rot *= Math.PI / 180F; Barrel1.rotateAngleX += rot; Barrel2.rotateAngleX += rot; @@ -556,6 +556,33 @@ public class ModelLacunae extends ModelBase { ClampB.render(f5); ClampF.render(f5); AmmoBox.render(f5); + + Barrel1.rotateAngleX -= rot; + Barrel2.rotateAngleX -= rot; + Barrel3.rotateAngleX -= rot; + Barrel4.rotateAngleX -= rot; + Barrel5.rotateAngleX -= rot; + Barrel6.rotateAngleX -= rot; + Brace1.rotateAngleX -= rot; + Brace2.rotateAngleX -= rot; + Brace3.rotateAngleX -= rot; + Brace4.rotateAngleX -= rot; + Brace5.rotateAngleX -= rot; + Brace6.rotateAngleX -= rot; + Brace7.rotateAngleX -= rot; + Brace8.rotateAngleX -= rot; + Brace9.rotateAngleX -= rot; + Brace10.rotateAngleX -= rot; + Brace11.rotateAngleX -= rot; + Brace12.rotateAngleX -= rot; + Disc1.rotateAngleX -= rot; + Disc2.rotateAngleX -= rot; + Disc3.rotateAngleX -= rot; + Disc4.rotateAngleX -= rot; + Disc5.rotateAngleX -= rot; + Disc6.rotateAngleX -= rot; + Disc7.rotateAngleX -= rot; + Disc8.rotateAngleX -= rot; } private void setRotation(ModelRenderer model, float x, float y, float z) { diff --git a/com/hbm/render/tileentity/RenderCoreComponent.java b/com/hbm/render/tileentity/RenderCoreComponent.java index 0997d10e2..0d5e92e98 100644 --- a/com/hbm/render/tileentity/RenderCoreComponent.java +++ b/com/hbm/render/tileentity/RenderCoreComponent.java @@ -4,6 +4,9 @@ import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; +import com.hbm.render.util.BeamPronter; +import com.hbm.render.util.BeamPronter.EnumBeamType; +import com.hbm.render.util.BeamPronter.EnumWaveType; import com.hbm.tileentity.machine.TileEntityCoreEmitter; import com.hbm.tileentity.machine.TileEntityCoreInjector; import com.hbm.tileentity.machine.TileEntityCoreReceiver; @@ -11,6 +14,7 @@ import com.hbm.tileentity.machine.TileEntityCoreReceiver; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Vec3; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; @@ -50,6 +54,8 @@ public class RenderCoreComponent extends TileEntitySpecialRenderer { if(tileEntity instanceof TileEntityCoreEmitter) { bindTexture(ResourceManager.dfc_emitter_tex); ResourceManager.dfc_emitter.renderAll(); + BeamPronter.prontHelix(Vec3.createVectorHelper(0, 0, 6), 0, 0.5, 0.5, EnumWaveType.SPIRAL, EnumBeamType.LINE, 0xFF0000, 0xFF8000, (int)tileEntity.getWorldObj().getTotalWorldTime() % 360 * -50, 100, 0.25F); + } if(tileEntity instanceof TileEntityCoreReceiver) { diff --git a/com/hbm/tileentity/machine/TileEntityCoreEmitter.java b/com/hbm/tileentity/machine/TileEntityCoreEmitter.java index 019a0e1e6..dd3275175 100644 --- a/com/hbm/tileentity/machine/TileEntityCoreEmitter.java +++ b/com/hbm/tileentity/machine/TileEntityCoreEmitter.java @@ -1,7 +1,106 @@ package com.hbm.tileentity.machine; -import net.minecraft.tileentity.TileEntity; +import java.util.ArrayList; +import java.util.List; -public class TileEntityCoreEmitter extends TileEntity { +import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.interfaces.IConsumer; +import com.hbm.interfaces.IFluidAcceptor; +import com.hbm.interfaces.ILaserable; +import com.hbm.inventory.FluidTank; +import com.hbm.tileentity.TileEntityMachineBase; + +import net.minecraftforge.common.util.ForgeDirection; + +public class TileEntityCoreEmitter extends TileEntityMachineBase implements IConsumer, IFluidAcceptor, ILaserable { + + public long power; + public static final long maxPower = 1000000000L; + public long joules; + public boolean isOn; + public FluidTank tank; + + public TileEntityCoreEmitter() { + super(2); + } + + @Override + public String getName() { + return "container.dfcEmitter"; + } + + @Override + public void updateEntity() { + + if (!worldObj.isRemote) { + + //tank.setType(0, 1, slots); + //tank.updateTank(xCoord, yCoord, zCoord); + + ForgeDirection dir = ForgeDirection.getOrientation(this.getBlockMetadata()); + + //worldObj.setBlock(xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ, Blocks.dirt); + } + } + + @Override + public void setFluidFill(int i, FluidType type) { + if(type.name().equals(tank.getTankType().name())) + tank.setFill(i); + } + + @Override + public int getFluidFill(FluidType type) { + if(type.name().equals(tank.getTankType().name())) + return tank.getFill(); + else + return 0; + } + + @Override + public int getMaxFluidFill(FluidType type) { + if(type.name().equals(tank.getTankType().name())) + return tank.getMaxFill(); + else + return 0; + } + + @Override + public void setFillstate(int fill, int index) { + tank.setFill(fill); + } + + @Override + public void setType(FluidType type, int index) { + tank.setTankType(type); + } + + @Override + public List getTanks() { + List list = new ArrayList(); + list.add(tank); + + return list; + } + + @Override + public void setPower(long i) { + this.power = i; + } + + @Override + public long getPower() { + return this.power; + } + + @Override + public long getMaxPower() { + return this.maxPower; + } + + @Override + public void addEnergy(long energy) { + joules += energy; + } }