diff --git a/assets/hbm/models/oilFlare.obj b/assets/hbm/models/oilFlare.obj index bee555c2e..1ccf29389 100644 --- a/assets/hbm/models/oilFlare.obj +++ b/assets/hbm/models/oilFlare.obj @@ -73,13 +73,13 @@ v -1.000000 7.500000 0.785714 v -0.785714 7.500000 0.785714 v -0.785714 7.500000 1.000000 v 1.000000 7.500000 1.000000 -v 1.000000 5.000000 1.000000 +v 1.000000 4.999417 1.000000 v 1.000000 2.500000 1.000000 v -1.000000 2.500000 1.000000 v -1.000000 5.000000 1.000000 v -1.000000 7.500000 1.000000 v 1.000000 2.499999 -1.000000 -v 1.000000 5.000000 -1.000000 +v 1.000000 4.999416 -1.000000 v 1.000000 7.499999 -1.000000 v 1.500000 5.000000 -1.500000 v 1.500000 5.000000 1.500000 @@ -185,523 +185,231 @@ v 0.785714 10.000000 -0.000000 v 0.000000 10.000000 -0.785714 v 0.000000 10.000000 0.785714 v -0.785714 10.000000 -0.000000 -vt 0.042703 0.061626 -vt 0.042703 0.046860 -vt 0.056160 0.046860 -vt 0.042703 0.184682 -vt 0.042703 0.169915 -vt 0.056160 0.169915 -vt 0.154843 0.184682 -vt 0.154843 0.169915 -vt 0.168299 0.169915 -vt 0.154843 0.061626 -vt 0.154843 0.046860 -vt 0.168299 0.046860 -vt 0.736438 0.957560 -vt 0.736438 0.972327 -vt 0.722982 0.972327 -vt 0.700374 0.957560 -vt 0.700374 0.972327 -vt 0.686918 0.972327 -vt 0.844631 0.957493 -vt 0.844631 0.972259 -vt 0.831174 0.972259 -vt 0.808567 0.957493 -vt 0.808567 0.972259 -vt 0.795110 0.972259 -vt 0.916664 0.184682 -vt 0.903255 0.184682 -vt 0.903255 0.012404 -vt 0.903255 0.356960 -vt 0.363627 0.184682 -vt 0.363627 0.012404 -vt 0.377036 0.012404 -vt 0.614789 0.188153 -vt 0.614789 0.015968 -vt 0.628246 0.015968 -vt 0.332701 0.184682 -vt 0.319293 0.184682 -vt 0.310975 0.012404 -vt 0.222306 0.012404 -vt 0.235715 0.012404 -vt 0.244033 0.184682 -vt 0.772503 0.184606 -vt 0.772503 0.356807 -vt 0.759046 0.356807 -vt 0.772503 0.529009 -vt 0.244033 0.356960 -vt 0.244033 0.529238 -vt 0.230624 0.529238 -vt 0.244033 0.701516 -vt 0.772503 0.701210 -vt 0.759046 0.701210 -vt 0.235715 0.356960 -vt 0.222306 0.356960 -vt 0.235715 0.184682 -vt 0.230624 0.356960 -vt 0.324383 0.356960 -vt 0.332701 0.529238 -vt 0.319293 0.529238 -vt 0.324383 0.529238 -vt 0.332701 0.701516 -vt 0.319293 0.701516 -vt 0.324383 0.701516 -vt 0.310975 0.701516 -vt 0.614789 0.532523 -vt 0.614789 0.360338 -vt 0.628246 0.360338 -vt 0.363627 0.529238 -vt 0.363627 0.356960 -vt 0.377036 0.356960 -vt 0.363627 0.701516 -vt 0.377036 0.529238 -vt 0.614789 0.704707 -vt 0.628246 0.532523 -vt 0.628246 0.188153 -vt 0.377036 0.184682 -vt 0.903255 0.529238 -vt 0.916664 0.356960 -vt 0.916664 0.529238 -vt 0.916664 0.701516 -vt 0.903255 0.701516 -vt 0.578725 0.188153 -vt 0.578725 0.015968 -vt 0.592182 0.015968 -vt 0.592182 0.188153 -vt 0.592182 0.360338 -vt 0.578725 0.360338 -vt 0.592182 0.532522 -vt 0.578725 0.532522 -vt 0.578725 0.704707 -vt 0.288367 0.701516 -vt 0.274958 0.701516 -vt 0.274958 0.529238 -vt 0.274958 0.356960 -vt 0.288367 0.356960 -vt 0.274958 0.184682 -vt 0.274958 0.012404 -vt 0.288367 0.012404 -vt 0.288367 0.184682 -vt 0.650853 0.187832 -vt 0.650853 0.012404 -vt 0.664310 0.012404 -vt 0.650853 0.360034 -vt 0.650853 0.184606 -vt 0.664310 0.184606 -vt 0.664310 0.532235 -vt 0.650853 0.532235 -vt 0.650853 0.356807 -vt 0.650853 0.529009 -vt 0.664310 0.529009 -vt 0.664310 0.704437 -vt 0.614789 0.012404 -vt 0.628246 0.012404 -vt 0.664310 0.187832 -vt 0.664310 0.356807 -vt 0.650853 0.015631 -vt 0.592182 0.701143 -vt 0.578725 0.701143 -vt 0.772503 0.353581 -vt 0.759046 0.529009 -vt 0.759046 0.181379 -vt 0.772503 0.181379 -vt 0.592182 0.184589 -vt 0.578725 0.012404 -vt 0.592182 0.012404 -vt 0.578725 0.184589 -vt 0.578725 0.356773 -vt 0.592182 0.356773 -vt 0.772503 0.697984 -vt 0.759046 0.697984 -vt 0.368718 0.701516 -vt 0.355309 0.701516 -vt 0.368718 0.529238 -vt 0.377036 0.701516 -vt 0.266640 0.356960 -vt 0.280049 0.356960 -vt 0.266640 0.012404 -vt 0.355309 0.012404 -vt 0.368718 0.356960 -vt 0.355309 0.356960 -vt 0.759046 0.184606 -vt 0.759046 0.012404 -vt 0.772503 0.012404 -vt 0.244033 0.012404 -vt 0.230624 0.184682 -vt 0.319293 0.012404 -vt 0.332701 0.012404 -vt 0.664310 0.701210 -vt 0.650853 0.701210 -vt 0.332701 0.356960 -vt 0.319293 0.356960 -vt 0.056160 0.115771 -vt 0.105501 0.061626 -vt 0.056160 0.061626 -vt 0.154843 0.115771 -vt 0.168299 0.061626 -vt 0.056160 0.184682 -vt 0.105501 0.169915 -vt 0.011304 0.870083 -vt 0.024760 0.870083 -vt 0.024760 0.978372 -vt 0.449164 0.987494 -vt 0.435707 0.987494 -vt 0.435707 0.879205 -vt 0.489263 0.879307 -vt 0.502720 0.879307 -vt 0.502720 0.987596 -vt 0.211936 0.978313 -vt 0.198479 0.978313 -vt 0.198479 0.870024 -vt 0.168299 0.401457 -vt 0.154843 0.347313 -vt 0.168299 0.293168 -vt 0.042703 0.293168 -vt 0.056160 0.293168 -vt 0.056160 0.347313 -vt 0.105501 0.401457 -vt 0.154843 0.416224 -vt 0.056160 0.416224 -vt 0.105501 0.293168 -vt 0.056160 0.278401 -vt 0.399643 0.879205 -vt 0.413100 0.879205 -vt 0.413100 0.987494 -vt 0.880695 0.967710 -vt 0.867239 0.967710 -vt 0.867239 0.859421 -vt 0.867239 0.726324 -vt 0.880695 0.726324 -vt 0.880695 0.834613 -vt 0.053536 0.870083 -vt 0.066992 0.870083 -vt 0.066992 0.978372 -vt 0.939271 0.184682 -vt 0.939271 0.012404 -vt 0.952680 0.012404 -vt 0.795110 0.528958 -vt 0.808567 0.528958 -vt 0.808567 0.701143 -vt 0.952680 0.529238 -vt 0.952680 0.701516 -vt 0.939271 0.701516 -vt 0.952680 0.356960 -vt 0.939271 0.529238 -vt 0.939271 0.356960 -vt 0.952680 0.184682 -vt 0.795110 0.012404 -vt 0.808567 0.012404 -vt 0.808567 0.184589 -vt 0.808567 0.356773 -vt 0.795110 0.356773 -vt 0.795110 0.184589 -vt 0.736439 0.184606 -vt 0.722982 0.184606 -vt 0.722982 0.012404 -vt 0.736439 0.356807 -vt 0.722982 0.356807 -vt 0.736439 0.529009 -vt 0.722982 0.701210 -vt 0.722982 0.529009 -vt 0.700374 0.529009 -vt 0.700374 0.701210 -vt 0.686918 0.701210 -vt 0.686918 0.356807 -vt 0.700374 0.356807 -vt 0.700374 0.184606 -vt 0.686918 0.184606 -vt 0.686918 0.012404 -vt 0.988696 0.012404 -vt 0.988696 0.184682 -vt 0.975287 0.184682 -vt 0.988696 0.356960 -vt 0.975287 0.356960 -vt 0.988696 0.529238 -vt 0.975287 0.529238 -vt 0.988696 0.701516 -vt 0.831174 0.012404 -vt 0.844631 0.012404 -vt 0.844631 0.184589 -vt 0.831174 0.184589 -vt 0.844631 0.356773 -vt 0.831174 0.356773 -vt 0.844631 0.528958 -vt 0.844631 0.701143 -vt 0.831174 0.701143 -vt 0.831174 0.528958 -vt 0.867239 0.701516 -vt 0.867239 0.529238 -vt 0.880647 0.529238 -vt 0.880647 0.356960 -vt 0.880648 0.184682 -vt 0.867239 0.356960 -vt 0.880648 0.012404 -vt 0.867239 0.184682 -vt 0.000000 0.000000 -vt 0.011304 0.450679 -vt 0.011304 0.243946 -vt 0.199698 0.243946 -vt 0.168299 0.278401 -vt 0.199698 0.450679 -vt 0.199698 0.219138 -vt 0.011304 0.219138 -vt 0.199698 0.012404 -vt 0.011304 0.012404 -vt 0.138024 0.702173 -vt 0.126008 0.734006 -vt 0.100519 0.706035 -vt 0.410744 0.012404 -vt 0.421846 0.012554 -vt 0.421846 0.219196 -vt 0.138024 0.670341 -vt 0.126008 0.638508 -vt 0.162056 0.638508 -vt 0.489263 0.012404 -vt 0.499937 0.012404 -vt 0.499937 0.219138 -vt 0.158537 0.679664 -vt 0.187546 0.666479 -vt 0.187546 0.706035 -vt 0.511386 0.012404 -vt 0.511387 0.219138 -vt 0.129528 0.692850 -vt 0.100519 0.666479 -vt 0.455554 0.580780 -vt 0.455554 0.374158 -vt 0.466656 0.373992 -vt 0.129528 0.679664 -vt 0.444453 0.580614 -vt 0.444453 0.373992 -vt 0.150040 0.702173 -vt 0.162056 0.734006 -vt 0.100519 0.613700 -vt 0.100519 0.475938 -vt 0.133822 0.475487 -vt 0.545443 0.580921 -vt 0.545443 0.374188 -vt 0.556117 0.374188 -vt 0.499937 0.563694 -vt 0.499937 0.580921 -vt 0.489263 0.580921 -vt 0.533994 0.580921 -vt 0.533994 0.374188 -vt 0.399643 0.012554 -vt 0.410744 0.219046 -vt 0.150040 0.670341 -vt 0.158537 0.692850 -vt 0.271164 0.726324 -vt 0.332701 0.754295 -vt 0.307212 0.821823 -vt 0.555633 0.605729 -vt 0.555634 0.743552 -vt 0.523611 0.743552 -vt 0.466014 0.605628 -vt 0.466014 0.743450 -vt 0.433991 0.743450 -vt 0.523611 0.605729 -vt 0.489263 0.743552 -vt 0.011304 0.613733 -vt 0.011304 0.475986 -vt 0.044607 0.475487 -vt 0.433991 0.605628 -vt 0.399643 0.743450 -vt 0.133822 0.613249 -vt 0.167126 0.475938 -vt 0.044607 0.613235 -vt 0.077911 0.475986 -vt 0.533994 0.029632 -vt 0.545443 0.029632 -vt 0.444453 0.029623 -vt 0.455554 0.029789 -vt 0.511387 0.563694 -vt 0.489263 0.563694 -vt 0.489263 0.219138 -vt 0.421846 0.563599 -vt 0.410744 0.563449 -vt 0.399643 0.563599 -vt 0.399643 0.219196 -vt 0.056160 0.401457 -vt 0.094400 0.359494 -vt 0.105501 0.364540 -vt 0.116602 0.359494 -vt 0.154843 0.401457 -vt 0.121201 0.347313 -vt 0.116602 0.335131 -vt 0.105501 0.330085 -vt 0.094400 0.335131 -vt 0.089802 0.347313 -vt 0.268675 0.894380 -vt 0.262667 0.910296 -vt 0.245674 0.891649 -vt 0.444453 0.012404 -vt 0.455554 0.012570 -vt 0.421846 0.580819 -vt 0.410744 0.580669 -vt 0.545443 0.012404 -vt 0.556117 0.012404 -vt 0.466656 0.012404 -vt 0.399643 0.580819 -vt 0.511387 0.580921 -vt 0.533994 0.012404 -vt 0.489263 0.854499 -vt 0.489263 0.768360 -vt 0.512162 0.768360 -vt 0.280691 0.894380 -vt 0.289188 0.885056 -vt 0.303692 0.891649 -vt 0.280691 0.862547 -vt 0.286699 0.846631 -vt 0.303692 0.865278 -vt 0.260179 0.871871 -vt 0.245674 0.865278 -vt 0.262668 0.846631 -vt 0.260179 0.885056 -vt 0.286699 0.910296 -vt 0.289188 0.871871 -vt 0.268675 0.862547 -vt 0.116602 0.103589 -vt 0.144924 0.759146 -vt 0.144924 0.845239 -vt 0.122721 0.844907 -vt 0.189734 0.758814 -vt 0.189734 0.844915 -vt 0.167531 0.845216 -vt 0.512162 0.854499 -vt 0.533510 0.768360 -vt 0.122721 0.758814 -vt 0.100519 0.845239 -vt 0.422542 0.854397 -vt 0.422542 0.768258 -vt 0.443890 0.768258 -vt 0.399643 0.854397 -vt 0.399643 0.768258 -vt 0.211936 0.759115 -vt 0.211936 0.845216 -vt 0.752887 0.726018 -vt 0.772503 0.726018 -vt 0.772503 0.932752 -vt 0.265229 0.935104 -vt 0.265229 0.956639 -vt 0.245674 0.956639 -vt 0.374923 0.933058 -vt 0.355309 0.933058 -vt 0.355309 0.726324 -vt 0.307391 0.935104 -vt 0.307391 0.956639 -vt 0.287836 0.956639 -vt 0.011304 0.638542 -vt 0.030928 0.638541 -vt 0.030928 0.845275 -vt 0.814735 0.932685 -vt 0.795110 0.932685 -vt 0.795110 0.725951 -vt 0.525327 0.879307 -vt 0.544943 0.879307 -vt 0.544943 0.900842 -vt 0.578725 0.729515 -vt 0.598349 0.729515 -vt 0.598349 0.935513 -vt 0.525327 0.925650 -vt 0.544941 0.925650 -vt 0.544941 0.947185 -vt 0.620957 0.729515 -vt 0.640581 0.729515 -vt 0.640581 0.935513 -vt 0.686918 0.932752 -vt 0.686918 0.726018 -vt 0.706542 0.726018 -vt 0.073160 0.638541 -vt 0.073160 0.845275 -vt 0.053536 0.845275 -vt 0.117512 0.933712 -vt 0.100519 0.888694 -vt 0.158537 0.915065 -vt 0.094400 0.103589 -vt 0.089802 0.115771 -vt 0.094400 0.127953 -vt 0.105501 0.132999 -vt 0.116602 0.127953 -vt 0.121201 0.115771 -vt 0.168299 0.184682 -vt 0.722982 0.957560 -vt 0.686918 0.957560 -vt 0.831174 0.957493 -vt 0.795110 0.957493 -vt 0.916664 0.012404 -vt 0.324383 0.012404 -vt 0.230624 0.701516 -vt 0.222306 0.184682 -vt 0.310975 0.356960 -vt 0.310975 0.529238 -vt 0.628246 0.704707 -vt 0.592182 0.704707 -vt 0.288367 0.529238 -vt 0.664310 0.360034 -vt 0.650853 0.704437 -vt 0.664310 0.015631 -vt 0.759046 0.353581 -vt 0.355309 0.529238 -vt 0.280049 0.012404 -vt 0.368718 0.012404 -vt 0.230624 0.012404 -vt 0.011304 0.978372 -vt 0.449164 0.879205 -vt 0.489263 0.987596 -vt 0.211936 0.870024 -vt 0.154843 0.293168 -vt 0.042703 0.401457 -vt 0.154843 0.278401 -vt 0.399643 0.987494 -vt 0.880695 0.859421 -vt 0.867239 0.834613 -vt 0.053536 0.978372 -vt 0.795110 0.701143 -vt 0.736439 0.012404 -vt 0.736439 0.701210 -vt 0.686918 0.529009 -vt 0.700374 0.012404 -vt 0.975287 0.012404 -vt 0.975287 0.701516 -vt 0.880647 0.701516 -vt 0.867239 0.012404 -vt 0.042703 0.278401 -vt 0.042703 0.416224 -vt 0.168299 0.416224 -vt 0.466656 0.580614 -vt 0.556117 0.580921 -vt 0.271164 0.821823 -vt 0.245674 0.793852 -vt 0.245674 0.754295 -vt 0.307212 0.726324 -vt 0.332701 0.793852 -vt 0.489263 0.605729 -vt 0.399643 0.605628 -vt 0.167126 0.613700 -vt 0.077911 0.613733 -vt 0.556117 0.029632 -vt 0.466656 0.029623 -vt 0.105501 0.098543 -vt 0.167531 0.759115 -vt 0.533510 0.854499 -vt 0.100519 0.759146 -vt 0.443890 0.854397 -vt 0.752887 0.932752 -vt 0.245674 0.935104 -vt 0.374923 0.726324 -vt 0.287836 0.935104 -vt 0.011304 0.845275 -vt 0.814735 0.725951 -vt 0.525327 0.900842 -vt 0.578725 0.935513 -vt 0.525327 0.947185 -vt 0.620957 0.935513 -vt 0.706542 0.932752 -vt 0.053536 0.638542 -vt 0.141544 0.870047 -vt 0.158537 0.888694 -vt 0.141544 0.933712 -vt 0.100519 0.915065 -vt 0.117512 0.870047 +vt 0.397379 0.676621 +vt 0.397379 0.659785 +vt 0.414215 0.659785 +vt 0.414215 0.676621 +vt 0.508956 0.682773 +vt 0.492119 0.682773 +vt 0.492119 0.665937 +vt 0.259282 0.481688 +vt 0.276118 0.481688 +vt 0.276118 0.678115 +vt 0.159765 0.487474 +vt 0.159766 0.683901 +vt 0.142929 0.683901 +vt 0.176602 0.683901 +vt 0.176602 0.487474 +vt 0.193439 0.487474 +vt 0.126092 0.683901 +vt 0.126092 0.487474 +vt 0.142929 0.487474 +vt 0.951130 0.419382 +vt 0.934293 0.419382 +vt 0.934293 0.187374 +vt 0.951130 0.187374 +vt 0.259282 0.678115 +vt 0.242445 0.678115 +vt 0.193439 0.683924 +vt 0.292955 0.481688 +vt 0.309792 0.481688 +vt 0.309792 0.678115 +vt 0.890550 0.895409 +vt 0.873714 0.895409 +vt 0.873714 0.663401 +vt 0.890550 0.663401 +vt 0.292955 0.678115 +vt 0.242445 0.481688 +vt 0.570884 0.348475 +vt 0.509150 0.365312 +vt 0.447416 0.348475 +vt 0.570884 0.427046 +vt 0.570884 0.365312 +vt 0.587721 0.365312 +vt 0.447416 0.505617 +vt 0.509150 0.488781 +vt 0.570884 0.505617 +vt 0.430579 0.365312 +vt 0.447416 0.427046 +vt 0.430579 0.488781 +vt 0.823073 0.955128 +vt 0.699604 0.955128 +vt 0.699604 0.938291 +vt 0.823073 0.938291 +vt 0.509151 0.488780 +vt 0.627007 0.309189 +vt 0.587721 0.488780 +vt 0.391293 0.309189 +vt 0.391293 0.544904 +vt 0.627007 0.544903 +vt 0.150959 0.194056 +vt 0.135925 0.157761 +vt 0.181027 0.157761 +vt 0.690955 0.644624 +vt 0.705989 0.644624 +vt 0.705989 0.880337 +vt 0.286264 0.194056 +vt 0.271230 0.157761 +vt 0.316332 0.157761 +vt 0.721023 0.644624 +vt 0.721023 0.880337 +vt 0.015654 0.194057 +vt 0.000620 0.157761 +vt 0.045721 0.157761 +vt 0.736057 0.644624 +vt 0.736057 0.880337 +vt 0.196060 0.194056 +vt 0.226128 0.157761 +vt 0.751091 0.644624 +vt 0.751091 0.880337 +vt 0.241162 0.194056 +vt 0.766125 0.644624 +vt 0.766125 0.880337 +vt 0.105857 0.194056 +vt 0.090823 0.157761 +vt 0.316332 0.000619 +vt 0.361434 0.000619 +vt 0.781159 0.644624 +vt 0.781159 0.880337 +vt 0.560809 0.260328 +vt 0.560809 0.240685 +vt 0.575842 0.240685 +vt 0.796193 0.644624 +vt 0.796193 0.880337 +vt 0.811227 0.644624 +vt 0.811227 0.880337 +vt 0.331366 0.194056 +vt 0.361434 0.157761 +vt 0.060755 0.194057 +vt 0.910214 0.111717 +vt 0.833220 0.143609 +vt 0.801328 0.066615 +vt 0.045721 0.000619 +vt 0.090823 0.000619 +vt 0.226128 0.000619 +vt 0.271230 0.000619 +vt 0.135925 0.000619 +vt 0.181026 0.000619 +vt 0.000619 0.000620 +vt 0.790588 0.620702 +vt 0.775554 0.620702 +vt 0.775553 0.227849 +vt 0.760519 0.227849 +vt 0.745486 0.227849 +vt 0.760520 0.620702 +vt 0.730452 0.227849 +vt 0.745486 0.620702 +vt 0.715418 0.227849 +vt 0.730451 0.620702 +vt 0.715417 0.620702 +vt 0.700383 0.620702 +vt 0.700384 0.227849 +vt 0.685350 0.620702 +vt 0.685350 0.227849 +vt 0.805622 0.620702 +vt 0.790588 0.227849 +vt 0.447416 0.365311 +vt 0.495261 0.413156 +vt 0.489507 0.427046 +vt 0.495261 0.440935 +vt 0.447416 0.488781 +vt 0.509150 0.446689 +vt 0.523040 0.440935 +vt 0.528793 0.427046 +vt 0.523040 0.413156 +vt 0.509150 0.407403 +vt 0.645304 0.053326 +vt 0.652821 0.071474 +vt 0.622753 0.071474 +vt 0.515707 0.260328 +vt 0.515707 0.240685 +vt 0.530741 0.240685 +vt 0.575842 0.260328 +vt 0.590876 0.240685 +vt 0.500673 0.260328 +vt 0.500673 0.240685 +vt 0.530741 0.260328 +vt 0.545775 0.240685 +vt 0.470605 0.260328 +vt 0.470605 0.240685 +vt 0.485639 0.240685 +vt 0.545775 0.260328 +vt 0.485639 0.260328 +vt 0.502482 0.071474 +vt 0.502482 0.169687 +vt 0.472414 0.169687 +vt 0.449863 0.053326 +vt 0.464897 0.053326 +vt 0.472414 0.071474 +vt 0.525033 0.053326 +vt 0.532550 0.071474 +vt 0.585168 0.053326 +vt 0.592685 0.071474 +vt 0.562617 0.071474 +vt 0.615236 0.053326 +vt 0.434829 0.053326 +vt 0.442346 0.071474 +vt 0.412278 0.071474 +vt 0.479931 0.053326 +vt 0.494965 0.053326 +vt 0.540067 0.053326 +vt 0.555101 0.053326 +vt 0.570884 0.488781 +vt 0.562617 0.169687 +vt 0.532550 0.169687 +vt 0.652821 0.169687 +vt 0.622753 0.169687 +vt 0.442346 0.169687 +vt 0.592685 0.169687 +vt 0.412278 0.169687 +vt 0.303414 0.349532 +vt 0.303414 0.374085 +vt 0.067700 0.374085 +vt 0.327967 0.398639 +vt 0.303414 0.398639 +vt 0.067700 0.324979 +vt 0.067700 0.300425 +vt 0.303414 0.300425 +vt 0.043147 0.374085 +vt 0.067700 0.398638 +vt 0.303414 0.324978 +vt 0.067700 0.349532 +vt 0.692864 0.104440 +vt 0.714125 0.053111 +vt 0.744193 0.125701 +vt 0.508956 0.665937 +vt 0.587721 0.505616 +vt 0.587721 0.348475 +vt 0.430579 0.348475 +vt 0.430579 0.505618 +vt 0.165993 0.194056 +vt 0.690955 0.880337 +vt 0.301298 0.194056 +vt 0.030687 0.194057 +vt 0.211094 0.194056 +vt 0.256196 0.194056 +vt 0.120891 0.194056 +vt 0.346400 0.194056 +vt 0.075789 0.194057 +vt 0.833220 0.034724 +vt 0.878322 0.034724 +vt 0.910214 0.066615 +vt 0.878322 0.143609 +vt 0.801328 0.111717 +vt 0.805622 0.227849 +vt 0.630270 0.053326 +vt 0.590877 0.260328 +vt 0.509999 0.053326 +vt 0.570134 0.053326 +vt 0.600202 0.053326 +vt 0.419795 0.053326 +vt 0.327967 0.374085 +vt 0.043147 0.398638 +vt 0.765454 0.074372 +vt 0.765454 0.104440 +vt 0.714125 0.125701 +vt 0.692864 0.074372 +vt 0.744193 0.053111 vn 0.000000 1.000000 0.000000 vn 0.000000 -1.000000 0.000000 vn 0.000000 0.000000 -1.000000 @@ -710,13 +418,8 @@ vn 1.000000 0.000000 0.000000 vn 0.000000 0.532200 0.846600 vn 0.000000 0.532200 -0.846600 vn -1.000000 0.000000 0.000000 -vn 0.000000 -0.532200 -0.846600 -vn 0.000000 -0.532200 0.846600 vn -0.846600 0.532200 0.000000 vn 0.846600 0.532200 0.000000 -vn -0.846600 -0.532200 0.000000 -vn 0.846600 -0.532200 0.000000 -vn -0.998200 -0.059600 0.000000 vn -0.923900 0.000000 0.382700 vn -0.382700 0.000000 0.923900 vn 0.382700 0.000000 0.923900 @@ -725,464 +428,468 @@ vn 0.923900 0.000000 -0.382700 vn -0.923900 0.000000 -0.382700 vn 0.382700 0.000000 -0.923900 vn -0.382700 0.000000 -0.923900 +vn -0.003900 1.000000 -0.002700 +vn -0.003900 1.000000 0.002700 +vn 0.002700 1.000000 -0.003900 +vn 0.002700 1.000000 0.003900 s off f 7/1/1 2/2/1 6/3/1 -f 1/4/1 9/5/1 8/6/1 -f 12/7/1 11/8/1 13/9/1 -f 14/10/1 16/11/1 4/12/1 -f 25/13/2 26/14/2 20/15/2 -f 27/16/2 28/17/2 18/18/2 -f 23/19/2 29/20/2 30/21/2 -f 22/22/2 31/23/2 32/24/2 -f 56/25/3 68/26/3 3/27/3 -f 67/28/3 68/26/3 56/25/3 -f 57/29/4 30/30/4 29/31/4 -f 59/32/5 29/33/5 23/34/5 -f 34/35/6 33/36/6 21/37/6 -f 26/38/7 20/39/7 40/40/7 -f 41/41/8 48/42/8 50/43/8 -f 50/43/8 48/42/8 44/44/8 -f 50/45/3 45/46/3 47/47/3 -f 47/47/3 45/46/3 5/48/3 -f 44/44/8 7/49/8 5/50/8 -f 40/40/9 36/51/9 38/52/9 -f 33/53/7 50/45/7 49/54/7 -f 49/55/6 43/56/6 46/57/6 -f 47/58/6 16/59/6 14/60/6 -f 36/51/7 45/46/7 47/47/7 -f 43/56/10 6/61/10 5/62/10 -f 54/63/5 52/64/5 53/65/5 -f 55/66/4 51/67/4 52/68/4 -f 12/69/4 55/66/4 54/70/4 -f 11/71/5 54/63/5 56/72/5 -f 52/64/5 59/32/5 58/73/5 -f 51/67/4 57/29/4 59/74/4 -f 66/75/3 67/28/3 53/76/3 -f 58/77/3 23/78/3 24/79/3 -f 64/80/5 28/81/5 27/82/5 -f 63/83/5 60/84/5 62/85/5 -f 60/84/5 70/86/5 71/87/5 -f 9/88/5 71/87/5 70/86/5 -f 10/89/3 8/90/3 70/91/3 -f 70/91/3 60/92/3 61/93/3 -f 61/93/3 60/92/3 63/94/3 -f 27/95/3 17/96/3 65/97/3 -f 54/98/11 14/99/11 15/100/11 -f 52/101/11 46/102/11 42/103/11 -f 58/104/11 59/105/11 36/106/11 -f 33/107/11 35/108/11 23/109/11 -f 20/110/12 19/111/12 58/73/12 -f 35/108/13 33/107/13 52/101/13 -f 56/112/13 37/113/13 36/106/13 -f 42/103/13 46/102/13 11/114/13 -f 70/86/14 5/115/14 7/116/14 -f 62/117/11 44/44/11 45/118/11 -f 63/119/11 64/120/11 48/42/11 -f 28/81/14 27/82/14 40/121/14 -f 32/122/12 21/123/12 63/83/12 -f 41/124/12 40/121/12 60/84/12 -f 71/87/12 48/125/12 50/126/12 -f 9/127/13 8/128/13 45/118/13 -f 54/70/10 8/129/10 10/130/10 -f 70/131/6 11/132/6 12/69/6 -f 70/91/7 52/133/7 51/134/7 -f 65/97/9 51/134/9 52/133/9 -f 65/97/7 63/94/7 29/135/7 -f 59/74/6 57/29/6 17/136/6 -f 59/74/10 60/137/10 61/138/10 -f 60/137/6 54/70/6 55/66/6 -f 40/40/3 50/45/3 49/54/3 -f 40/139/8 21/140/8 32/141/8 -f 21/142/3 40/40/3 39/143/3 -f 33/36/4 20/144/4 26/145/4 -f 19/146/8 20/147/8 33/107/8 -f 38/148/4 36/149/4 33/36/4 -f 35/108/8 33/107/8 36/106/8 -f 38/148/4 43/56/4 46/57/4 -f 37/113/8 36/106/8 46/102/8 -f 16/59/4 14/60/4 46/57/4 -f 42/103/8 46/102/8 14/99/8 -f 7/1/1 183/150/1 9/5/1 -f 181/151/1 5/152/1 6/3/1 -f 13/9/1 182/153/1 15/154/1 -f 10/155/1 184/156/1 12/7/1 -f 64/157/2 63/158/2 40/159/2 -f 39/160/2 40/161/2 33/162/2 -f 59/163/1 57/164/1 65/165/1 -f 35/166/2 33/167/2 59/168/2 -f 53/169/1 122/170/1 37/171/1 -f 48/172/1 50/173/1 124/174/1 -f 121/175/1 51/176/1 61/177/1 -f 123/178/1 50/173/1 49/179/1 -f 55/180/2 54/181/2 70/182/2 -f 45/183/2 44/184/2 71/185/2 -f 46/186/1 42/187/1 56/188/1 -f 46/189/2 43/190/2 47/191/2 -f 72/192/4 2/193/4 7/194/4 -f 72/195/5 47/196/5 6/197/5 -f 41/198/4 32/199/4 31/200/4 -f 48/201/4 41/198/4 74/202/4 -f 73/203/4 72/192/4 44/204/4 -f 31/205/5 22/206/5 39/207/5 -f 49/208/5 73/209/5 74/210/5 -f 47/196/5 72/195/5 73/209/5 -f 68/211/8 55/212/8 12/213/8 -f 55/212/8 68/211/8 67/214/8 -f 51/215/8 67/214/8 66/216/8 -f 30/217/8 57/218/8 66/216/8 -f 65/219/8 17/220/8 18/221/8 -f 76/222/8 61/223/8 65/219/8 -f 69/224/8 61/223/8 76/222/8 -f 69/224/8 77/225/8 1/226/8 -f 28/227/4 64/228/4 75/229/4 -f 62/230/4 76/231/4 75/229/4 -f 71/232/4 77/233/4 76/231/4 -f 77/233/4 71/232/4 9/234/4 -f 4/235/5 16/236/5 43/237/5 -f 80/238/5 43/237/5 38/239/5 -f 79/240/5 38/239/5 34/241/5 -f 26/242/5 25/243/5 78/244/5 -f 19/245/3 35/246/3 78/247/3 -f 79/248/3 78/247/3 35/246/3 -f 80/249/3 79/248/3 37/250/3 -f 4/251/3 80/249/3 42/252/3 -f 38/253/15 49/253/15 73/253/15 -f 48/172/1 83/254/1 82/255/1 -f 82/255/1 81/256/1 79/257/1 -f 53/169/1 37/171/1 84/258/1 -f 51/176/1 83/254/1 61/177/1 -f 88/259/1 87/260/1 10/155/1 -f 85/261/1 88/259/1 13/9/1 -f 86/262/1 85/261/1 16/11/1 -f 87/260/1 86/262/1 7/1/1 -f 97/263/1 108/264/1 107/265/1 -f 103/266/16 101/267/16 130/268/16 -f 91/269/1 90/270/1 112/271/1 -f 101/272/17 99/273/17 129/274/17 -f 103/275/1 111/276/1 110/277/1 -f 97/278/18 128/279/18 129/274/18 -f 95/280/1 107/265/1 89/281/1 -f 95/282/19 127/283/19 128/284/19 -f 93/285/1 89/281/1 90/270/1 -f 93/286/20 126/287/20 127/283/20 -f 99/288/1 109/289/1 108/264/1 -f 112/290/21 113/291/21 115/292/21 -f 91/293/22 125/294/22 126/295/22 -f 100/296/17 137/297/17 138/298/17 -f 91/293/23 105/299/23 132/300/23 -f 105/301/21 103/266/21 131/302/21 -f 105/303/1 112/271/1 111/276/1 -f 101/304/1 110/277/1 109/289/1 -f 118/305/2 116/306/2 113/307/2 -f 110/308/17 116/309/17 117/310/17 -f 89/311/22 120/312/22 114/313/22 -f 109/314/18 117/310/18 118/315/18 -f 108/316/19 118/317/19 119/318/19 -f 90/319/23 114/313/23 113/320/23 -f 111/321/16 115/292/16 116/322/16 -f 107/323/20 119/318/20 120/324/20 -f 106/325/23 92/326/23 125/294/23 -f 126/295/22 125/294/22 92/326/22 -f 127/283/20 126/287/20 94/327/20 -f 128/284/19 127/283/19 96/328/19 -f 129/274/18 128/279/18 98/329/18 -f 100/296/17 102/330/17 130/331/17 -f 102/332/16 104/333/16 131/302/16 -f 104/333/21 106/334/21 132/335/21 -f 121/175/1 60/336/1 130/337/1 -f 121/175/1 131/338/1 132/339/1 -f 122/170/1 52/340/1 132/339/1 -f 122/170/1 125/341/1 126/342/1 -f 126/342/1 127/343/1 123/178/1 -f 123/178/1 127/343/1 128/344/1 -f 128/344/1 129/345/1 124/174/1 -f 124/174/1 129/345/1 130/337/1 -f 139/346/2 147/347/2 148/348/2 -f 94/327/20 133/349/20 135/350/20 -f 102/332/16 138/351/16 139/352/16 -f 92/326/22 134/353/22 133/354/22 -f 96/328/19 135/350/19 136/355/19 -f 104/333/21 139/352/21 140/356/21 -f 98/329/18 136/357/18 137/297/18 -f 106/325/23 140/358/23 134/353/23 -f 144/359/18 152/360/18 153/361/18 -f 138/362/2 137/363/2 145/364/2 -f 135/365/2 143/366/2 144/367/2 -f 134/368/2 142/369/2 141/370/2 -f 140/371/2 148/348/2 142/369/2 -f 138/362/2 146/372/2 147/347/2 -f 137/363/2 136/373/2 144/367/2 -f 135/365/2 133/374/2 141/370/2 -f 181/151/1 14/10/1 94/375/1 -f 141/376/20 149/377/20 151/378/20 -f 147/379/21 155/380/21 156/381/21 -f 145/382/17 153/361/17 154/383/17 -f 143/384/19 151/378/19 152/385/19 -f 142/386/22 150/387/22 149/388/22 -f 148/389/23 156/390/23 150/387/23 -f 146/391/16 154/392/16 155/380/16 -f 160/393/8 159/394/8 157/395/8 -f 164/396/3 163/397/3 159/398/3 -f 162/399/5 161/400/5 163/401/5 -f 158/402/4 157/403/4 161/404/4 -f 159/405/2 163/406/2 161/407/2 -f 164/408/1 160/409/1 158/410/1 -f 168/411/8 167/412/8 165/413/8 -f 172/414/3 171/415/3 167/416/3 -f 170/417/5 169/418/5 171/419/5 -f 166/420/4 165/421/4 169/422/4 -f 167/423/2 171/424/2 169/425/2 -f 172/426/1 168/427/1 166/428/1 -f 179/429/1 177/430/1 174/431/1 -f 98/432/1 5/152/1 181/151/1 -f 183/150/1 5/152/1 98/432/1 -f 183/150/1 100/433/1 102/434/1 -f 184/156/1 8/6/1 102/434/1 -f 184/156/1 104/435/1 106/436/1 -f 182/153/1 11/8/1 106/436/1 -f 182/153/1 92/437/1 94/375/1 -f 5/152/1 7/1/1 6/3/1 -f 10/155/1 1/4/1 8/6/1 -f 3/438/1 12/7/1 13/9/1 -f 15/154/1 14/10/1 4/12/1 -f 19/439/2 25/13/2 20/15/2 -f 17/440/2 27/16/2 18/18/2 -f 24/441/2 23/19/2 30/21/2 -f 21/442/2 22/22/2 32/24/2 -f 13/443/3 56/25/3 3/27/3 -f 53/76/3 67/28/3 56/25/3 -f 59/74/4 57/29/4 29/31/4 -f 58/73/5 59/32/5 23/34/5 -f 22/444/6 34/35/6 21/37/6 -f 39/143/7 26/38/7 40/40/7 -f 40/139/8 41/41/8 50/43/8 -f 45/118/8 50/43/8 44/44/8 -f 49/54/3 50/45/3 47/47/3 -f 6/445/3 47/47/3 5/48/3 -f 45/118/8 44/44/8 5/50/8 -f 39/143/9 40/40/9 38/52/9 -f 34/446/7 33/53/7 49/54/7 -f 50/447/6 49/55/6 46/57/6 -f 45/448/6 47/58/6 14/60/6 -f 38/52/7 36/51/7 47/47/7 -f 46/57/10 43/56/10 5/62/10 -f 56/72/5 54/63/5 53/65/5 -f 54/70/4 55/66/4 52/68/4 -f 11/132/4 12/69/4 54/70/4 -f 13/449/5 11/71/5 56/72/5 -f 53/65/5 52/64/5 58/73/5 -f 52/68/4 51/67/4 59/74/4 -f 58/77/3 66/75/3 53/76/3 -f 66/75/3 58/77/3 24/79/3 -f 63/83/5 64/80/5 27/82/5 -f 64/80/5 63/83/5 62/85/5 -f 62/85/5 60/84/5 71/87/5 -f 8/450/5 9/88/5 70/86/5 -f 69/451/3 10/89/3 70/91/3 -f 69/451/3 70/91/3 61/93/3 -f 65/97/3 61/93/3 63/94/3 -f 63/94/3 27/95/3 65/97/3 -f 56/112/11 54/98/11 15/100/11 -f 53/452/11 52/101/11 42/103/11 -f 37/113/11 58/104/11 36/106/11 -f 29/453/11 33/107/11 23/109/11 -f 59/32/12 20/110/12 58/73/12 -f 53/452/13 35/108/13 52/101/13 -f 54/98/13 56/112/13 36/106/13 -f 13/454/13 42/103/13 11/114/13 -f 71/87/14 70/86/14 7/116/14 -f 60/455/11 62/117/11 45/118/11 -f 50/43/11 63/119/11 48/42/11 -f 41/124/14 28/81/14 40/121/14 -f 64/80/12 32/122/12 63/83/12 -f 62/85/12 41/124/12 60/84/12 -f 70/86/12 71/87/12 50/126/12 -f 44/44/13 9/127/13 45/118/13 -f 55/66/10 54/70/10 10/130/10 -f 69/456/6 70/131/6 12/69/6 -f 69/451/7 70/91/7 51/134/7 -f 63/94/9 65/97/9 52/133/9 -f 30/457/7 65/97/7 29/135/7 -f 27/458/6 59/74/6 17/136/6 -f 57/29/10 59/74/10 61/138/10 -f 61/138/6 60/137/6 55/66/6 -f 39/143/3 40/40/3 49/54/3 -f 41/41/8 40/139/8 32/141/8 -f 22/459/3 21/142/3 39/143/3 -f 34/35/4 33/36/4 26/145/4 -f 35/108/8 19/146/8 33/107/8 -f 34/35/4 38/148/4 33/36/4 -f 37/113/8 35/108/8 36/106/8 -f 36/149/4 38/148/4 46/57/4 -f 42/103/8 37/113/8 46/102/8 -f 43/56/4 16/59/4 46/57/4 -f 15/100/8 42/103/8 14/99/8 -f 8/6/1 9/5/1 183/150/1 -f 7/1/1 5/152/1 183/150/1 -f 6/3/1 16/11/1 181/151/1 -f 14/10/1 181/151/1 16/11/1 -f 14/10/1 15/154/1 182/153/1 -f 13/9/1 11/8/1 182/153/1 -f 11/8/1 12/7/1 184/156/1 -f 10/155/1 8/6/1 184/156/1 -f 41/460/2 64/157/2 40/159/2 -f 34/461/2 39/160/2 33/162/2 -f 63/462/1 59/163/1 65/165/1 -f 58/463/2 35/166/2 59/168/2 -f 36/464/1 37/171/1 122/170/1 -f 53/169/1 52/340/1 122/170/1 -f 124/174/1 60/336/1 62/465/1 -f 62/465/1 48/172/1 124/174/1 -f 61/177/1 60/336/1 121/175/1 -f 121/175/1 52/340/1 51/176/1 -f 49/179/1 38/466/1 123/178/1 -f 36/464/1 123/178/1 38/466/1 -f 69/467/2 55/180/2 70/182/2 -f 70/468/2 45/183/2 71/185/2 -f 54/469/1 46/186/1 56/188/1 -f 45/470/2 46/189/2 47/191/2 -f 44/204/4 72/192/4 7/194/4 -f 2/471/5 72/195/5 6/197/5 -f 74/202/4 41/198/4 31/200/4 -f 73/203/4 48/201/4 74/202/4 -f 48/201/4 73/203/4 44/204/4 -f 74/210/5 31/205/5 39/207/5 -f 39/207/5 49/208/5 74/210/5 -f 49/208/5 47/196/5 73/209/5 -f 3/472/8 68/211/8 12/213/8 -f 51/215/8 55/212/8 67/214/8 -f 57/218/8 51/215/8 66/216/8 -f 24/473/8 30/217/8 66/216/8 -f 75/474/8 65/219/8 18/221/8 -f 75/474/8 76/222/8 65/219/8 -f 77/225/8 69/224/8 76/222/8 -f 10/475/8 69/224/8 1/226/8 -f 18/476/4 28/227/4 75/229/4 -f 64/228/4 62/230/4 75/229/4 -f 62/230/4 71/232/4 76/231/4 -f 1/477/4 77/233/4 9/234/4 -f 80/238/5 4/235/5 43/237/5 -f 79/240/5 80/238/5 38/239/5 -f 78/244/5 79/240/5 34/241/5 -f 34/241/5 26/242/5 78/244/5 -f 25/478/3 19/245/3 78/247/3 -f 37/250/3 79/248/3 35/246/3 -f 42/252/3 80/249/3 37/250/3 -f 15/479/3 4/251/3 42/252/3 -f 79/253/8 38/253/8 73/253/8 -f 82/255/1 73/480/1 48/172/1 -f 48/172/1 62/465/1 83/254/1 -f 76/481/1 83/254/1 62/465/1 -f 73/480/1 82/255/1 79/257/1 -f 81/256/1 84/258/1 37/171/1 -f 67/482/1 53/169/1 84/258/1 -f 37/171/1 79/257/1 81/256/1 -f 51/176/1 67/482/1 84/258/1 -f 76/481/1 61/177/1 83/254/1 -f 84/258/1 83/254/1 51/176/1 -f 12/7/1 3/438/1 88/259/1 -f 87/260/1 1/4/1 10/155/1 -f 10/155/1 12/7/1 88/259/1 -f 13/9/1 15/154/1 85/261/1 -f 4/12/1 85/261/1 15/154/1 -f 88/259/1 3/438/1 13/9/1 -f 16/11/1 6/3/1 86/262/1 -f 2/2/1 86/262/1 6/3/1 -f 85/261/1 4/12/1 16/11/1 -f 7/1/1 9/5/1 87/260/1 -f 1/4/1 87/260/1 9/5/1 -f 86/262/1 2/2/1 7/1/1 -f 95/280/1 97/263/1 107/265/1 -f 131/302/16 103/266/16 130/268/16 -f 105/303/1 91/269/1 112/271/1 -f 130/331/17 101/272/17 129/274/17 -f 101/304/1 103/275/1 110/277/1 -f 99/273/18 97/278/18 129/274/18 -f 93/285/1 95/280/1 89/281/1 -f 97/483/19 95/282/19 128/284/19 -f 91/269/1 93/285/1 90/270/1 -f 95/282/20 93/286/20 127/283/20 -f 97/263/1 99/288/1 108/264/1 -f 111/321/21 112/290/21 115/292/21 -f 93/484/22 91/293/22 126/295/22 -f 102/330/17 100/296/17 138/298/17 -f 125/294/23 91/293/23 132/300/23 -f 132/335/21 105/301/21 131/302/21 -f 103/275/1 105/303/1 111/276/1 -f 99/288/1 101/304/1 109/289/1 -f 113/307/2 114/485/2 120/486/2 -f 120/486/2 119/487/2 118/305/2 -f 118/305/2 117/488/2 116/306/2 -f 116/306/2 115/489/2 113/307/2 -f 113/307/2 120/486/2 118/305/2 -f 109/314/17 110/308/17 117/310/17 -f 90/319/22 89/311/22 114/313/22 -f 108/490/18 109/314/18 118/315/18 -f 107/323/19 108/316/19 119/318/19 -f 112/491/23 90/319/23 113/320/23 -f 110/492/16 111/321/16 116/322/16 -f 89/493/20 107/323/20 120/324/20 -f 132/300/23 106/325/23 125/294/23 -f 94/494/22 126/295/22 92/326/22 -f 96/328/20 127/283/20 94/327/20 -f 98/495/19 128/284/19 96/328/19 -f 100/296/18 129/274/18 98/329/18 -f 129/274/17 100/296/17 130/331/17 -f 130/268/16 102/332/16 131/302/16 -f 131/302/21 104/333/21 132/335/21 -f 131/338/1 121/175/1 130/337/1 -f 52/340/1 121/175/1 132/339/1 -f 125/341/1 122/170/1 132/339/1 -f 36/464/1 122/170/1 126/342/1 -f 36/464/1 126/342/1 123/178/1 -f 50/173/1 123/178/1 128/344/1 -f 50/173/1 128/344/1 124/174/1 -f 60/336/1 124/174/1 130/337/1 -f 140/371/2 139/346/2 148/348/2 -f 96/328/20 94/327/20 135/350/20 -f 104/333/16 102/332/16 139/352/16 -f 94/494/22 92/326/22 133/354/22 -f 98/495/19 96/328/19 136/355/19 -f 106/334/21 104/333/21 140/356/21 -f 100/296/18 98/329/18 137/297/18 -f 92/326/23 106/325/23 134/353/23 -f 145/382/18 144/359/18 153/361/18 -f 146/372/2 138/362/2 145/364/2 -f 136/373/2 135/365/2 144/367/2 -f 133/374/2 134/368/2 141/370/2 -f 134/368/2 140/371/2 142/369/2 -f 139/346/2 138/362/2 147/347/2 -f 145/364/2 137/363/2 144/367/2 -f 143/366/2 135/365/2 141/370/2 -f 96/496/1 181/151/1 94/375/1 -f 143/384/20 141/376/20 151/378/20 -f 148/497/21 147/379/21 156/381/21 -f 146/498/17 145/382/17 154/383/17 -f 144/499/19 143/384/19 152/385/19 -f 141/500/22 142/386/22 149/388/22 -f 142/386/23 148/389/23 150/387/23 -f 147/379/16 146/391/16 155/380/16 -f 158/501/8 160/393/8 157/395/8 -f 160/502/3 164/396/3 159/398/3 -f 164/503/5 162/399/5 163/401/5 -f 162/504/4 158/402/4 161/404/4 -f 157/505/2 159/405/2 161/407/2 -f 162/506/1 164/408/1 158/410/1 -f 166/507/8 168/411/8 165/413/8 -f 168/508/3 172/414/3 167/416/3 -f 172/509/5 170/417/5 171/419/5 -f 170/510/4 166/420/4 169/422/4 -f 165/511/2 167/423/2 169/425/2 -f 170/512/1 172/426/1 166/428/1 -f 175/513/1 173/514/1 174/431/1 -f 174/431/1 180/515/1 179/429/1 -f 179/429/1 178/516/1 177/430/1 -f 177/430/1 176/517/1 175/513/1 -f 175/513/1 174/431/1 177/430/1 -f 96/496/1 98/432/1 181/151/1 -f 100/433/1 183/150/1 98/432/1 -f 8/6/1 183/150/1 102/434/1 -f 104/435/1 184/156/1 102/434/1 -f 11/8/1 184/156/1 106/436/1 -f 92/437/1 182/153/1 106/436/1 -f 14/10/1 182/153/1 94/375/1 +f 1/4/1 9/1/1 8/2/1 +f 12/1/1 11/2/1 13/3/1 +f 14/4/1 16/1/1 4/2/1 +f 25/5/2 26/6/2 20/7/2 +f 27/5/2 28/6/2 18/7/2 +f 23/5/2 29/6/2 30/7/2 +f 22/5/2 31/6/2 32/7/2 +f 56/8/3 68/9/3 3/10/3 +f 67/11/3 68/12/3 56/13/3 +f 57/14/4 30/15/4 29/16/4 +f 59/17/5 29/18/5 23/19/5 +f 34/20/6 33/21/6 21/22/6 +f 26/22/7 20/23/7 40/20/7 +f 41/8/8 48/24/8 50/25/8 +f 50/18/8 48/19/8 44/13/8 +f 50/16/3 45/26/3 47/14/3 +f 47/27/3 45/28/3 5/29/3 +f 44/8/8 7/24/8 5/25/8 +f 38/30/6 36/31/6 40/32/6 +f 33/33/7 50/30/7 49/31/7 +f 49/23/6 43/20/6 46/21/6 +f 47/33/6 16/30/6 14/31/6 +f 36/23/7 45/20/7 47/21/7 +f 5/30/7 6/31/7 43/32/7 +f 54/17/5 52/18/5 53/19/5 +f 55/14/4 51/15/4 52/16/4 +f 12/34/4 55/27/4 54/28/4 +f 11/25/5 54/35/5 56/8/5 +f 52/25/5 59/35/5 58/8/5 +f 51/34/4 57/27/4 59/28/4 +f 66/9/3 67/10/3 53/24/3 +f 58/13/3 23/19/3 24/11/3 +f 64/14/5 28/15/5 27/16/5 +f 63/28/5 60/29/5 62/34/5 +f 60/16/5 70/26/5 71/14/5 +f 9/34/5 71/27/5 70/28/5 +f 10/24/3 8/25/3 70/35/3 +f 70/17/3 60/18/3 61/19/3 +f 61/24/3 60/25/3 63/35/3 +f 27/18/3 17/19/3 65/13/3 +f 54/33/9 14/30/9 15/31/9 +f 52/23/9 46/20/9 42/21/9 +f 58/32/9 59/33/9 36/30/9 +f 33/20/9 35/21/9 23/22/9 +f 20/22/10 19/23/10 58/20/10 +f 52/31/10 33/32/10 35/33/10 +f 36/22/10 37/23/10 56/20/10 +f 11/30/10 46/33/10 42/32/10 +f 7/30/9 5/31/9 70/32/9 +f 62/23/9 44/20/9 45/21/9 +f 63/32/9 64/33/9 48/30/9 +f 40/21/9 27/22/9 28/23/9 +f 32/22/10 21/23/10 63/20/10 +f 41/32/10 40/33/10 60/30/10 +f 71/20/10 48/23/10 50/22/10 +f 45/33/10 8/30/10 9/31/10 +f 10/30/7 8/31/7 54/32/7 +f 70/33/6 11/30/6 12/31/6 +f 70/21/7 52/22/7 51/23/7 +f 52/30/6 51/31/6 65/32/6 +f 65/20/7 63/21/7 29/22/7 +f 59/20/6 57/21/6 17/22/6 +f 61/30/7 60/31/7 59/32/7 +f 60/23/6 54/20/6 55/21/6 +f 40/28/3 50/29/3 49/34/3 +f 40/17/8 21/18/8 32/19/8 +f 21/16/3 40/26/3 39/14/3 +f 33/17/4 20/18/4 26/19/4 +f 19/15/8 20/16/8 33/26/8 +f 38/24/4 36/25/4 33/35/4 +f 35/27/8 33/28/8 36/29/8 +f 38/19/4 43/13/4 46/17/4 +f 37/15/8 36/16/8 46/26/8 +f 16/24/4 14/25/4 46/35/4 +f 42/27/8 46/28/8 14/29/8 +f 7/36/1 183/37/1 9/38/1 +f 181/39/1 5/40/1 6/41/1 +f 13/42/1 182/43/1 15/44/1 +f 10/45/1 184/46/1 12/47/1 +f 40/48/1 63/49/1 64/50/1 +f 33/48/1 40/49/1 39/50/1 +f 59/51/1 57/48/1 65/49/1 +f 59/50/1 33/51/1 35/48/1 +f 53/42/1 122/52/1 37/44/1 +f 48/36/1 50/40/1 124/37/1 +f 121/46/1 51/47/1 61/45/1 +f 123/39/1 50/40/1 49/41/1 +f 70/50/1 54/51/1 55/48/1 +f 71/50/1 44/51/1 45/48/1 +f 46/51/1 42/48/1 56/49/1 +f 47/50/1 43/51/1 46/48/1 +f 72/9/4 2/10/4 7/24/4 +f 72/9/5 47/27/5 6/34/5 +f 41/13/4 32/19/4 31/11/4 +f 73/10/4 48/24/4 41/8/4 +f 48/19/4 73/11/4 72/12/4 +f 31/11/5 22/15/5 39/14/5 +f 39/27/5 49/34/5 73/10/5 +f 49/15/5 47/14/5 72/12/5 +f 68/9/8 55/27/8 12/34/8 +f 55/14/8 68/12/8 67/11/8 +f 51/34/8 67/10/8 66/9/8 +f 30/15/8 57/14/8 66/12/8 +f 65/13/8 17/19/8 18/11/8 +f 76/10/8 61/24/8 65/8/8 +f 69/13/8 61/19/8 76/11/8 +f 69/8/8 77/9/8 1/10/8 +f 28/15/4 64/14/4 75/12/4 +f 62/34/4 76/10/4 75/9/4 +f 71/14/4 77/12/4 76/11/4 +f 77/9/4 71/27/4 9/34/4 +f 4/10/5 16/24/5 43/8/5 +f 80/12/5 43/13/5 38/19/5 +f 79/10/5 38/24/5 34/8/5 +f 26/19/5 25/11/5 78/12/5 +f 19/15/3 35/14/3 78/12/3 +f 79/10/3 78/9/3 35/27/3 +f 80/12/3 79/11/3 37/15/3 +f 4/10/3 80/9/3 42/27/3 +f 49/41/1 82/53/1 38/54/1 +f 48/36/1 83/55/1 82/53/1 +f 53/42/1 37/44/1 84/56/1 +f 51/47/1 83/55/1 61/45/1 +f 88/56/1 87/55/1 10/45/1 +f 85/57/1 88/56/1 13/42/1 +f 86/53/1 85/57/1 16/54/1 +f 87/55/1 86/53/1 7/36/1 +f 97/58/1 108/59/1 107/60/1 +f 103/61/11 101/62/11 130/63/11 +f 91/64/1 90/65/1 112/66/1 +f 101/62/12 99/67/12 129/68/12 +f 103/69/1 111/70/1 110/71/1 +f 97/72/13 128/73/13 129/68/13 +f 95/74/1 107/60/1 89/75/1 +f 95/76/14 127/77/14 128/73/14 +f 93/78/1 89/75/1 90/65/1 +f 93/79/15 126/80/15 127/77/15 +f 99/81/1 109/82/1 108/59/1 +f 112/66/16 113/83/16 115/84/16 +f 91/85/17 125/86/17 126/80/17 +f 100/87/12 137/88/12 138/89/12 +f 91/85/18 105/90/18 132/91/18 +f 105/90/16 103/92/16 131/93/16 +f 105/94/1 112/66/1 111/95/1 +f 101/96/1 110/71/1 109/82/1 +f 118/97/2 116/98/2 113/99/2 +f 110/71/12 116/100/12 117/101/12 +f 89/75/17 120/102/17 114/103/17 +f 109/82/13 117/101/13 118/104/13 +f 108/59/14 118/104/14 119/105/14 +f 90/65/18 114/103/18 113/83/18 +f 111/70/11 115/106/11 116/100/11 +f 107/60/15 119/105/15 120/102/15 +f 106/107/18 92/108/18 125/109/18 +f 126/110/17 125/109/17 92/108/17 +f 127/111/15 126/110/15 94/112/15 +f 128/113/14 127/111/14 96/114/14 +f 129/115/13 128/113/13 98/116/13 +f 100/117/12 102/118/12 130/119/12 +f 102/118/11 104/120/11 131/121/11 +f 104/122/16 106/107/16 132/123/16 +f 121/46/1 60/124/1 130/125/1 +f 121/46/1 131/126/1 132/127/1 +f 122/52/1 52/128/1 132/127/1 +f 122/52/1 125/129/1 126/130/1 +f 126/130/1 127/131/1 123/39/1 +f 123/39/1 127/131/1 128/132/1 +f 128/132/1 129/133/1 124/37/1 +f 124/37/1 129/133/1 130/125/1 +f 139/134/2 147/135/2 148/136/2 +f 94/137/15 133/138/15 135/139/15 +f 102/140/11 138/89/11 139/141/11 +f 92/142/17 134/143/17 133/138/17 +f 96/144/14 135/139/14 136/145/14 +f 104/146/16 139/147/16 140/148/16 +f 98/149/13 136/145/13 137/88/13 +f 106/150/18 140/148/18 134/143/18 +f 144/151/13 152/152/13 153/153/13 +f 138/154/2 137/155/2 145/156/2 +f 135/157/2 143/158/2 144/151/2 +f 134/159/2 142/160/2 141/161/2 +f 140/162/2 148/136/2 142/160/2 +f 138/163/2 146/164/2 147/165/2 +f 137/166/2 136/167/2 144/151/2 +f 135/168/2 133/169/2 141/161/2 +f 181/39/1 14/170/1 94/130/1 +f 141/161/15 149/171/15 151/172/15 +f 147/135/16 155/173/16 156/174/16 +f 145/156/12 153/153/12 154/175/12 +f 143/158/14 151/172/14 152/152/14 +f 142/160/17 150/176/17 149/171/17 +f 148/136/18 156/174/18 150/176/18 +f 146/164/11 154/175/11 155/177/11 +f 160/178/8 159/179/8 157/180/8 +f 164/181/3 163/182/3 159/179/3 +f 162/183/5 161/184/5 163/185/5 +f 158/186/4 157/180/4 161/187/4 +f 159/179/2 163/182/2 161/187/2 +f 164/188/1 160/178/1 158/189/1 +f 168/186/8 167/180/8 165/187/8 +f 172/178/3 171/179/3 167/180/3 +f 170/181/5 169/182/5 171/179/5 +f 166/183/4 165/184/4 169/185/4 +f 167/180/2 171/179/2 169/182/2 +f 172/178/1 168/189/1 166/183/1 +f 179/190/1 177/191/1 174/192/1 +f 98/132/1 5/40/1 181/39/1 +f 183/37/1 5/40/1 98/132/1 +f 183/37/1 100/133/1 102/125/1 +f 184/46/1 8/124/1 102/125/1 +f 184/46/1 104/126/1 106/127/1 +f 182/43/1 11/128/1 106/127/1 +f 182/43/1 92/129/1 94/130/1 +f 5/4/1 7/1/1 6/3/1 +f 10/3/1 1/4/1 8/2/1 +f 3/4/1 12/1/1 13/3/1 +f 15/3/1 14/4/1 4/2/1 +f 19/193/2 25/5/2 20/7/2 +f 17/193/2 27/5/2 18/7/2 +f 24/193/2 23/5/2 30/7/2 +f 21/193/2 22/5/2 32/7/2 +f 13/24/3 56/8/3 3/10/3 +f 53/19/3 67/11/3 56/13/3 +f 59/26/4 57/14/4 29/16/4 +f 58/13/5 59/17/5 23/19/5 +f 22/23/6 34/20/6 21/22/6 +f 39/21/7 26/22/7 40/20/7 +f 40/35/8 41/8/8 50/25/8 +f 45/17/8 50/18/8 44/13/8 +f 49/15/3 50/16/3 47/14/3 +f 6/34/3 47/27/3 5/29/3 +f 45/35/8 44/8/8 5/25/8 +f 39/33/6 38/30/6 40/32/6 +f 34/32/7 33/33/7 49/31/7 +f 50/22/6 49/23/6 46/21/6 +f 45/32/6 47/33/6 14/31/6 +f 38/22/7 36/23/7 47/21/7 +f 46/33/7 5/30/7 43/32/7 +f 56/13/5 54/17/5 53/19/5 +f 54/26/4 55/14/4 52/16/4 +f 11/29/4 12/34/4 54/28/4 +f 13/24/5 11/25/5 56/8/5 +f 53/24/5 52/25/5 58/8/5 +f 52/29/4 51/34/4 59/28/4 +f 58/8/3 66/9/3 53/24/3 +f 66/12/3 58/13/3 24/11/3 +f 63/26/5 64/14/5 27/16/5 +f 64/27/5 63/28/5 62/34/5 +f 62/15/5 60/16/5 71/14/5 +f 8/29/5 9/34/5 70/28/5 +f 69/8/3 10/24/3 70/35/3 +f 69/13/3 70/17/3 61/19/3 +f 65/8/3 61/24/3 63/35/3 +f 63/17/3 27/18/3 65/13/3 +f 56/32/9 54/33/9 15/31/9 +f 53/22/9 52/23/9 42/21/9 +f 37/31/9 58/32/9 36/30/9 +f 29/23/9 33/20/9 23/22/9 +f 59/21/10 20/22/10 58/20/10 +f 53/30/10 52/31/10 35/33/10 +f 54/21/10 36/22/10 56/20/10 +f 13/31/10 11/30/10 42/32/10 +f 71/33/9 7/30/9 70/32/9 +f 60/22/9 62/23/9 45/21/9 +f 50/31/9 63/32/9 48/30/9 +f 41/20/9 40/21/9 28/23/9 +f 64/21/10 32/22/10 63/20/10 +f 62/31/10 41/32/10 60/30/10 +f 70/21/10 71/20/10 50/22/10 +f 44/32/10 45/33/10 9/31/10 +f 55/33/7 10/30/7 54/32/7 +f 69/32/6 70/33/6 12/31/6 +f 69/20/7 70/21/7 51/23/7 +f 63/33/6 52/30/6 65/32/6 +f 30/23/7 65/20/7 29/22/7 +f 27/23/6 59/20/6 17/22/6 +f 57/33/7 61/30/7 59/32/7 +f 61/22/6 60/23/6 55/21/6 +f 39/27/3 40/28/3 49/34/3 +f 41/13/8 40/17/8 32/19/8 +f 22/15/3 21/16/3 39/14/3 +f 34/13/4 33/17/4 26/19/4 +f 35/14/8 19/15/8 33/26/8 +f 34/8/4 38/24/4 33/35/4 +f 37/34/8 35/27/8 36/29/8 +f 36/18/4 38/19/4 46/17/4 +f 42/14/8 37/15/8 46/26/8 +f 43/8/4 16/24/4 46/35/4 +f 15/34/8 42/27/8 14/29/8 +f 8/124/1 9/38/1 183/37/1 +f 7/36/1 5/40/1 183/37/1 +f 6/41/1 16/54/1 181/39/1 +f 14/170/1 181/39/1 16/54/1 +f 14/170/1 15/44/1 182/43/1 +f 13/42/1 11/128/1 182/43/1 +f 11/128/1 12/47/1 184/46/1 +f 10/45/1 8/124/1 184/46/1 +f 41/51/1 40/48/1 64/50/1 +f 34/51/1 33/48/1 39/50/1 +f 63/50/1 59/51/1 65/49/1 +f 58/49/1 59/50/1 35/48/1 +f 36/170/1 37/44/1 122/52/1 +f 53/42/1 52/128/1 122/52/1 +f 124/37/1 60/124/1 62/38/1 +f 62/38/1 48/36/1 124/37/1 +f 61/45/1 60/124/1 121/46/1 +f 121/46/1 52/128/1 51/47/1 +f 49/41/1 38/54/1 123/39/1 +f 36/170/1 123/39/1 38/54/1 +f 69/49/1 70/50/1 55/48/1 +f 70/49/1 71/50/1 45/48/1 +f 54/50/1 46/51/1 56/49/1 +f 45/49/1 47/50/1 46/48/1 +f 44/8/4 72/9/4 7/24/4 +f 2/10/5 72/9/5 6/34/5 +f 74/12/4 41/13/4 31/11/4 +f 74/9/4 73/10/4 41/8/4 +f 44/13/4 48/19/4 72/12/4 +f 74/12/5 31/11/5 39/14/5 +f 74/9/5 39/27/5 73/10/5 +f 73/11/5 49/15/5 72/12/5 +f 3/10/8 68/9/8 12/34/8 +f 51/15/8 55/14/8 67/11/8 +f 57/27/8 51/34/8 66/9/8 +f 24/11/8 30/15/8 66/12/8 +f 75/12/8 65/13/8 18/11/8 +f 75/9/8 76/10/8 65/8/8 +f 77/12/8 69/13/8 76/11/8 +f 10/24/8 69/8/8 1/10/8 +f 18/11/4 28/15/4 75/12/4 +f 64/27/4 62/34/4 75/9/4 +f 62/15/4 71/14/4 76/11/4 +f 1/10/4 77/9/4 9/34/4 +f 80/9/5 4/10/5 43/8/5 +f 79/11/5 80/12/5 38/19/5 +f 78/9/5 79/10/5 34/8/5 +f 34/13/5 26/19/5 78/12/5 +f 25/11/3 19/15/3 78/12/3 +f 37/34/3 79/10/3 35/27/3 +f 42/14/3 80/12/3 37/15/3 +f 15/34/3 4/10/3 42/27/3 +f 81/57/19 79/194/19 38/54/19 +f 49/41/20 73/195/20 82/53/20 +f 81/57/1 38/54/1 82/53/1 +f 82/53/21 73/195/21 48/36/21 +f 48/36/1 62/38/1 83/55/1 +f 76/196/1 83/55/1 62/38/1 +f 81/57/1 84/56/1 37/44/1 +f 67/197/1 53/42/1 84/56/1 +f 37/44/22 79/194/22 81/57/22 +f 51/47/1 67/197/1 84/56/1 +f 76/196/1 61/45/1 83/55/1 +f 84/56/1 83/55/1 51/47/1 +f 12/47/1 3/197/1 88/56/1 +f 87/55/1 1/196/1 10/45/1 +f 10/45/1 12/47/1 88/56/1 +f 13/42/1 15/44/1 85/57/1 +f 4/194/1 85/57/1 15/44/1 +f 88/56/1 3/197/1 13/42/1 +f 16/54/1 6/41/1 86/53/1 +f 2/195/1 86/53/1 6/41/1 +f 85/57/1 4/194/1 16/54/1 +f 7/36/1 9/38/1 87/55/1 +f 1/196/1 87/55/1 9/38/1 +f 86/53/1 2/195/1 7/36/1 +f 95/198/1 97/58/1 107/60/1 +f 131/199/11 103/61/11 130/63/11 +f 105/200/1 91/64/1 112/66/1 +f 130/63/12 101/62/12 129/68/12 +f 101/201/1 103/69/1 110/71/1 +f 99/67/13 97/72/13 129/68/13 +f 93/202/1 95/74/1 89/75/1 +f 97/72/14 95/76/14 128/73/14 +f 91/203/1 93/78/1 90/65/1 +f 95/76/15 93/79/15 127/77/15 +f 97/204/1 99/81/1 108/59/1 +f 111/95/16 112/66/16 115/84/16 +f 93/79/17 91/85/17 126/80/17 +f 102/140/12 100/87/12 138/89/12 +f 125/86/18 91/85/18 132/91/18 +f 132/91/16 105/90/16 131/93/16 +f 103/205/1 105/94/1 111/95/1 +f 99/206/1 101/96/1 109/82/1 +f 113/99/2 114/207/2 120/208/2 +f 120/208/2 119/209/2 118/97/2 +f 118/97/2 117/210/2 116/98/2 +f 116/98/2 115/211/2 113/99/2 +f 113/99/2 120/208/2 118/97/2 +f 109/82/12 110/71/12 117/101/12 +f 90/65/17 89/75/17 114/103/17 +f 108/59/13 109/82/13 118/104/13 +f 107/60/14 108/59/14 119/105/14 +f 112/66/18 90/65/18 113/83/18 +f 110/71/11 111/70/11 116/100/11 +f 89/75/15 107/60/15 120/102/15 +f 132/123/18 106/107/18 125/109/18 +f 94/112/17 126/110/17 92/108/17 +f 96/114/15 127/111/15 94/112/15 +f 98/116/14 128/113/14 96/114/14 +f 100/117/13 129/115/13 98/116/13 +f 129/115/12 100/117/12 130/119/12 +f 130/119/11 102/118/11 131/121/11 +f 131/212/16 104/122/16 132/123/16 +f 131/126/1 121/46/1 130/125/1 +f 52/128/1 121/46/1 132/127/1 +f 125/129/1 122/52/1 132/127/1 +f 36/170/1 122/52/1 126/130/1 +f 36/170/1 126/130/1 123/39/1 +f 50/40/1 123/39/1 128/132/1 +f 50/40/1 128/132/1 124/37/1 +f 60/124/1 124/37/1 130/125/1 +f 140/213/2 139/134/2 148/136/2 +f 96/144/15 94/137/15 135/139/15 +f 104/214/11 102/140/11 139/141/11 +f 94/137/17 92/142/17 133/138/17 +f 98/149/14 96/144/14 136/145/14 +f 106/150/16 104/146/16 140/148/16 +f 100/87/13 98/149/13 137/88/13 +f 92/142/18 106/150/18 134/143/18 +f 145/156/13 144/151/13 153/153/13 +f 146/164/2 138/154/2 145/156/2 +f 136/215/2 135/157/2 144/151/2 +f 133/216/2 134/159/2 141/161/2 +f 134/217/2 140/162/2 142/160/2 +f 139/218/2 138/163/2 147/165/2 +f 145/156/2 137/166/2 144/151/2 +f 143/158/2 135/168/2 141/161/2 +f 96/131/1 181/39/1 94/130/1 +f 143/158/15 141/161/15 151/172/15 +f 148/136/16 147/135/16 156/174/16 +f 146/164/12 145/156/12 154/175/12 +f 144/151/14 143/158/14 152/152/14 +f 141/161/17 142/160/17 149/171/17 +f 142/160/18 148/136/18 150/176/18 +f 147/165/11 146/164/11 155/177/11 +f 158/189/8 160/178/8 157/180/8 +f 160/219/3 164/181/3 159/179/3 +f 164/188/5 162/183/5 163/185/5 +f 162/220/4 158/186/4 161/187/4 +f 157/180/2 159/179/2 161/187/2 +f 162/183/1 164/188/1 158/189/1 +f 166/220/8 168/186/8 165/187/8 +f 168/189/3 172/178/3 167/180/3 +f 172/219/5 170/181/5 171/179/5 +f 170/188/4 166/183/4 169/185/4 +f 165/187/2 167/180/2 169/182/2 +f 170/188/1 172/178/1 166/183/1 +f 175/221/1 173/222/1 174/192/1 +f 174/192/1 180/223/1 179/190/1 +f 179/190/1 178/224/1 177/191/1 +f 177/191/1 176/225/1 175/221/1 +f 175/221/1 174/192/1 177/191/1 +f 96/131/1 98/132/1 181/39/1 +f 100/133/1 183/37/1 98/132/1 +f 8/124/1 183/37/1 102/125/1 +f 104/126/1 184/46/1 102/125/1 +f 11/128/1 184/46/1 106/127/1 +f 92/129/1 182/43/1 106/127/1 +f 14/170/1 182/43/1 94/130/1 diff --git a/assets/hbm/sounds.json b/assets/hbm/sounds.json index f23eb5f3c..af0324738 100644 --- a/assets/hbm/sounds.json +++ b/assets/hbm/sounds.json @@ -26,6 +26,7 @@ "block.lockOpen": {"category": "block", "sounds": [{"name": "block/lockOpen", "stream": false}]}, "block.lockHang": {"category": "block", "sounds": [{"name": "block/lockHang", "stream": false}]}, "block.debris": {"category": "block", "sounds": ["block/debris1", "block/debris2", "block/debris3"]}, + "block.centrifugeOperate": {"category": "block", "sounds": [{"name": "block/centrifugeOperate", "stream": false}]}, "item.techBleep": {"category": "player", "sounds": [{"name": "tool/techBleep", "stream": false}]}, "item.techBoop": {"category": "player", "sounds": [{"name": "tool/techBoop", "stream": false}]}, diff --git a/assets/hbm/sounds/block/centrifugeOperate.ogg b/assets/hbm/sounds/block/centrifugeOperate.ogg new file mode 100644 index 000000000..d225f7e54 Binary files /dev/null and b/assets/hbm/sounds/block/centrifugeOperate.ogg differ diff --git a/assets/hbm/textures/models/oilFlareTexture.png b/assets/hbm/textures/models/oilFlareTexture.png old mode 100755 new mode 100644 index ecbe7d293..3d64d3c18 Binary files a/assets/hbm/textures/models/oilFlareTexture.png and b/assets/hbm/textures/models/oilFlareTexture.png differ diff --git a/com/hbm/inventory/container/ContainerCentrifuge.java b/com/hbm/inventory/container/ContainerCentrifuge.java index 689dd508a..9f2adc94a 100644 --- a/com/hbm/inventory/container/ContainerCentrifuge.java +++ b/com/hbm/inventory/container/ContainerCentrifuge.java @@ -13,10 +13,8 @@ import net.minecraft.item.ItemStack; public class ContainerCentrifuge extends Container { private TileEntityMachineCentrifuge diFurnace; - private int dualCookTime; public ContainerCentrifuge(InventoryPlayer invPlayer, TileEntityMachineCentrifuge tedf) { - dualCookTime = 0; diFurnace = tedf; @@ -80,30 +78,5 @@ public class ContainerCentrifuge extends Container { public boolean canInteractWith(EntityPlayer player) { return diFurnace.isUseableByPlayer(player); } - - @Override - public void detectAndSendChanges() { - super.detectAndSendChanges(); - - for(int i = 0; i < this.crafters.size(); i++) - { - ICrafting par1 = (ICrafting)this.crafters.get(i); - - if(this.dualCookTime != this.diFurnace.dualCookTime) - { - par1.sendProgressBarUpdate(this, 0, this.diFurnace.dualCookTime); - } - } - - this.dualCookTime = this.diFurnace.dualCookTime; - } - - @Override - public void updateProgressBar(int i, int j) { - if(i == 0) - { - diFurnace.dualCookTime = j; - } - } } \ No newline at end of file diff --git a/com/hbm/items/special/ItemStarterKit.java b/com/hbm/items/special/ItemStarterKit.java index 09f02aa58..60d7039e9 100644 --- a/com/hbm/items/special/ItemStarterKit.java +++ b/com/hbm/items/special/ItemStarterKit.java @@ -89,7 +89,7 @@ public class ItemStarterKit extends Item { player.inventory.addItemStackToInventory(new ItemStack(ModItems.template_folder, 1)); player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_press, 1)); player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_difurnace_off, 1)); - player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_centrifuge, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_gascent, 1)); player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_puf6_tank, 1)); player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_reactor, 1)); player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_nuke_furnace_off, 1)); @@ -160,7 +160,8 @@ public class ItemStarterKit extends Item { player.inventory.addItemStackToInventory(new ItemStack(ModItems.ingot_lead, 64)); player.inventory.addItemStackToInventory(new ItemStack(ModItems.ingot_polymer, 64)); player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_difurnace_off, 3)); - player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_centrifuge, 3)); + player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_gascent, 3)); + player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_centrifuge, 2)); player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_uf6_tank, 2)); player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_puf6_tank, 2)); player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_reactor, 2)); @@ -231,6 +232,7 @@ public class ItemStarterKit extends Item { player.inventory.addItemStackToInventory(new ItemStack(ModItems.fluid_barrel_full, 8, FluidType.COOLANT.getID())); player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_assembler, 1)); player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_chemplant, 3)); + player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_gascent, 2)); player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_nuke_furnace_off, 2)); player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_rtg_furnace_off, 3)); player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_rtg_grey, 2)); diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index 9d4ad0b5e..070ceeb49 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -539,7 +539,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_difurnace_off), 1), new Object[] { "AHA", "TCT", "TPT", 'T', "plateIron", 'A', "plateAluminum", 'S', "plateSteel", 'C', "ingotCopper", 'P', Item.getItemFromBlock(Blocks.piston), 'H', Item.getItemFromBlock(Blocks.hopper) })); //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_centrifuge), 1), new Object[] { " T ", "RDR", "RSR", 'S', "plateSteel", 'T', ModItems.centrifuge_tower, 'W', ModItems.coil_tungsten, 'R', ModItems.coil_copper, 'D', Item.getItemFromBlock(ModBlocks.machine_difurnace_off) })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_uf6_tank), 1), new Object[] { "WTW", "WTW", "SRS", 'S', "plateTitanium", 'W', ModItems.coil_tungsten, 'T', ModItems.tank_steel, 'W', ModItems.coil_tungsten,'R', "ingotRedstoneAlloy" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_uf6_tank), 1), new Object[] { "WTW", "WTW", "SRS", 'S', "plateIron", 'W', ModItems.coil_tungsten, 'T', ModItems.tank_steel, 'W', ModItems.coil_tungsten,'R', "ingotRedstoneAlloy" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_puf6_tank), 1), new Object[] { "WTW", "WTW", "SRS", 'S', "plateSteel", 'W', ModItems.coil_tungsten, 'T', ModItems.tank_steel, 'W', ModItems.coil_tungsten,'R', "ingotRedstoneAlloy" })); //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_reactor), 1), new Object[] { "LSL", "SCS", "LSL", 'S', "ingotSteel", 'L', "ingotLead", 'C', ModItems.reactor_core })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_nuke_furnace_off), 1), new Object[] { "SSS", "SFS", "CCC", 'S', "plateSteel", 'C', "plateCopper", 'F', Item.getItemFromBlock(Blocks.furnace) })); @@ -1372,10 +1372,11 @@ public class CraftingManager { GameRegistry.addSmelting(ModItems.combine_scrap, new ItemStack(ModItems.ingot_combine_steel), 1.0F); GameRegistry.addSmelting(ModItems.tank_waste, new ItemStack(ModItems.tank_waste), 0.0F); - GameRegistry.addSmelting(ModItems.canister_smear, new ItemStack(ModItems.canister_reoil), 1.0F); + //GameRegistry.addSmelting(ModItems.canister_smear, new ItemStack(ModItems.canister_reoil), 1.0F); GameRegistry.addSmelting(Items.bone, new ItemStack(Items.slime_ball, 3), 0.0F); GameRegistry.addSmelting(new ItemStack(Items.dye, 1, 15), new ItemStack(Items.slime_ball, 1), 0.0F); GameRegistry.addSmelting(new ItemStack(Blocks.gravel, 1), new ItemStack(Blocks.cobblestone, 1), 0.0F); + GameRegistry.addSmelting(new ItemStack(ModBlocks.gravel_obsidian), new ItemStack(Blocks.obsidian), 0.0F); } } diff --git a/com/hbm/packet/AuxGaugePacket.java b/com/hbm/packet/AuxGaugePacket.java index 860ad308c..50c657855 100644 --- a/com/hbm/packet/AuxGaugePacket.java +++ b/com/hbm/packet/AuxGaugePacket.java @@ -8,6 +8,7 @@ import com.hbm.tileentity.deco.TileEntityBomber; import com.hbm.tileentity.machine.TileEntityAMSBase; import com.hbm.tileentity.machine.TileEntityAMSEmitter; import com.hbm.tileentity.machine.TileEntityAMSLimiter; +import com.hbm.tileentity.machine.TileEntityMachineCentrifuge; import com.hbm.tileentity.machine.TileEntityMachineDiesel; import com.hbm.tileentity.machine.TileEntityMachineGasCent; import com.hbm.tileentity.machine.TileEntityMachineReactorSmall; @@ -152,9 +153,19 @@ public class AuxGaugePacket implements IMessage { } if (te instanceof TileEntityMachineGasCent) { TileEntityMachineGasCent cent = (TileEntityMachineGasCent)te; - + if(m.id == 0) cent.progress = m.value; + if(m.id == 1) + cent.isProgressing = m.value == 1; + } + if (te instanceof TileEntityMachineCentrifuge) { + TileEntityMachineCentrifuge cent = (TileEntityMachineCentrifuge)te; + + if(m.id == 0) + cent.dualCookTime = m.value; + if(m.id == 1) + cent.isProgressing = m.value == 1; } } catch (Exception x) { } diff --git a/com/hbm/packet/LoopedSoundPacket.java b/com/hbm/packet/LoopedSoundPacket.java index 3b16c0fee..d75c39a6d 100644 --- a/com/hbm/packet/LoopedSoundPacket.java +++ b/com/hbm/packet/LoopedSoundPacket.java @@ -2,13 +2,16 @@ package com.hbm.packet; import com.hbm.sound.SoundLoopAssembler; import com.hbm.sound.SoundLoopBroadcaster; +import com.hbm.sound.SoundLoopCentrifuge; import com.hbm.sound.SoundLoopChemplant; import com.hbm.sound.SoundLoopIGen; import com.hbm.sound.SoundLoopMiner; import com.hbm.sound.SoundLoopTurbofan; import com.hbm.tileentity.machine.TileEntityBroadcaster; import com.hbm.tileentity.machine.TileEntityMachineAssembler; +import com.hbm.tileentity.machine.TileEntityMachineCentrifuge; import com.hbm.tileentity.machine.TileEntityMachineChemplant; +import com.hbm.tileentity.machine.TileEntityMachineGasCent; import com.hbm.tileentity.machine.TileEntityMachineIGenerator; import com.hbm.tileentity.machine.TileEntityMachineMiningDrill; import com.hbm.tileentity.machine.TileEntityMachineTurbofan; @@ -136,6 +139,34 @@ public class LoopedSoundPacket implements IMessage { if(flag && te.getWorldObj().isRemote) Minecraft.getMinecraft().getSoundHandler().playSound(new SoundLoopBroadcaster(new ResourceLocation("hbm:block.broadcast" + (Math.abs(j) % 3 + 1)), te)); } + + if (te != null && te instanceof TileEntityMachineCentrifuge) { + + boolean flag = true; + for(int i = 0; i < SoundLoopCentrifuge.list.size(); i++) { + if(SoundLoopCentrifuge.list.get(i).getTE() == te && !SoundLoopCentrifuge.list.get(i).isDonePlaying()) + flag = false; + } + + int j = te.xCoord + te.zCoord + te.yCoord; + + if(flag && te.getWorldObj().isRemote && ((TileEntityMachineCentrifuge)te).isProgressing) + Minecraft.getMinecraft().getSoundHandler().playSound(new SoundLoopCentrifuge(new ResourceLocation("hbm:block.centrifugeOperate"), te)); + } + + if (te != null && te instanceof TileEntityMachineGasCent) { + + boolean flag = true; + for(int i = 0; i < SoundLoopCentrifuge.list.size(); i++) { + if(SoundLoopCentrifuge.list.get(i).getTE() == te && !SoundLoopCentrifuge.list.get(i).isDonePlaying()) + flag = false; + } + + int j = te.xCoord + te.zCoord + te.yCoord; + + if(flag && te.getWorldObj().isRemote && ((TileEntityMachineGasCent)te).isProgressing) + Minecraft.getMinecraft().getSoundHandler().playSound(new SoundLoopCentrifuge(new ResourceLocation("hbm:block.centrifugeOperate"), te)); + } return null; } } diff --git a/com/hbm/sound/SoundLoopCentrifuge.java b/com/hbm/sound/SoundLoopCentrifuge.java new file mode 100644 index 000000000..f906f6dd6 --- /dev/null +++ b/com/hbm/sound/SoundLoopCentrifuge.java @@ -0,0 +1,52 @@ +package com.hbm.sound; + +import java.util.ArrayList; +import java.util.List; + +import com.hbm.tileentity.machine.TileEntityMachineCentrifuge; +import com.hbm.tileentity.machine.TileEntityMachineChemplant; +import com.hbm.tileentity.machine.TileEntityMachineGasCent; +import com.hbm.tileentity.machine.TileEntityMachineMiningDrill; + +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; + +public class SoundLoopCentrifuge extends SoundLoopMachine { + + public static List list = new ArrayList(); + + public SoundLoopCentrifuge(ResourceLocation path, TileEntity te) { + super(path, te); + list.add(this); + } + + @Override + public void update() { + super.update(); + + if(te instanceof TileEntityMachineCentrifuge) { + TileEntityMachineCentrifuge plant = (TileEntityMachineCentrifuge)te; + + if(this.volume != 1) + volume = 1; + + if(!plant.isProgressing) + this.donePlaying = true; + } + + if(te instanceof TileEntityMachineGasCent) { + TileEntityMachineGasCent plant = (TileEntityMachineGasCent)te; + + if(this.volume != 1) + volume = 1; + + if(!plant.isProgressing) + this.donePlaying = true; + } + } + + public TileEntity getTE() { + return te; + } + +} diff --git a/com/hbm/tileentity/machine/TileEntityMachineCentrifuge.java b/com/hbm/tileentity/machine/TileEntityMachineCentrifuge.java index 0332be787..a85f04470 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineCentrifuge.java +++ b/com/hbm/tileentity/machine/TileEntityMachineCentrifuge.java @@ -5,6 +5,8 @@ import com.hbm.inventory.MachineRecipes; import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; +import com.hbm.packet.AuxGaugePacket; +import com.hbm.packet.LoopedSoundPacket; import com.hbm.packet.PacketDispatcher; import cpw.mods.fml.relauncher.Side; @@ -26,7 +28,7 @@ public class TileEntityMachineCentrifuge extends TileEntity implements ISidedInv public int dualCookTime; public long power; - public int soundCycle = 0; + public boolean isProgressing; public static final int maxPower = 100000; public static final int processingSpeed = 200; @@ -310,6 +312,13 @@ public class TileEntityMachineCentrifuge extends TileEntity implements ISidedInv } } + if(hasPower() && canProcess()) + { + isProgressing = true; + } else { + isProgressing = false; + } + boolean trigger = true; if(hasPower() && canProcess() && this.dualCookTime == 0) @@ -323,17 +332,14 @@ public class TileEntityMachineCentrifuge extends TileEntity implements ISidedInv } PacketDispatcher.wrapper.sendToAll(new AuxElectricityPacket(xCoord, yCoord, zCoord, power)); + PacketDispatcher.wrapper.sendToAll(new AuxGaugePacket(xCoord, yCoord, zCoord, dualCookTime, 0)); + PacketDispatcher.wrapper.sendToAll(new AuxGaugePacket(xCoord, yCoord, zCoord, isProgressing ? 1 : 0, 1)); + PacketDispatcher.wrapper.sendToAll(new LoopedSoundPacket(xCoord, yCoord, zCoord)); } if(hasPower() && canProcess()) { dualCookTime++; - if(soundCycle == 0) - this.worldObj.playSoundEffect(this.xCoord, this.yCoord, this.zCoord, "minecart.base", 1.0F, 1.5F); - soundCycle++; - - if(soundCycle >= 25) - soundCycle = 0; if(this.dualCookTime >= TileEntityMachineCentrifuge.processingSpeed) { diff --git a/com/hbm/tileentity/machine/TileEntityMachineGasCent.java b/com/hbm/tileentity/machine/TileEntityMachineGasCent.java index 1f88853de..0d0207cb0 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineGasCent.java +++ b/com/hbm/tileentity/machine/TileEntityMachineGasCent.java @@ -14,6 +14,7 @@ import com.hbm.inventory.MachineRecipes.GasCentOutput; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.AuxGaugePacket; +import com.hbm.packet.LoopedSoundPacket; import com.hbm.packet.PacketDispatcher; import cpw.mods.fml.relauncher.Side; @@ -33,6 +34,7 @@ public class TileEntityMachineGasCent extends TileEntity implements ISidedInvent public long power; public int progress; + public boolean isProgressing; public static final int maxPower = 100000; public static final int processingSpeed = 200; @@ -154,6 +156,7 @@ public class TileEntityMachineGasCent extends TileEntity implements ISidedInvent power = nbt.getLong("powerTime"); progress = nbt.getShort("CookTime"); + tank.readFromNBT(nbt, "tank"); slots = new ItemStack[getSizeInventory()]; for(int i = 0; i < list.tagCount(); i++) @@ -172,6 +175,7 @@ public class TileEntityMachineGasCent extends TileEntity implements ISidedInvent super.writeToNBT(nbt); nbt.setLong("powerTime", power); nbt.setShort("cookTime", (short) progress); + tank.writeToNBT(nbt, "tank"); NBTTagList list = new NBTTagList(); for(int i = 0; i < slots.length; i++) @@ -283,6 +287,8 @@ public class TileEntityMachineGasCent extends TileEntity implements ISidedInvent if(canProcess()) { + isProgressing = true; + this.progress++; this.power -= 200; @@ -295,11 +301,14 @@ public class TileEntityMachineGasCent extends TileEntity implements ISidedInvent } } else { + isProgressing = false; this.progress = 0; } PacketDispatcher.wrapper.sendToAll(new AuxElectricityPacket(xCoord, yCoord, zCoord, power)); PacketDispatcher.wrapper.sendToAll(new AuxGaugePacket(xCoord, yCoord, zCoord, progress, 0)); + PacketDispatcher.wrapper.sendToAll(new AuxGaugePacket(xCoord, yCoord, zCoord, isProgressing ? 1 : 0, 1)); + PacketDispatcher.wrapper.sendToAll(new LoopedSoundPacket(xCoord, yCoord, zCoord)); } } diff --git a/com/hbm/tileentity/machine/TileEntityMachineRTG.java b/com/hbm/tileentity/machine/TileEntityMachineRTG.java index 8f1a1d1dd..dbf9821ee 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineRTG.java +++ b/com/hbm/tileentity/machine/TileEntityMachineRTG.java @@ -208,17 +208,17 @@ public class TileEntityMachineRTG extends TileEntity implements ISidedInventory, @Override public void updateEntity() { - age++; - if(age >= 20) - { - age = 0; - } - - if(age == 9 || age == 19) - ffgeuaInit(); - if(!worldObj.isRemote) { + age++; + if(age >= 20) + { + age = 0; + } + + if(age == 9 || age == 19) + ffgeuaInit(); + heat = 0; for(int i = 0; i < slots.length; i++) { diff --git a/com/hbm/tileentity/machine/TileEntityMachineShredder.java b/com/hbm/tileentity/machine/TileEntityMachineShredder.java index 349390fd2..938b3d374 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineShredder.java +++ b/com/hbm/tileentity/machine/TileEntityMachineShredder.java @@ -185,7 +185,7 @@ public class TileEntityMachineShredder extends TileEntity implements ISidedInven @Override public boolean canExtractItem(int i, ItemStack itemStack, int j) { - if(i >= 9 && i <= 28) + if(i >= 9 && i <= 26) return true; if(i >= 27 && i <= 29) if(itemStack.getItemDamage() == itemStack.getMaxDamage())