diff --git a/assets/hbm/models/missileNeon.obj b/assets/hbm/models/missileNeon.obj new file mode 100644 index 000000000..f03684fd2 --- /dev/null +++ b/assets/hbm/models/missileNeon.obj @@ -0,0 +1,930 @@ +# Blender v2.76 (sub 0) OBJ File: 'missileNeon.blend' +# www.blender.org +o Cylinder +v 0.000000 1.000000 -0.500000 +v 0.000000 4.000000 -0.500000 +v 0.250000 1.000000 -0.433013 +v 0.250000 4.000000 -0.433013 +v 0.433013 1.000000 -0.250000 +v 0.433013 4.000000 -0.250000 +v 0.500000 1.000000 0.000000 +v 0.500000 4.000000 0.000000 +v 0.433013 1.000000 0.250000 +v 0.433013 4.000000 0.250000 +v 0.250000 1.000000 0.433013 +v 0.250000 4.000000 0.433013 +v 0.000000 1.000000 0.500000 +v 0.000000 4.000000 0.500000 +v -0.250000 1.000000 0.433013 +v -0.250000 4.000000 0.433013 +v -0.433013 1.000000 0.250000 +v -0.433013 4.000000 0.250000 +v -0.500000 1.000000 0.000000 +v -0.500000 4.000000 0.000000 +v -0.433013 1.000000 -0.250000 +v -0.433013 4.000000 -0.250000 +v -0.250000 1.000000 -0.433013 +v -0.250000 4.000000 -0.433013 +v 0.187500 4.500000 -0.324760 +v -0.000000 4.500000 -0.375000 +v 0.324759 4.500000 -0.187500 +v 0.375000 4.500000 0.000000 +v 0.324759 4.500000 0.187500 +v 0.187500 4.500000 0.324760 +v -0.000000 4.500000 0.375000 +v -0.187500 4.500000 0.324760 +v -0.324760 4.500000 0.187500 +v -0.375000 4.500000 0.000000 +v -0.324760 4.500000 -0.187500 +v -0.187500 4.500000 -0.324759 +v 0.187499 7.000000 -0.324760 +v -0.000001 7.000000 -0.375000 +v 0.324759 7.000000 -0.187500 +v 0.374999 7.000000 0.000000 +v 0.324759 7.000000 0.187500 +v 0.187499 7.000000 0.324760 +v -0.000001 7.000000 0.375000 +v -0.187501 7.000000 0.324760 +v -0.324760 7.000000 0.187500 +v -0.375001 7.000000 0.000000 +v -0.324760 7.000000 -0.187500 +v -0.187501 7.000000 -0.324759 +v 0.140624 7.500000 -0.243570 +v -0.000001 7.500000 -0.281250 +v 0.243569 7.500000 -0.140625 +v 0.281249 7.500000 0.000000 +v 0.243569 7.500000 0.140625 +v 0.140624 7.500000 0.243570 +v -0.000001 7.500000 0.281250 +v -0.140626 7.500000 0.243570 +v -0.243570 7.500000 0.140625 +v -0.281251 7.500000 0.000000 +v -0.243570 7.500000 -0.140625 +v -0.140626 7.500000 -0.243570 +v 0.049218 7.700000 -0.085249 +v -0.000001 7.700000 -0.098437 +v 0.085249 7.700000 -0.049219 +v 0.098437 7.700000 0.000000 +v 0.085249 7.700000 0.049219 +v 0.049218 7.700000 0.085249 +v -0.000001 7.700000 0.098438 +v -0.049219 7.700000 0.085249 +v -0.085250 7.700000 0.049219 +v -0.098438 7.700000 0.000000 +v -0.085250 7.700000 -0.049219 +v -0.049220 7.700000 -0.085249 +v -0.000001 7.750000 0.000000 +v 0.000000 0.850000 -0.425000 +v 0.212500 0.850000 -0.368061 +v 0.368061 0.850000 -0.212500 +v 0.425000 0.850000 0.000000 +v 0.368061 0.850000 0.212500 +v 0.212500 0.850000 0.368061 +v 0.000000 0.850000 0.425000 +v -0.212500 0.850000 0.368061 +v -0.368061 0.850000 0.212500 +v -0.425000 0.850000 0.000000 +v -0.368061 0.850000 -0.212500 +v -0.212500 0.850000 -0.368061 +v 0.000000 0.850000 -0.212500 +v 0.106250 0.850000 -0.184030 +v 0.184030 0.850000 -0.106250 +v 0.212500 0.850000 0.000000 +v 0.184030 0.850000 0.106250 +v 0.106250 0.850000 0.184030 +v 0.000000 0.850000 0.212500 +v -0.106250 0.850000 0.184030 +v -0.184030 0.850000 0.106250 +v -0.212500 0.850000 0.000000 +v -0.184030 0.850000 -0.106250 +v -0.106250 0.850000 -0.184030 +v 0.000000 0.500000 -0.371875 +v 0.185938 0.500000 -0.322053 +v 0.322053 0.500000 -0.185937 +v 0.371875 0.500000 0.000000 +v 0.322053 0.500000 0.185938 +v 0.185938 0.500000 0.322053 +v 0.000000 0.500000 0.371875 +v -0.185937 0.500000 0.322053 +v -0.322053 0.500000 0.185938 +v -0.371875 0.500000 0.000000 +v -0.322053 0.500000 -0.185937 +v -0.185938 0.500000 -0.322053 +v 0.000000 0.000000 -0.464844 +v 0.232422 0.000000 -0.402566 +v 0.402567 0.000000 -0.232422 +v 0.464844 0.000000 0.000000 +v 0.402567 0.000000 0.232422 +v 0.232422 0.000000 0.402566 +v 0.000000 0.000000 0.464844 +v -0.232422 0.000000 0.402567 +v -0.402566 0.000000 0.232422 +v -0.464844 0.000000 0.000000 +v -0.402567 0.000000 -0.232422 +v -0.232422 0.000000 -0.402566 +v 0.000000 0.000000 -0.371875 +v 0.185938 0.000000 -0.322053 +v 0.322053 0.000000 -0.185937 +v 0.371875 0.000000 0.000000 +v 0.322053 0.000000 0.185938 +v 0.185938 0.000000 0.322053 +v 0.000000 0.000000 0.371875 +v -0.185937 0.000000 0.322053 +v -0.322053 0.000000 0.185938 +v -0.371875 0.000000 0.000000 +v -0.322053 0.000000 -0.185937 +v -0.185938 0.000000 -0.322053 +v 0.000000 0.750000 -0.130156 +v 0.065078 0.750000 -0.112719 +v 0.112719 0.750000 -0.065078 +v 0.130156 0.750000 0.000000 +v 0.112719 0.750000 0.065078 +v 0.065078 0.750000 0.112719 +v 0.000000 0.750000 0.130156 +v -0.065078 0.750000 0.112719 +v -0.112719 0.750000 0.065078 +v -0.130156 0.750000 0.000000 +v -0.112719 0.750000 -0.065078 +v -0.065078 0.750000 -0.112719 +v 0.295753 2.750000 -0.387259 +v 0.387259 2.750000 -0.295753 +v -0.295753 2.750000 0.387260 +v -0.387260 2.750000 0.295754 +v 0.295753 1.250000 -0.387259 +v 0.387259 1.250000 -0.295753 +v -0.295753 1.250000 0.387260 +v -0.387260 1.250000 0.295754 +v 0.543240 2.000000 -0.634747 +v 0.634747 2.000000 -0.543240 +v 0.634747 1.250000 -0.543240 +v 0.543240 1.250000 -0.634747 +v -0.543240 2.000000 0.634747 +v -0.634747 2.000000 0.543241 +v -0.634747 1.250000 0.543241 +v -0.543240 1.250000 0.634747 +v -0.387260 2.750000 -0.295753 +v -0.295753 2.750000 -0.387259 +v 0.387259 2.750000 0.295753 +v 0.295753 2.750000 0.387260 +v -0.387260 1.250000 -0.295753 +v -0.295753 1.250000 -0.387259 +v 0.387259 1.250000 0.295753 +v 0.295753 1.250000 0.387260 +v -0.634747 2.000000 -0.543240 +v -0.543241 2.000000 -0.634747 +v -0.543241 1.250000 -0.634747 +v -0.634747 1.250000 -0.543240 +v 0.634747 2.000000 0.543241 +v 0.543241 2.000000 0.634747 +v 0.543241 1.250000 0.634747 +v 0.634747 1.250000 0.543241 +vt 0.406849 0.497453 +vt 0.370386 0.497453 +vt 0.370385 0.074804 +vt 0.333922 0.497453 +vt 0.333922 0.074804 +vt 0.297459 0.497453 +vt 0.297459 0.074805 +vt 0.260996 0.497453 +vt 0.260996 0.074804 +vt 0.224533 0.497453 +vt 0.224533 0.074804 +vt 0.188070 0.497453 +vt 0.188070 0.074804 +vt 0.151607 0.497453 +vt 0.151607 0.074804 +vt 0.115143 0.497453 +vt 0.115144 0.074804 +vt 0.078680 0.497453 +vt 0.078681 0.074804 +vt 0.516238 0.497453 +vt 0.479775 0.497453 +vt 0.479775 0.074804 +vt 0.183512 0.569919 +vt 0.156164 0.569919 +vt 0.443312 0.497453 +vt 0.406849 0.074804 +vt 0.443312 0.074804 +vt 0.263731 0.051337 +vt 0.294725 0.051337 +vt 0.835738 0.029853 +vt 0.835737 0.382060 +vt 0.808389 0.382060 +vt 0.219975 0.569919 +vt 0.192628 0.569919 +vt 0.256438 0.569919 +vt 0.229091 0.569919 +vt 0.292901 0.569919 +vt 0.438754 0.569919 +vt 0.411407 0.569919 +vt 0.402291 0.569919 +vt 0.329365 0.569919 +vt 0.475217 0.569919 +vt 0.447870 0.569919 +vt 0.365828 0.569919 +vt 0.511680 0.569919 +vt 0.484333 0.569919 +vt 0.110585 0.569919 +vt 0.083238 0.569919 +vt 0.147049 0.569919 +vt 0.890431 0.382060 +vt 0.887013 0.453647 +vt 0.866502 0.453647 +vt 0.616959 0.029852 +vt 0.644306 0.029852 +vt 0.644305 0.382059 +vt 0.726348 0.029852 +vt 0.726347 0.382060 +vt 0.699000 0.382059 +vt 0.808391 0.029853 +vt 0.781042 0.382060 +vt 0.945128 0.029853 +vt 0.945126 0.382060 +vt 0.917779 0.382060 +vt 0.699001 0.029852 +vt 0.671653 0.382059 +vt 0.781043 0.029853 +vt 0.753695 0.382060 +vt 0.917780 0.029853 +vt 0.863085 0.029853 +vt 0.863084 0.382060 +vt 0.671654 0.029852 +vt 0.753696 0.029852 +vt 0.890433 0.029853 +vt 0.729766 0.453647 +vt 0.750276 0.453647 +vt 0.743610 0.491234 +vt 0.832318 0.453647 +vt 0.640887 0.453646 +vt 0.620376 0.453646 +vt 0.722929 0.453647 +vt 0.804971 0.453647 +vt 0.784460 0.453647 +vt 0.941707 0.453647 +vt 0.695581 0.453647 +vt 0.675071 0.453647 +vt 0.777623 0.453647 +vt 0.914360 0.453647 +vt 0.893849 0.453647 +vt 0.859665 0.453647 +vt 0.839155 0.453647 +vt 0.668234 0.453647 +vt 0.880347 0.491234 +vt 0.873168 0.491234 +vt 0.825652 0.491234 +vt 0.818473 0.491234 +vt 0.634221 0.491234 +vt 0.716262 0.491234 +vt 0.709084 0.491234 +vt 0.798305 0.491234 +vt 0.791126 0.491234 +vt 0.921197 0.453647 +vt 0.935041 0.491235 +vt 0.688915 0.491234 +vt 0.770957 0.491234 +vt 0.763779 0.491234 +vt 0.907694 0.491235 +vt 0.900515 0.491235 +vt 0.852999 0.491234 +vt 0.845820 0.491234 +vt 0.661568 0.491234 +vt 0.654389 0.491234 +vt 0.740021 0.506369 +vt 0.736431 0.491234 +vt 0.712673 0.506369 +vt 0.767368 0.506369 +vt 0.685326 0.506369 +vt 0.681737 0.491234 +vt 0.657979 0.506369 +vt 0.630631 0.506368 +vt 0.627042 0.491234 +vt 0.931452 0.506369 +vt 0.927862 0.491235 +vt 0.904104 0.506369 +vt 0.876757 0.506369 +vt 0.849410 0.506369 +vt 0.822062 0.506369 +vt 0.794715 0.506369 +vt 0.190572 0.847732 +vt 0.169403 0.868901 +vt 0.155982 0.861153 +vt 0.409583 0.051337 +vt 0.440577 0.051337 +vt 0.373120 0.051337 +vt 0.404114 0.051337 +vt 0.300194 0.051337 +vt 0.446046 0.051337 +vt 0.336657 0.051337 +vt 0.516238 0.074804 +vt 0.482509 0.051336 +vt 0.081416 0.051336 +vt 0.112409 0.051336 +vt 0.117879 0.051336 +vt 0.148872 0.051337 +vt 0.154342 0.051337 +vt 0.185335 0.051337 +vt 0.190805 0.051337 +vt 0.221798 0.051337 +vt 0.227268 0.051337 +vt 0.258262 0.051337 +vt 0.309583 0.784747 +vt 0.326550 0.733292 +vt 0.351246 0.744498 +vt 0.105896 0.932408 +vt 0.090399 0.905567 +vt 0.119316 0.897818 +vt 0.163731 0.947905 +vt 0.155982 0.918988 +vt 0.169403 0.911239 +vt 0.132737 0.832235 +vt 0.163731 0.832235 +vt 0.206069 0.874573 +vt 0.177151 0.882322 +vt 0.090399 0.874573 +vt 0.119316 0.882322 +vt 0.132737 0.947905 +vt 0.140485 0.918988 +vt 0.206069 0.905567 +vt 0.177151 0.897818 +vt 0.105896 0.847732 +vt 0.127065 0.868901 +vt 0.127065 0.911239 +vt 0.190572 0.932408 +vt 0.140485 0.861153 +vt 0.193517 0.714274 +vt 0.186745 0.642946 +vt 0.220606 0.641342 +vt 0.267562 0.771841 +vt 0.274542 0.718112 +vt 0.300905 0.724470 +vt 0.117517 0.791150 +vt 0.089966 0.744497 +vt 0.114662 0.733291 +vt 0.195387 0.768422 +vt 0.180047 0.770615 +vt 0.166671 0.718112 +vt 0.288878 0.777299 +vt 0.245825 0.768422 +vt 0.247695 0.714274 +vt 0.098277 0.801827 +vt 0.066440 0.757988 +vt 0.173651 0.771841 +vt 0.158586 0.775474 +vt 0.140307 0.724470 +vt 0.223862 0.767073 +vt 0.220606 0.712991 +vt 0.342935 0.801828 +vt 0.329491 0.794119 +vt 0.137680 0.782340 +vt 0.217350 0.767073 +vt 0.201871 0.767807 +vt 0.660851 0.892064 +vt 0.648200 0.888674 +vt 0.648200 0.861554 +vt 0.353036 0.666718 +vt 0.383906 0.680726 +vt 0.288026 0.647743 +vt 0.320980 0.655691 +vt 0.057307 0.680725 +vt 0.088177 0.666718 +vt 0.153187 0.647743 +vt 0.254468 0.642946 +vt 0.027899 0.697588 +vt 0.120232 0.655691 +vt 0.413314 0.697589 +vt 0.727405 0.643467 +vt 0.661481 0.732788 +vt 0.653421 0.727775 +vt 0.534337 0.858164 +vt 0.551287 0.828807 +vt 0.560548 0.838068 +vt 0.614544 0.811857 +vt 0.611154 0.824508 +vt 0.584034 0.824508 +vt 0.580644 0.938371 +vt 0.551287 0.921421 +vt 0.560548 0.912160 +vt 0.643901 0.921421 +vt 0.634640 0.912160 +vt 0.580644 0.811857 +vt 0.643901 0.828807 +vt 0.634640 0.838068 +vt 0.534337 0.892064 +vt 0.546988 0.888674 +vt 0.614544 0.938371 +vt 0.611154 0.925720 +vt 0.660851 0.858164 +vt 0.546988 0.861554 +vt 0.584034 0.925720 +vt 0.291431 0.888170 +vt 0.268974 0.910628 +vt 0.278465 0.875204 +vt 0.653017 0.612245 +vt 0.635445 0.721860 +vt 0.625983 0.721106 +vt 0.524561 0.643467 +vt 0.590485 0.732788 +vt 0.583320 0.739013 +vt 0.572597 0.618650 +vt 0.607298 0.724102 +vt 0.598546 0.727775 +vt 0.747878 0.661253 +vt 0.668646 0.739013 +vt 0.679369 0.618650 +vt 0.644668 0.724102 +vt 0.547591 0.629146 +vt 0.598949 0.612245 +vt 0.616521 0.721860 +vt 0.765277 0.682055 +vt 0.674736 0.746293 +vt 0.704375 0.629146 +vt 0.625983 0.610092 +vt 0.504089 0.661253 +vt 0.577231 0.746293 +vt 0.856252 0.824927 +vt 0.856252 0.719265 +vt 0.874484 0.719265 +vt 0.874484 0.824927 +vt 0.874484 0.941528 +vt 0.806943 0.719265 +vt 0.856252 0.669956 +vt 0.923793 0.719264 +vt 0.856252 0.941528 +vt 0.265554 0.569919 +vt 0.374943 0.569919 +vt 0.302017 0.569919 +vt 0.338480 0.569919 +vt 0.119701 0.569919 +vt 0.616958 0.382059 +vt 0.811807 0.453647 +vt 0.702418 0.453647 +vt 0.757113 0.453647 +vt 0.647724 0.453647 +vt 0.331188 0.051337 +vt 0.477040 0.051336 +vt 0.367651 0.051337 +vt 0.513503 0.051336 +vt 0.323695 0.791151 +vt 0.282627 0.775474 +vt 0.131629 0.784747 +vt 0.303532 0.782340 +vt 0.261166 0.770615 +vt 0.111721 0.794119 +vt 0.239342 0.767807 +vt 0.374772 0.757988 +vt 0.152334 0.777299 +vt 0.260753 0.879950 +vt 0.268973 0.875204 +vt 0.286685 0.879950 +vt 0.291431 0.897662 +vt 0.286685 0.905882 +vt 0.278465 0.910628 +vt 0.260753 0.905882 +vt 0.256007 0.897662 +vt 0.256007 0.888170 +vt 0.486690 0.682056 +vt 0.806943 0.930589 +vt 0.874484 0.669956 +vt 0.923793 0.930589 +vn 0.258800 0.000000 -0.965900 +vn 0.707100 0.000000 -0.707100 +vn 0.965900 0.000000 -0.258800 +vn 0.965900 0.000000 0.258800 +vn 0.707100 0.000000 0.707100 +vn 0.258800 0.000000 0.965900 +vn -0.258800 0.000000 0.965900 +vn -0.707100 0.000000 0.707100 +vn -0.965900 0.000000 0.258800 +vn -0.965900 0.000000 -0.258800 +vn -0.251600 0.234700 0.938900 +vn -0.258800 0.000000 -0.965900 +vn -0.707100 0.000000 -0.707100 +vn 0.869800 -0.434900 0.233100 +vn 0.251600 0.234700 0.938900 +vn 0.687400 0.234700 0.687300 +vn 0.938900 0.234700 0.251600 +vn -0.251600 0.234700 -0.938900 +vn 0.251600 0.234700 -0.938900 +vn 0.938900 0.234700 -0.251600 +vn -0.687400 0.234700 -0.687300 +vn 0.687400 0.234700 -0.687300 +vn -0.938900 0.234700 -0.251600 +vn -0.938900 0.234700 0.251600 +vn -0.687300 0.234700 0.687400 +vn -0.254700 0.178200 -0.950500 +vn 0.530100 0.661900 0.530100 +vn 0.695800 0.178200 -0.695800 +vn -0.950500 0.178200 0.254700 +vn 0.254700 0.178200 0.950500 +vn 0.950500 0.178200 -0.254700 +vn -0.950500 0.178200 -0.254700 +vn -0.254700 0.178200 0.950500 +vn 0.950500 0.178200 0.254700 +vn -0.695800 0.178200 -0.695800 +vn 0.254700 0.178200 -0.950500 +vn -0.695800 0.178200 0.695800 +vn 0.695800 0.178200 0.695800 +vn -0.194000 0.661900 -0.724100 +vn 0.530100 0.661900 -0.530100 +vn -0.724100 0.661900 0.194000 +vn 0.194000 0.661900 0.724100 +vn 0.724100 0.661900 -0.194000 +vn -0.724100 0.661900 -0.194000 +vn -0.194000 0.661900 0.724100 +vn 0.724100 0.661900 0.194000 +vn -0.530100 0.661900 -0.530100 +vn 0.194000 0.661900 -0.724100 +vn -0.530100 0.661900 0.530100 +vn 0.329100 0.885100 0.329100 +vn 0.120500 0.885100 0.449600 +vn 0.449600 0.885100 0.120500 +vn -0.120500 0.885100 0.449600 +vn -0.329100 0.885100 0.329100 +vn -0.449600 0.885100 0.120500 +vn -0.449600 0.885100 -0.120500 +vn -0.329100 0.885100 -0.329100 +vn -0.120500 0.885100 -0.449600 +vn 0.120500 0.885100 -0.449600 +vn 0.329100 0.885100 -0.329100 +vn 0.449600 0.885100 -0.120500 +vn 0.000000 -1.000000 0.000000 +vn -0.233100 -0.434900 -0.869800 +vn 0.233100 -0.434900 -0.869800 +vn 0.869800 -0.434900 -0.233100 +vn -0.636700 -0.434900 -0.636700 +vn 0.636700 -0.434900 -0.636700 +vn -0.869800 -0.434900 -0.233100 +vn -0.869800 -0.434900 0.233100 +vn -0.636700 -0.434900 0.636700 +vn -0.233100 -0.434900 0.869800 +vn 0.233100 -0.434900 0.869800 +vn 0.636700 -0.434900 0.636700 +vn -0.647300 0.402600 -0.647300 +vn 0.950700 0.176800 0.254700 +vn 0.236900 0.402600 -0.884200 +vn -0.647300 0.402600 0.647300 +vn 0.647300 0.402600 0.647300 +vn -0.236900 0.402600 -0.884200 +vn 0.647300 0.402600 -0.647300 +vn -0.884200 0.402600 0.236900 +vn 0.236900 0.402600 0.884200 +vn 0.884200 0.402600 -0.236900 +vn -0.884200 0.402600 -0.236900 +vn -0.236900 0.402600 0.884200 +vn 0.884200 0.402600 0.236900 +vn -0.696000 0.176800 -0.696000 +vn 0.254700 0.176800 -0.950700 +vn -0.696000 0.176800 0.696000 +vn 0.696000 0.176800 0.696000 +vn -0.254700 0.176800 -0.950700 +vn 0.696000 0.176800 -0.696000 +vn -0.950700 0.176800 0.254700 +vn 0.254700 0.176800 0.950700 +vn 0.950700 0.176800 -0.254700 +vn -0.950700 0.176800 -0.254700 +vn -0.254700 0.176800 0.950700 +vn 0.247100 -0.297200 -0.922300 +vn -0.922300 -0.297200 -0.247100 +vn 0.675100 -0.297200 0.675100 +vn -0.247100 -0.297200 0.922300 +vn 0.675100 -0.297200 -0.675100 +vn -0.675100 -0.297200 -0.675100 +vn 0.247100 -0.297200 0.922300 +vn -0.675100 -0.297200 0.675100 +vn 0.922300 -0.297200 -0.247100 +vn -0.247100 -0.297200 -0.922300 +vn -0.922300 -0.297200 0.247100 +vn 0.922300 -0.297200 0.247100 +vn 0.640800 0.422900 -0.640800 +vn -0.640800 0.422900 0.640800 +vn -0.640800 0.422900 -0.640800 +vn 0.640800 0.422900 0.640800 +vn 0.687300 0.234700 0.687400 +vn 0.687300 0.234700 -0.687400 +s off +f 2/1/1 4/2/1 3/3/1 +f 4/2/2 6/4/2 5/5/2 +f 6/4/3 8/6/3 7/7/3 +f 8/6/4 10/8/4 9/9/4 +f 10/8/5 12/10/5 11/11/5 +f 12/10/6 14/12/6 13/13/6 +f 14/12/7 16/14/7 15/15/7 +f 16/14/8 18/16/8 17/17/8 +f 18/16/9 20/18/9 19/19/9 +f 20/20/10 22/21/10 21/22/10 +f 14/12/11 31/23/11 32/24/11 +f 24/25/12 2/1/12 1/26/12 +f 22/21/13 24/25/13 23/27/13 +f 9/9/14 78/28/14 77/29/14 +f 25/30/2 37/31/2 39/32/2 +f 12/10/15 30/33/15 31/34/15 +f 10/8/16 29/35/16 30/36/16 +f 10/8/17 8/6/17 28/37/17 +f 24/25/18 36/38/18 26/39/18 +f 4/2/19 2/1/19 26/40/19 +f 8/6/20 6/4/20 27/41/20 +f 22/21/21 35/42/21 36/43/21 +f 6/4/22 4/2/22 25/44/22 +f 20/20/23 34/45/23 35/46/23 +f 18/16/24 33/47/24 34/48/24 +f 18/16/25 16/14/25 32/49/25 +f 48/50/26 60/51/26 50/52/26 +f 34/53/9 33/54/9 45/55/9 +f 30/56/6 42/57/6 43/58/6 +f 27/59/3 39/32/3 40/60/3 +f 34/61/10 46/62/10 47/63/10 +f 31/64/7 43/58/7 44/65/7 +f 28/66/4 40/60/4 41/67/4 +f 35/68/13 47/63/13 48/50/13 +f 26/69/1 38/70/1 37/31/1 +f 32/71/8 44/65/8 45/55/8 +f 29/72/5 41/67/5 42/57/5 +f 36/73/12 48/50/12 38/70/12 +f 54/74/27 53/75/27 65/76/27 +f 39/32/28 37/31/28 49/77/28 +f 45/55/29 57/78/29 58/79/29 +f 43/58/30 42/57/30 54/80/30 +f 39/32/31 51/81/31 52/82/31 +f 47/63/32 46/62/32 58/83/32 +f 43/58/33 55/84/33 56/85/33 +f 41/67/34 40/60/34 52/86/34 +f 47/63/35 59/87/35 60/88/35 +f 38/70/36 50/89/36 49/90/36 +f 45/55/37 44/65/37 56/91/37 +f 41/67/38 53/75/38 54/74/38 +f 60/51/39 72/92/39 62/93/39 +f 49/77/40 61/94/40 63/95/40 +f 58/79/41 57/78/41 69/96/41 +f 54/80/42 66/97/42 67/98/42 +f 51/81/43 63/99/43 64/100/43 +f 59/101/44 58/83/44 70/102/44 +f 56/85/45 55/84/45 67/103/45 +f 52/86/46 64/104/46 65/105/46 +f 59/87/47 71/106/47 72/107/47 +f 50/89/48 62/108/48 61/109/48 +f 56/91/49 68/110/49 69/111/49 +f 65/76/50 73/112/50 66/113/50 +f 67/98/51 66/97/51 73/114/51 +f 64/104/52 73/115/52 65/105/52 +f 67/103/53 73/116/53 68/117/53 +f 68/110/54 73/118/54 69/111/54 +f 69/96/55 73/119/55 70/120/55 +f 70/102/56 73/121/56 71/122/56 +f 71/106/57 73/123/57 72/107/57 +f 72/92/58 73/124/58 62/93/58 +f 62/108/59 73/125/59 61/109/59 +f 61/94/60 73/126/60 63/95/60 +f 63/99/61 73/127/61 64/100/61 +f 75/128/62 87/129/62 86/130/62 +f 1/26/63 74/131/63 85/132/63 +f 3/3/64 75/133/64 74/134/64 +f 5/5/65 7/7/65 77/135/65 +f 21/22/66 23/27/66 85/136/66 +f 3/3/67 5/5/67 76/137/67 +f 19/138/68 21/22/68 84/139/68 +f 19/19/69 83/140/69 82/141/69 +f 17/17/70 82/142/70 81/143/70 +f 15/15/71 81/144/71 80/145/71 +f 13/13/72 80/146/72 79/147/72 +f 11/11/73 79/148/73 78/149/73 +f 97/150/74 109/151/74 108/152/74 +f 81/153/62 82/154/62 94/155/62 +f 79/156/62 91/157/62 90/158/62 +f 85/159/62 74/160/62 86/130/62 +f 76/161/62 88/162/62 87/129/62 +f 83/163/62 95/164/62 94/155/62 +f 80/165/62 92/166/62 91/157/62 +f 77/167/62 89/168/62 88/162/62 +f 84/169/62 96/170/62 95/164/62 +f 80/165/62 81/153/62 93/171/62 +f 78/172/62 90/158/62 89/168/62 +f 85/159/62 97/173/62 96/170/62 +f 102/174/75 114/175/75 113/176/75 +f 87/177/76 99/178/76 98/179/76 +f 94/180/77 106/181/77 105/182/77 +f 90/183/78 91/184/78 103/185/78 +f 86/186/79 98/179/79 109/151/79 +f 88/187/80 100/188/80 99/178/80 +f 95/189/81 107/190/81 106/181/81 +f 91/191/82 92/192/82 104/193/82 +f 89/194/83 101/195/83 100/188/83 +f 95/196/84 96/197/84 108/152/84 +f 93/198/85 105/182/85 104/193/85 +f 89/199/86 90/200/86 102/174/86 +f 114/201/62 126/202/62 125/203/62 +f 109/151/87 121/204/87 120/205/87 +f 99/178/88 111/206/88 110/207/88 +f 106/181/89 118/208/89 117/209/89 +f 102/174/90 103/185/90 115/210/90 +f 98/179/91 110/207/91 121/204/91 +f 100/188/92 112/211/92 111/206/92 +f 107/190/93 119/212/93 118/208/93 +f 104/193/94 116/213/94 115/210/94 +f 101/195/95 113/176/95 112/211/95 +f 108/152/96 120/205/96 119/214/96 +f 104/193/97 105/182/97 117/209/97 +f 129/215/98 141/216/98 140/217/98 +f 120/218/62 121/219/62 133/220/62 +f 111/221/62 123/222/62 122/223/62 +f 117/224/62 118/225/62 130/226/62 +f 115/227/62 127/228/62 126/202/62 +f 110/229/62 122/223/62 133/220/62 +f 111/221/62 112/230/62 124/231/62 +f 119/232/62 131/233/62 130/226/62 +f 116/234/62 128/235/62 127/228/62 +f 113/236/62 125/203/62 124/231/62 +f 120/218/62 132/237/62 131/233/62 +f 117/224/62 129/238/62 128/235/62 +f 137/239/62 141/240/62 135/241/62 +f 126/242/99 138/243/99 137/244/99 +f 133/245/100 145/246/100 144/247/100 +f 123/248/101 135/249/101 134/250/101 +f 130/251/102 142/252/102 141/216/102 +f 126/242/103 127/253/103 139/254/103 +f 122/255/104 134/250/104 145/246/104 +f 124/256/105 136/257/105 135/249/105 +f 131/258/106 143/259/106 142/252/106 +f 128/260/107 140/217/107 139/254/107 +f 125/261/108 137/244/108 136/257/108 +f 132/262/109 144/247/109 143/263/109 +f 155/264/2 156/265/2 157/266/2 +f 155/264/110 154/267/110 146/268/110 +f 151/269/5 156/265/5 155/264/5 +f 157/266/62 156/265/62 151/270/62 +f 154/267/13 157/266/13 150/271/13 +f 159/264/8 160/265/8 161/266/8 +f 149/272/111 159/264/111 158/267/111 +f 153/269/13 160/265/13 159/264/13 +f 161/266/62 160/265/62 153/270/62 +f 158/267/5 161/266/5 152/271/5 +f 171/264/13 172/265/13 173/266/13 +f 171/264/112 170/267/112 162/268/112 +f 167/269/2 172/265/2 171/264/2 +f 173/266/62 172/265/62 167/270/62 +f 170/267/8 173/266/8 166/271/8 +f 175/264/5 176/265/5 177/266/5 +f 165/272/113 175/264/113 174/267/113 +f 169/269/8 176/265/8 175/264/8 +f 177/266/62 176/265/62 169/270/62 +f 174/267/2 177/266/2 168/271/2 +f 1/26/1 2/1/1 3/3/1 +f 3/3/2 4/2/2 5/5/2 +f 5/5/3 6/4/3 7/7/3 +f 7/7/4 8/6/4 9/9/4 +f 9/9/5 10/8/5 11/11/5 +f 11/11/6 12/10/6 13/13/6 +f 13/13/7 14/12/7 15/15/7 +f 15/15/8 16/14/8 17/17/8 +f 17/17/9 18/16/9 19/19/9 +f 19/138/10 20/20/10 21/22/10 +f 16/14/11 14/12/11 32/24/11 +f 23/27/12 24/25/12 1/26/12 +f 21/22/13 22/21/13 23/27/13 +f 7/7/14 9/9/14 77/29/14 +f 27/59/2 25/30/2 39/32/2 +f 14/12/15 12/10/15 31/34/15 +f 12/10/114 10/8/114 30/36/114 +f 29/273/17 10/8/17 28/37/17 +f 2/1/18 24/25/18 26/39/18 +f 25/274/19 4/2/19 26/40/19 +f 28/275/20 8/6/20 27/41/20 +f 24/25/21 22/21/21 36/43/21 +f 27/276/115 6/4/115 25/44/115 +f 22/21/23 20/20/23 35/46/23 +f 20/18/24 18/16/24 34/48/24 +f 33/277/25 18/16/25 32/49/25 +f 38/70/26 48/50/26 50/52/26 +f 46/278/9 34/53/9 45/55/9 +f 31/64/6 30/56/6 43/58/6 +f 28/66/3 27/59/3 40/60/3 +f 35/68/10 34/61/10 47/63/10 +f 32/71/7 31/64/7 44/65/7 +f 29/72/4 28/66/4 41/67/4 +f 36/73/13 35/68/13 48/50/13 +f 25/30/1 26/69/1 37/31/1 +f 33/54/8 32/71/8 45/55/8 +f 30/56/5 29/72/5 42/57/5 +f 26/69/12 36/73/12 38/70/12 +f 66/113/27 54/74/27 65/76/27 +f 51/279/28 39/32/28 49/77/28 +f 46/278/29 45/55/29 58/79/29 +f 55/280/30 43/58/30 54/80/30 +f 40/60/31 39/32/31 52/82/31 +f 59/101/32 47/63/32 58/83/32 +f 44/65/33 43/58/33 56/85/33 +f 53/281/34 41/67/34 52/86/34 +f 48/50/35 47/63/35 60/88/35 +f 37/31/36 38/70/36 49/90/36 +f 57/282/37 45/55/37 56/91/37 +f 42/57/38 41/67/38 54/74/38 +f 50/52/39 60/51/39 62/93/39 +f 51/279/40 49/77/40 63/95/40 +f 70/120/41 58/79/41 69/96/41 +f 55/280/42 54/80/42 67/98/42 +f 52/82/43 51/81/43 64/100/43 +f 71/122/44 59/101/44 70/102/44 +f 68/117/45 56/85/45 67/103/45 +f 53/281/46 52/86/46 65/105/46 +f 60/88/47 59/87/47 72/107/47 +f 49/90/48 50/89/48 61/109/48 +f 57/282/49 56/91/49 69/111/49 +f 74/160/62 75/128/62 86/130/62 +f 23/27/63 1/26/63 85/132/63 +f 1/26/64 3/3/64 74/134/64 +f 76/283/65 5/5/65 77/135/65 +f 84/284/66 21/22/66 85/136/66 +f 75/285/67 3/3/67 76/137/67 +f 83/286/68 19/138/68 84/139/68 +f 17/17/69 19/19/69 82/141/69 +f 15/15/70 17/17/70 81/143/70 +f 13/13/71 15/15/71 80/145/71 +f 11/11/72 13/13/72 79/147/72 +f 9/9/73 11/11/73 78/149/73 +f 96/287/74 97/150/74 108/152/74 +f 93/171/62 81/153/62 94/155/62 +f 78/172/62 79/156/62 90/158/62 +f 97/173/62 85/159/62 86/130/62 +f 75/128/62 76/161/62 87/129/62 +f 82/154/62 83/163/62 94/155/62 +f 79/156/62 80/165/62 91/157/62 +f 76/161/62 77/167/62 88/162/62 +f 83/163/62 84/169/62 95/164/62 +f 92/166/62 80/165/62 93/171/62 +f 77/167/62 78/172/62 89/168/62 +f 84/169/62 85/159/62 96/170/62 +f 101/195/75 102/174/75 113/176/75 +f 86/288/76 87/177/76 98/179/76 +f 93/289/77 94/180/77 105/182/77 +f 102/174/78 90/183/78 103/185/78 +f 97/290/79 86/186/79 109/151/79 +f 87/291/80 88/187/80 99/178/80 +f 94/292/81 95/189/81 106/181/81 +f 103/185/82 91/191/82 104/193/82 +f 88/293/83 89/194/83 100/188/83 +f 107/294/84 95/196/84 108/152/84 +f 92/295/85 93/198/85 104/193/85 +f 101/195/86 89/199/86 102/174/86 +f 113/236/62 114/201/62 125/203/62 +f 108/152/87 109/151/87 120/205/87 +f 98/179/88 99/178/88 110/207/88 +f 105/182/89 106/181/89 117/209/89 +f 114/175/90 102/174/90 115/210/90 +f 109/151/91 98/179/91 121/204/91 +f 99/178/92 100/188/92 111/206/92 +f 106/181/93 107/190/93 118/208/93 +f 103/185/94 104/193/94 115/210/94 +f 100/188/95 101/195/95 112/211/95 +f 107/294/96 108/152/96 119/214/96 +f 116/213/97 104/193/97 117/209/97 +f 128/260/98 129/215/98 140/217/98 +f 132/237/62 120/218/62 133/220/62 +f 110/229/62 111/221/62 122/223/62 +f 129/238/62 117/224/62 130/226/62 +f 114/201/62 115/227/62 126/202/62 +f 121/219/62 110/229/62 133/220/62 +f 123/222/62 111/221/62 124/231/62 +f 118/225/62 119/232/62 130/226/62 +f 115/227/62 116/234/62 127/228/62 +f 112/230/62 113/236/62 124/231/62 +f 119/232/62 120/218/62 131/233/62 +f 116/234/62 117/224/62 128/235/62 +f 145/296/62 134/297/62 135/241/62 +f 135/241/62 136/298/62 137/239/62 +f 137/239/62 138/299/62 139/300/62 +f 139/300/62 140/301/62 137/239/62 +f 141/240/62 142/302/62 143/303/62 +f 143/303/62 144/304/62 145/296/62 +f 145/296/62 135/241/62 141/240/62 +f 137/239/62 140/301/62 141/240/62 +f 141/240/62 143/303/62 145/296/62 +f 125/261/99 126/242/99 137/244/99 +f 132/262/100 133/245/100 144/247/100 +f 122/255/101 123/248/101 134/250/101 +f 129/215/102 130/251/102 141/216/102 +f 138/243/103 126/242/103 139/254/103 +f 133/245/104 122/255/104 145/246/104 +f 123/248/105 124/256/105 135/249/105 +f 130/251/106 131/258/106 142/252/106 +f 127/253/107 128/260/107 139/254/107 +f 124/256/108 125/261/108 136/257/108 +f 131/305/109 132/262/109 143/263/109 +f 154/267/2 155/264/2 157/266/2 +f 147/272/110 155/264/110 146/268/110 +f 147/306/5 151/269/5 155/264/5 +f 150/307/62 157/266/62 151/270/62 +f 146/308/13 154/267/13 150/271/13 +f 158/267/8 159/264/8 161/266/8 +f 148/268/111 149/272/111 158/267/111 +f 149/306/13 153/269/13 159/264/13 +f 152/307/62 161/266/62 153/270/62 +f 148/308/5 158/267/5 152/271/5 +f 170/267/13 171/264/13 173/266/13 +f 163/272/112 171/264/112 162/268/112 +f 163/306/2 167/269/2 171/264/2 +f 166/307/62 173/266/62 167/270/62 +f 162/308/8 170/267/8 166/271/8 +f 174/267/5 175/264/5 177/266/5 +f 164/268/113 165/272/113 174/267/113 +f 165/306/8 169/269/8 175/264/8 +f 168/307/62 177/266/62 169/270/62 +f 164/308/2 174/267/2 168/271/2 diff --git a/assets/hbm/models/vault_frame.mtl b/assets/hbm/models/vault_frame.mtl new file mode 100644 index 000000000..f40deaf3f --- /dev/null +++ b/assets/hbm/models/vault_frame.mtl @@ -0,0 +1,11 @@ +# Blender MTL File: 'vault_frame_new.blend' +# Material Count: 1 + +newmtl None +Ns 0 +Ka 0.000000 0.000000 0.000000 +Kd 0.8 0.8 0.8 +Ks 0.8 0.8 0.8 +d 1 +illum 2 +map_Kd /home/hbm/Schreibtisch/Java/New Nuke Mod/src/main/java/assets/hbm/textures/models/vault_frame.png diff --git a/assets/hbm/models/vault_frame.obj b/assets/hbm/models/vault_frame.obj index ee5a5df5a..8ad968967 100644 --- a/assets/hbm/models/vault_frame.obj +++ b/assets/hbm/models/vault_frame.obj @@ -1,4 +1,4 @@ -# Blender v2.76 (sub 0) OBJ File: 'vault_frame.blend' +# Blender v2.76 (sub 0) OBJ File: 'vault_frame_new.blend' # www.blender.org o Cylinder v 0.500000 5.000000 2.500000 @@ -410,26 +410,26 @@ vt 0.590179 0.384823 vt 0.625667 0.454379 vt 0.689417 0.384823 vt 0.689418 0.454379 -vt 0.249545 0.419394 -vt 0.278078 0.419377 -vt 0.437273 0.437603 -vt 0.107759 0.276798 -vt 0.112671 0.304627 -vt 0.089639 0.437603 -vt 0.174332 0.392033 -vt 0.152666 0.373861 -vt 0.352849 0.392119 -vt 0.374458 0.373974 -vt 0.414381 0.304802 +vt 0.156250 0.421875 +vt 0.187500 0.421875 +vt 0.328125 0.437500 +vt 0.031250 0.289062 +vt 0.035156 0.316406 +vt 0.015625 0.437500 +vt 0.093750 0.398438 +vt 0.070312 0.382812 +vt 0.250000 0.398438 +vt 0.273438 0.382812 +vt 0.308594 0.316406 vt 0.761440 0.301724 vt 0.486689 0.621318 vt 0.674544 0.162220 vt 0.687586 0.126732 vt 0.689418 0.471767 vt 0.653929 0.458726 -vt 0.089637 0.089759 -vt 0.419307 0.276979 -vt 0.437594 0.089923 +vt 0.015625 0.125000 +vt 0.312500 0.289062 +vt 0.328125 0.125000 vt 0.687586 0.098469 vt 0.625667 0.458726 vt 0.547315 0.162220 @@ -438,58 +438,59 @@ vt 0.585249 0.744151 vt 0.628113 0.761540 vt 0.550440 0.761540 vt 0.514952 0.748498 -vt 0.121648 0.198105 -vt 0.135789 0.173628 -vt 0.197051 0.122258 -vt 0.223619 0.112599 -vt 0.405488 0.198235 -vt 0.391371 0.173744 -vt 0.330152 0.122319 -vt 0.303590 0.112636 -vt 0.154148 0.570166 -vt 0.234094 0.570183 -vt 0.215552 0.600446 -vt 0.132836 0.614938 -vt 0.099994 0.642495 -vt 0.066333 0.631220 -vt 0.078794 0.679218 -vt 0.071352 0.721439 -vt 0.038321 0.734443 -vt 0.020167 0.547365 -vt 0.368053 0.547438 -vt 0.127581 0.579832 -vt 0.052198 0.655705 -vt 0.020208 0.895350 -vt 0.043237 0.762285 -vt 0.083229 0.831507 -vt 0.100160 0.800306 -vt 0.104901 0.849667 -vt 0.132656 0.827534 -vt 0.172952 0.842159 -vt 0.180000 0.876995 -vt 0.208515 0.876943 -vt 0.215478 0.842107 -vt 0.367883 0.895009 -vt 0.255674 0.827470 -vt 0.283397 0.849534 -vt 0.305016 0.831395 -vt 0.344940 0.762245 -vt 0.309503 0.763161 -vt 0.349853 0.734435 -vt 0.260653 0.579856 -vt 0.288222 0.642514 -vt 0.255390 0.614954 -vt 0.316853 0.721441 -vt 0.309411 0.679233 -vt 0.336003 0.655732 -vt 0.321878 0.631251 -vt 0.020071 0.437604 -vt 0.437273 0.507130 -vt 0.089640 0.507130 -vt 0.507130 0.089988 -vt 0.506809 0.437667 -vt 0.089670 0.020167 -vt 0.437627 0.020332 +vt 0.046875 0.222656 +vt 0.054688 0.199219 +vt 0.113281 0.156250 +vt 0.136719 0.144531 +vt 0.296875 0.222656 +vt 0.289062 0.199219 +vt 0.230469 0.156250 +vt 0.207031 0.144531 +vt 0.304688 0.707031 +vt 0.304688 0.777344 +vt 0.281250 0.761719 +vt 0.265625 0.683594 +vt 0.246094 0.660156 +vt 0.253906 0.628906 +vt 0.207031 0.640625 +vt 0.171875 0.632812 +vt 0.160156 0.605469 +vt 0.328125 0.585938 +vt 0.328125 0.898438 +vt 0.300781 0.679688 +vt 0.234375 0.613281 +vt 0.015625 0.585938 +vt 0.136719 0.609375 +vt 0.074219 0.644531 +vt 0.097656 0.660156 +vt 0.054688 0.660156 +vt 0.078125 0.683594 +vt 0.062500 0.722656 +vt 0.035156 0.730469 +vt 0.035156 0.753906 +vt 0.062500 0.761719 +vt 0.015625 0.898438 +vt 0.078125 0.800781 +vt 0.058594 0.824219 +vt 0.074219 0.839844 +vt 0.136719 0.875000 +vt 0.136719 0.843750 +vt 0.160156 0.878906 +vt 0.300781 0.804688 +vt 0.246094 0.824219 +vt 0.265625 0.800781 +vt 0.171875 0.851562 +vt 0.207031 0.843750 +vt 0.234375 0.871094 +vt 0.253906 0.855469 +vt 0.398438 0.125000 +vt 0.398438 0.437500 +vt 0.335938 0.437500 +vt 0.328125 0.445312 +vt 0.328125 0.507812 +vt 0.015625 0.507812 +vt 0.335938 0.125000 +vt 0.015625 0.445312 vt 0.788301 0.887799 vt 0.792587 0.890825 vt 0.776111 0.917371 @@ -884,10 +885,9 @@ vt 0.550440 0.674595 vt 0.728902 0.548190 vt 0.761440 0.344587 vt 0.585249 0.761540 -vt 0.172682 0.600439 -vt 0.078717 0.763193 -vt 0.288096 0.800252 -vt 0.020068 0.089759 +vt 0.281250 0.722656 +vt 0.136719 0.640625 +vt 0.097656 0.824219 vt 0.767862 0.919608 vt 0.813394 0.469684 vt 0.877731 0.245865 @@ -1147,430 +1147,430 @@ f 17/147/38 15/148/38 52/149/38 f 53/143/38 52/149/38 6/124/38 f 52/149/38 49/150/38 6/124/38 f 6/124/38 49/150/38 48/144/38 -f 2/95/39 1/83/39 5/151/39 -f 3/80/3 7/152/3 5/153/3 -f 4/97/40 8/154/40 7/155/40 -f 2/95/22 6/156/22 8/157/22 +f 2/151/39 1/152/39 5/153/39 +f 3/154/3 7/155/3 5/156/3 +f 4/157/40 8/151/40 7/152/40 +f 2/156/22 6/158/22 8/154/22 f 1/83/37 55/82/37 58/85/37 -f 89/158/41 125/159/41 142/160/41 -f 104/161/37 140/162/37 141/163/37 -f 92/164/42 105/165/42 141/166/42 -f 106/167/37 142/168/37 143/169/37 -f 91/170/43 127/171/43 140/172/43 -f 108/173/37 144/174/37 145/175/37 -f 10/7/11 46/30/11 99/176/11 -f 22/18/6 92/177/6 91/178/6 -f 32/60/27 95/179/27 110/180/27 -f 14/5/2 84/181/2 83/182/2 -f 12/33/12 83/183/12 100/184/12 -f 38/21/7 94/185/7 93/186/7 -f 38/21/32 74/68/32 113/187/32 -f 74/188/16 71/189/16 112/190/16 -f 18/2/17 54/43/17 103/191/17 -f 75/192/19 114/193/19 115/194/19 -f 10/7/3 85/195/3 86/196/3 -f 40/70/33 87/197/33 114/198/33 -f 32/24/8 34/23/8 96/199/8 -f 79/200/22 116/201/22 99/202/22 -f 20/44/18 91/203/18 104/204/18 -f 26/15/23 62/53/23 107/205/23 -f 47/206/25 100/207/25 101/208/25 -f 51/209/28 102/210/28 103/211/28 -f 63/212/10 108/173/10 109/213/10 -f 28/54/24 97/214/24 108/215/24 -f 34/23/29 70/63/29 111/216/29 -f 42/10/4 88/217/4 87/218/4 -f 59/219/34 106/167/34 107/220/34 -f 14/5/14 50/36/14 101/221/14 -f 67/222/13 110/223/13 111/224/13 -f 30/26/9 98/225/9 97/226/9 -f 55/227/31 104/161/31 105/228/31 -f 146/229/44 131/230/44 167/231/44 -f 134/232/45 145/233/45 170/234/45 -f 147/235/46 168/236/46 132/237/46 -f 167/238/27 182/239/27 146/240/27 -f 165/241/30 184/242/30 148/243/30 -f 168/244/29 147/245/29 183/246/29 -f 130/247/47 149/248/47 166/249/47 -f 148/250/48 129/251/48 165/252/48 -f 185/253/32 166/254/32 149/255/32 -f 112/190/37 148/256/37 149/257/37 -f 90/258/49 107/259/49 143/260/49 -f 114/193/37 150/261/37 151/262/37 -f 97/263/50 133/264/50 144/265/50 -f 116/201/37 152/266/37 135/267/37 -f 98/268/51 109/269/51 145/233/51 -f 101/208/37 100/207/37 136/270/37 -f 95/271/52 131/230/52 146/229/52 -f 102/210/37 138/272/37 139/273/37 -f 96/274/53 111/275/53 147/235/53 -f 110/223/37 146/276/37 147/277/37 -f 93/278/54 129/251/54 148/250/54 -f 85/279/55 99/280/55 135/281/55 -f 94/282/56 113/283/56 149/248/56 -f 83/284/57 119/285/57 136/286/57 -f 87/287/58 123/288/58 150/289/58 -f 84/290/59 101/291/59 137/292/59 -f 88/293/60 115/294/60 151/295/60 -f 81/296/61 117/297/61 138/298/61 -f 86/299/62 122/300/62 152/301/62 -f 82/302/63 103/303/63 139/304/63 -f 134/232/37 133/264/37 97/263/37 -f 180/305/24 144/306/24 169/307/24 -f 144/174/10 180/305/10 181/308/10 -f 159/309/33 186/310/33 150/311/33 -f 142/168/34 178/312/34 179/313/34 -f 124/314/64 151/295/64 160/315/64 -f 130/316/16 166/254/16 165/241/16 -f 140/162/31 176/317/31 177/318/31 -f 150/289/65 123/288/65 159/319/65 -f 148/256/16 184/242/16 185/253/16 -f 187/320/35 160/321/35 151/322/35 -f 150/261/19 186/310/19 187/320/19 -f 158/323/36 188/324/36 152/325/36 -f 152/266/22 188/324/22 171/326/22 -f 152/301/66 122/300/66 158/327/66 -f 136/270/25 172/328/25 173/329/25 -f 121/330/67 135/281/67 157/331/67 -f 138/272/28 174/332/28 175/333/28 -f 171/326/11 157/334/11 135/335/11 -f 146/276/13 182/239/13 183/246/13 -f 118/336/28 154/337/28 153/338/28 -f 293/339/68 296/340/68 241/341/68 -f 153/338/37 154/337/37 175/333/37 -f 242/342/69 295/343/69 294/344/69 -f 172/328/37 155/345/37 156/346/37 -f 206/347/70 294/344/70 293/339/70 -f 118/348/37 117/297/37 81/296/37 -f 294/344/34 295/349/34 296/350/34 -f 120/351/25 156/346/25 155/345/25 -f 289/352/71 292/353/71 247/354/71 -f 84/290/37 120/355/37 119/285/37 -f 248/356/72 291/357/72 290/358/72 -f 85/279/37 121/330/37 122/300/37 -f 290/358/73 289/352/73 211/359/73 -f 188/324/37 158/323/37 157/334/37 -f 290/358/31 291/360/31 292/361/31 -f 159/309/37 160/321/37 187/320/37 -f 285/362/71 288/363/71 245/364/71 -f 158/323/22 122/365/22 121/366/22 -f 246/367/72 287/368/72 286/369/72 -f 124/314/37 123/288/37 87/287/37 -f 210/370/73 286/369/73 285/362/73 -f 124/371/19 160/321/19 159/309/19 -f 286/369/31 287/372/31 288/373/31 -f 281/374/74 284/375/74 251/376/74 -f 94/282/37 130/247/37 129/251/37 -f 252/377/75 283/378/75 282/379/75 -f 96/274/37 132/237/37 131/230/37 -f 282/379/76 281/374/76 215/380/76 -f 184/242/37 165/241/37 166/254/37 -f 282/379/16 283/381/16 284/382/16 -f 167/238/37 168/244/37 183/246/37 -f 277/383/74 280/384/74 249/385/74 -f 167/238/13 131/386/13 132/387/13 -f 250/388/75 279/389/75 278/390/75 -f 214/391/76 278/390/76 277/383/76 -f 278/390/16 279/392/16 280/393/16 -f 273/394/77 276/395/77 255/396/77 -f 256/397/78 275/398/78 274/399/78 -f 274/399/79 273/394/79 219/400/79 -f 274/399/13 275/401/13 276/402/13 -f 269/403/77 272/404/77 253/405/77 -f 254/406/78 271/407/78 270/408/78 -f 218/409/79 270/408/79 269/403/79 -f 270/408/13 271/410/13 272/411/13 -f 265/412/80 268/413/80 259/414/80 -f 260/415/81 267/416/81 266/417/81 -f 266/417/82 265/412/82 223/418/82 -f 265/412/10 266/417/10 267/419/10 -f 261/420/80 264/421/80 257/422/80 -f 258/423/81 263/424/81 262/425/81 -f 262/425/82 261/420/82 221/426/82 -f 262/425/10 263/427/10 264/428/10 -f 298/429/34 299/430/34 300/431/34 -f 208/432/70 298/429/70 297/433/70 -f 244/434/69 299/435/69 298/429/69 -f 297/433/68 300/436/68 243/437/68 -f 302/438/19 303/439/19 304/440/19 -f 302/438/83 301/441/83 201/442/83 -f 238/443/84 303/444/84 302/438/84 -f 301/441/85 304/445/85 237/446/85 -f 306/447/19 307/448/19 308/449/19 -f 204/450/83 306/447/83 305/451/83 -f 240/452/84 307/453/84 306/447/84 -f 305/451/85 308/454/85 239/455/85 -f 310/456/22 311/457/22 312/458/22 -f 310/456/86 309/459/86 200/460/86 -f 235/461/39 311/462/39 310/456/39 -f 309/459/40 312/463/40 236/464/40 -f 314/465/22 315/466/22 316/467/22 -f 314/465/86 313/468/86 198/469/86 -f 233/470/39 315/471/39 314/465/39 -f 313/468/40 316/472/40 234/473/40 -f 318/474/25 319/475/25 320/476/25 -f 194/477/87 318/474/87 317/478/87 -f 230/479/88 319/480/88 318/474/88 -f 317/478/89 320/481/89 229/482/89 -f 322/483/25 323/484/25 324/485/25 -f 322/483/87 321/486/87 195/487/87 -f 232/488/88 323/489/88 322/483/88 -f 321/486/89 324/490/89 231/491/89 -f 326/492/28 327/493/28 328/494/28 -f 190/495/90 326/492/90 325/496/90 -f 226/497/91 327/498/91 326/492/91 -f 325/496/92 328/499/92 225/500/92 -f 330/501/28 331/502/28 332/503/28 -f 330/501/90 329/504/90 191/505/90 -f 228/506/91 331/507/91 330/501/91 -f 329/504/92 332/508/92 227/509/92 -f 134/510/10 170/511/10 169/307/10 -f 169/307/37 170/511/37 181/308/37 -f 161/512/37 162/513/37 179/313/37 -f 126/514/34 162/513/34 161/512/34 -f 90/258/37 126/515/37 125/159/37 -f 128/516/37 127/171/37 91/170/37 -f 128/517/31 164/518/31 163/519/31 -f 163/519/37 164/518/37 177/318/37 -f 170/511/26 145/520/26 181/308/26 -f 144/265/93 133/264/93 169/521/93 -f 126/515/94 143/260/94 162/522/94 -f 142/160/95 125/159/95 161/523/95 -f 161/512/21 178/312/21 142/524/21 -f 128/516/96 141/166/96 164/525/96 -f 140/172/97 127/171/97 163/526/97 -f 163/519/18 176/317/18 140/527/18 -f 164/518/20 141/528/20 177/318/20 -f 118/348/98 139/304/98 154/529/98 -f 154/337/17 139/530/17 175/333/17 -f 138/298/99 117/297/99 153/531/99 -f 153/338/15 174/332/15 138/532/15 -f 173/329/14 156/346/14 137/533/14 -f 120/355/100 137/292/100 156/534/100 -f 136/286/101 119/285/101 155/535/101 -f 155/345/12 172/328/12 136/536/12 -f 162/513/23 143/537/23 179/313/23 -f 15/538/1 17/1/1 16/3/1 -f 11/539/2 13/4/2 12/6/2 +f 89/159/41 125/160/41 142/161/41 +f 104/162/37 140/163/37 141/164/37 +f 92/165/42 105/166/42 141/167/42 +f 106/168/37 142/169/37 143/170/37 +f 91/171/43 127/172/43 140/173/43 +f 108/174/37 144/175/37 145/176/37 +f 10/7/11 46/30/11 99/177/11 +f 22/18/6 92/178/6 91/179/6 +f 32/60/27 95/180/27 110/181/27 +f 14/5/2 84/182/2 83/183/2 +f 12/33/12 83/184/12 100/185/12 +f 38/21/7 94/186/7 93/187/7 +f 38/21/32 74/68/32 113/188/32 +f 74/189/16 71/190/16 112/191/16 +f 18/2/17 54/43/17 103/192/17 +f 75/193/19 114/194/19 115/195/19 +f 10/7/3 85/196/3 86/197/3 +f 40/70/33 87/198/33 114/199/33 +f 32/24/8 34/23/8 96/200/8 +f 79/201/22 116/202/22 99/203/22 +f 20/44/18 91/204/18 104/205/18 +f 26/15/23 62/53/23 107/206/23 +f 47/207/25 100/208/25 101/209/25 +f 51/210/28 102/211/28 103/212/28 +f 63/213/10 108/174/10 109/214/10 +f 28/54/24 97/215/24 108/216/24 +f 34/23/29 70/63/29 111/217/29 +f 42/10/4 88/218/4 87/219/4 +f 59/220/34 106/168/34 107/221/34 +f 14/5/14 50/36/14 101/222/14 +f 67/223/13 110/224/13 111/225/13 +f 30/26/9 98/226/9 97/227/9 +f 55/228/31 104/162/31 105/229/31 +f 146/230/44 131/231/44 167/232/44 +f 134/233/45 145/234/45 170/235/45 +f 147/236/46 168/237/46 132/238/46 +f 167/239/27 182/240/27 146/241/27 +f 165/242/30 184/243/30 148/244/30 +f 168/245/29 147/246/29 183/247/29 +f 130/248/47 149/249/47 166/250/47 +f 148/251/48 129/252/48 165/253/48 +f 185/254/32 166/255/32 149/256/32 +f 112/191/37 148/257/37 149/258/37 +f 90/259/49 107/260/49 143/261/49 +f 114/194/37 150/262/37 151/263/37 +f 97/264/50 133/265/50 144/266/50 +f 116/202/37 152/267/37 135/268/37 +f 98/269/51 109/270/51 145/234/51 +f 101/209/37 100/208/37 136/271/37 +f 95/272/52 131/231/52 146/230/52 +f 102/211/37 138/273/37 139/274/37 +f 96/275/53 111/276/53 147/236/53 +f 110/224/37 146/277/37 147/278/37 +f 93/279/54 129/252/54 148/251/54 +f 85/280/55 99/281/55 135/282/55 +f 94/283/56 113/284/56 149/249/56 +f 83/285/57 119/286/57 136/287/57 +f 87/288/58 123/289/58 150/290/58 +f 84/291/59 101/292/59 137/293/59 +f 88/294/60 115/295/60 151/296/60 +f 81/297/61 117/298/61 138/299/61 +f 86/300/62 122/301/62 152/302/62 +f 82/303/63 103/304/63 139/305/63 +f 134/233/37 133/265/37 97/264/37 +f 180/306/24 144/307/24 169/308/24 +f 144/175/10 180/306/10 181/309/10 +f 159/310/33 186/311/33 150/312/33 +f 142/169/34 178/313/34 179/314/34 +f 124/315/64 151/296/64 160/316/64 +f 130/317/16 166/255/16 165/242/16 +f 140/163/31 176/318/31 177/319/31 +f 150/290/65 123/289/65 159/320/65 +f 148/257/16 184/243/16 185/254/16 +f 187/321/35 160/322/35 151/323/35 +f 150/262/19 186/311/19 187/321/19 +f 158/324/36 188/325/36 152/326/36 +f 152/267/22 188/325/22 171/327/22 +f 152/302/66 122/301/66 158/328/66 +f 136/271/25 172/329/25 173/330/25 +f 121/331/67 135/282/67 157/332/67 +f 138/273/28 174/333/28 175/334/28 +f 171/327/11 157/335/11 135/336/11 +f 146/277/13 182/240/13 183/247/13 +f 118/337/28 154/338/28 153/339/28 +f 293/340/68 296/341/68 241/342/68 +f 153/339/37 154/338/37 175/334/37 +f 242/343/69 295/344/69 294/345/69 +f 172/329/37 155/346/37 156/347/37 +f 206/348/70 294/345/70 293/340/70 +f 118/349/37 117/298/37 81/297/37 +f 294/345/34 295/350/34 296/351/34 +f 120/352/25 156/347/25 155/346/25 +f 289/353/71 292/354/71 247/355/71 +f 84/291/37 120/356/37 119/286/37 +f 248/357/72 291/358/72 290/359/72 +f 85/280/37 121/331/37 122/301/37 +f 290/359/73 289/353/73 211/360/73 +f 188/325/37 158/324/37 157/335/37 +f 290/359/31 291/361/31 292/362/31 +f 159/310/37 160/322/37 187/321/37 +f 285/363/71 288/364/71 245/365/71 +f 158/324/22 122/366/22 121/367/22 +f 246/368/72 287/369/72 286/370/72 +f 124/315/37 123/289/37 87/288/37 +f 210/371/73 286/370/73 285/363/73 +f 124/372/19 160/322/19 159/310/19 +f 286/370/31 287/373/31 288/374/31 +f 281/375/74 284/376/74 251/377/74 +f 94/283/37 130/248/37 129/252/37 +f 252/378/75 283/379/75 282/380/75 +f 96/275/37 132/238/37 131/231/37 +f 282/380/76 281/375/76 215/381/76 +f 184/243/37 165/242/37 166/255/37 +f 282/380/16 283/382/16 284/383/16 +f 167/239/37 168/245/37 183/247/37 +f 277/384/74 280/385/74 249/386/74 +f 167/239/13 131/387/13 132/388/13 +f 250/389/75 279/390/75 278/391/75 +f 214/392/76 278/391/76 277/384/76 +f 278/391/16 279/393/16 280/394/16 +f 273/395/77 276/396/77 255/397/77 +f 256/398/78 275/399/78 274/400/78 +f 274/400/79 273/395/79 219/401/79 +f 274/400/13 275/402/13 276/403/13 +f 269/404/77 272/405/77 253/406/77 +f 254/407/78 271/408/78 270/409/78 +f 218/410/79 270/409/79 269/404/79 +f 270/409/13 271/411/13 272/412/13 +f 265/413/80 268/414/80 259/415/80 +f 260/416/81 267/417/81 266/418/81 +f 266/418/82 265/413/82 223/419/82 +f 265/413/10 266/418/10 267/420/10 +f 261/421/80 264/422/80 257/423/80 +f 258/424/81 263/425/81 262/426/81 +f 262/426/82 261/421/82 221/427/82 +f 262/426/10 263/428/10 264/429/10 +f 298/430/34 299/431/34 300/432/34 +f 208/433/70 298/430/70 297/434/70 +f 244/435/69 299/436/69 298/430/69 +f 297/434/68 300/437/68 243/438/68 +f 302/439/19 303/440/19 304/441/19 +f 302/439/83 301/442/83 201/443/83 +f 238/444/84 303/445/84 302/439/84 +f 301/442/85 304/446/85 237/447/85 +f 306/448/19 307/449/19 308/450/19 +f 204/451/83 306/448/83 305/452/83 +f 240/453/84 307/454/84 306/448/84 +f 305/452/85 308/455/85 239/456/85 +f 310/457/22 311/458/22 312/459/22 +f 310/457/86 309/460/86 200/461/86 +f 235/462/39 311/463/39 310/457/39 +f 309/460/40 312/464/40 236/465/40 +f 314/466/22 315/467/22 316/468/22 +f 314/466/86 313/469/86 198/470/86 +f 233/471/39 315/472/39 314/466/39 +f 313/469/40 316/473/40 234/474/40 +f 318/475/25 319/476/25 320/477/25 +f 194/478/87 318/475/87 317/479/87 +f 230/480/88 319/481/88 318/475/88 +f 317/479/89 320/482/89 229/483/89 +f 322/484/25 323/485/25 324/486/25 +f 322/484/87 321/487/87 195/488/87 +f 232/489/88 323/490/88 322/484/88 +f 321/487/89 324/491/89 231/492/89 +f 326/493/28 327/494/28 328/495/28 +f 190/496/90 326/493/90 325/497/90 +f 226/498/91 327/499/91 326/493/91 +f 325/497/92 328/500/92 225/501/92 +f 330/502/28 331/503/28 332/504/28 +f 330/502/90 329/505/90 191/506/90 +f 228/507/91 331/508/91 330/502/91 +f 329/505/92 332/509/92 227/510/92 +f 134/511/10 170/512/10 169/308/10 +f 169/308/37 170/512/37 181/309/37 +f 161/513/37 162/514/37 179/314/37 +f 126/515/34 162/514/34 161/513/34 +f 90/259/37 126/516/37 125/160/37 +f 128/517/37 127/172/37 91/171/37 +f 128/518/31 164/519/31 163/520/31 +f 163/520/37 164/519/37 177/319/37 +f 170/512/26 145/521/26 181/309/26 +f 144/266/93 133/265/93 169/522/93 +f 126/516/94 143/261/94 162/523/94 +f 142/161/95 125/160/95 161/524/95 +f 161/513/21 178/313/21 142/525/21 +f 128/517/96 141/167/96 164/526/96 +f 140/173/97 127/172/97 163/527/97 +f 163/520/18 176/318/18 140/528/18 +f 164/519/20 141/529/20 177/319/20 +f 118/349/98 139/305/98 154/530/98 +f 154/338/17 139/531/17 175/334/17 +f 138/299/99 117/298/99 153/532/99 +f 153/339/15 174/333/15 138/533/15 +f 173/330/14 156/347/14 137/534/14 +f 120/356/100 137/293/100 156/535/100 +f 136/287/101 119/286/101 155/536/101 +f 155/346/12 172/329/12 136/537/12 +f 162/514/23 143/538/23 179/314/23 +f 15/539/1 17/1/1 16/3/1 +f 11/540/2 13/4/2 12/6/2 f 9/31/3 10/7/3 43/9/3 f 41/74/4 42/10/4 39/12/4 f 24/102/5 23/13/5 26/15/5 -f 20/540/6 19/16/6 22/18/6 -f 36/541/7 35/19/7 38/21/7 -f 31/542/8 33/22/8 32/24/8 -f 27/543/9 29/25/9 28/27/9 +f 20/541/6 19/16/6 22/18/6 +f 36/542/7 35/19/7 38/21/7 +f 31/543/8 33/22/8 32/24/8 +f 27/544/9 29/25/9 28/27/9 f 45/32/10 48/28/10 46/30/10 f 46/30/11 10/7/11 45/32/11 -f 11/544/12 12/33/12 48/28/12 +f 11/545/12 12/33/12 48/28/12 f 49/37/13 52/34/13 50/36/13 f 50/36/14 14/5/14 49/37/14 f 52/34/15 15/38/15 51/35/15 f 54/43/16 53/40/16 55/42/16 f 18/2/17 17/1/17 54/43/17 -f 19/545/18 20/44/18 56/41/18 +f 19/546/18 20/44/18 56/41/18 f 57/48/19 60/45/19 58/47/19 f 22/18/20 21/17/20 58/47/20 -f 23/546/21 24/49/21 60/45/21 +f 23/547/21 24/49/21 60/45/21 f 62/53/22 61/50/22 63/52/22 f 26/15/23 25/14/23 62/53/23 -f 27/547/24 28/54/24 64/51/24 +f 27/548/24 28/54/24 64/51/24 f 66/58/25 65/55/25 67/57/25 f 30/26/26 29/25/26 66/58/26 f 68/56/27 31/59/27 67/57/27 f 69/64/28 72/61/28 70/63/28 f 34/23/29 33/22/29 70/63/29 -f 35/548/30 36/65/30 72/61/30 +f 35/549/30 36/65/30 72/61/30 f 73/69/31 76/66/31 74/68/31 f 38/21/32 37/20/32 74/68/32 -f 39/549/33 40/70/33 76/66/33 +f 39/550/33 40/70/33 76/66/33 f 78/75/34 77/71/34 79/73/34 f 42/10/35 41/74/35 78/75/35 f 80/72/36 43/76/36 79/73/36 f 1/83/37 62/78/37 3/80/37 -f 81/550/1 16/3/1 82/89/1 -f 98/225/26 30/26/26 109/90/26 +f 81/551/1 16/3/1 82/89/1 +f 98/226/26 30/26/26 109/90/26 f 59/46/21 24/49/21 106/92/21 f 79/73/36 44/77/36 116/94/36 -f 92/177/20 22/18/20 105/98/20 -f 88/217/35 42/10/35 115/99/35 +f 92/178/20 22/18/20 105/98/20 +f 88/218/35 42/10/35 115/99/35 f 51/35/15 16/39/15 102/101/15 -f 89/551/5 24/102/5 90/103/5 +f 89/552/5 24/102/5 90/103/5 f 71/62/30 36/65/30 112/105/30 f 2/95/37 4/97/37 46/109/37 -f 43/552/38 80/114/38 9/116/38 +f 43/553/38 80/114/38 9/116/38 f 77/125/38 41/117/38 76/119/38 f 73/126/38 37/120/38 72/122/38 f 80/114/38 8/123/38 45/115/38 -f 33/553/38 31/130/38 69/128/38 +f 33/554/38 31/130/38 69/128/38 f 68/129/38 7/127/38 69/128/38 f 5/137/38 7/127/38 61/135/38 -f 21/554/38 19/142/38 57/140/38 +f 21/555/38 19/142/38 57/140/38 f 56/141/38 5/137/38 57/140/38 f 49/150/38 13/145/38 48/144/38 f 53/143/38 17/147/38 52/149/38 -f 6/555/39 2/95/39 5/151/39 -f 1/83/3 3/80/3 5/153/3 -f 3/80/40 4/97/40 7/155/40 -f 4/97/22 2/95/22 8/157/22 -f 106/556/102 89/158/102 142/160/102 -f 105/228/37 104/161/37 141/163/37 -f 128/516/103 92/164/103 141/166/103 -f 107/220/37 106/167/37 143/169/37 -f 104/557/104 91/170/104 140/172/104 -f 109/213/37 108/173/37 145/175/37 -f 85/195/11 10/7/11 99/176/11 -f 20/540/6 22/18/6 91/178/6 -f 67/57/27 32/60/27 110/180/27 -f 12/6/2 14/5/2 83/182/2 -f 47/29/12 12/33/12 100/184/12 -f 36/541/7 38/21/7 93/186/7 -f 94/185/32 38/21/32 113/187/32 -f 113/558/16 74/188/16 112/190/16 -f 82/89/17 18/2/17 103/191/17 -f 78/559/19 75/192/19 115/194/19 -f 44/8/3 10/7/3 86/196/3 -f 75/67/33 40/70/33 114/198/33 -f 95/560/8 32/24/8 96/199/8 -f 46/561/22 79/200/22 99/202/22 -f 55/42/18 20/44/18 104/204/18 -f 90/103/23 26/15/23 107/205/23 -f 50/562/25 47/206/25 101/208/25 -f 54/563/28 51/209/28 103/211/28 -f 66/564/10 63/212/10 109/213/10 -f 63/52/24 28/54/24 108/215/24 -f 96/199/29 34/23/29 111/216/29 -f 40/11/4 42/10/4 87/218/4 -f 62/565/34 59/219/34 107/220/34 -f 84/181/14 14/5/14 101/221/14 -f 70/566/13 67/222/13 111/224/13 -f 28/27/9 30/26/9 97/226/9 -f 58/567/31 55/227/31 105/228/31 -f 113/558/37 112/190/37 149/257/37 -f 126/515/105 90/258/105 143/260/105 -f 115/194/37 114/193/37 151/262/37 -f 108/568/106 97/263/106 144/265/106 -f 99/202/37 116/201/37 135/267/37 -f 134/232/107 98/268/107 145/233/107 -f 137/569/37 101/208/37 136/270/37 -f 110/570/108 95/271/108 146/229/108 -f 103/211/37 102/210/37 139/273/37 -f 132/237/109 96/274/109 147/235/109 -f 111/224/37 110/223/37 147/277/37 -f 112/571/110 93/278/110 148/250/110 -f 121/330/111 85/279/111 135/281/111 -f 130/247/112 94/282/112 149/248/112 -f 100/572/113 83/284/113 136/286/113 -f 114/573/114 87/287/114 150/289/114 -f 120/355/115 84/290/115 137/292/115 -f 124/314/116 88/293/116 151/295/116 -f 102/574/117 81/296/117 138/298/117 -f 116/575/118 86/299/118 152/301/118 -f 118/348/119 82/302/119 139/304/119 -f 98/268/37 134/232/37 97/263/37 -f 145/175/10 144/174/10 181/308/10 -f 143/169/34 142/168/34 179/313/34 -f 129/576/16 130/316/16 165/241/16 -f 141/163/31 140/162/31 177/318/31 -f 149/257/16 148/256/16 185/253/16 -f 151/262/19 150/261/19 187/320/19 -f 135/267/22 152/266/22 171/326/22 -f 137/569/25 136/270/25 173/329/25 -f 139/273/28 138/272/28 175/333/28 -f 147/277/13 146/276/13 183/246/13 -f 117/577/28 118/336/28 153/338/28 -f 205/578/68 293/339/68 241/341/68 -f 174/332/37 153/338/37 175/333/37 -f 206/347/69 242/342/69 294/344/69 -f 173/329/37 172/328/37 156/346/37 -f 205/578/70 206/347/70 293/339/70 -f 82/302/37 118/348/37 81/296/37 -f 293/339/34 294/344/34 296/350/34 -f 119/579/25 120/351/25 155/345/25 -f 211/359/71 289/352/71 247/354/71 -f 83/284/37 84/290/37 119/285/37 -f 212/580/72 248/356/72 290/358/72 -f 86/299/37 85/279/37 122/300/37 -f 212/580/73 290/358/73 211/359/73 -f 171/326/37 188/324/37 157/334/37 -f 289/352/31 290/358/31 292/361/31 -f 186/310/37 159/309/37 187/320/37 -f 209/581/71 285/362/71 245/364/71 -f 157/334/22 158/323/22 121/366/22 -f 210/370/72 246/367/72 286/369/72 -f 88/293/37 124/314/37 87/287/37 -f 209/581/73 210/370/73 285/362/73 -f 123/582/19 124/371/19 159/309/19 -f 285/362/31 286/369/31 288/373/31 -f 215/380/74 281/374/74 251/376/74 -f 93/278/37 94/282/37 129/251/37 -f 216/583/75 252/377/75 282/379/75 -f 95/271/37 96/274/37 131/230/37 -f 216/583/76 282/379/76 215/380/76 -f 185/253/37 184/242/37 166/254/37 -f 281/374/16 282/379/16 284/382/16 -f 182/239/37 167/238/37 183/246/37 -f 213/584/74 277/383/74 249/385/74 -f 168/244/13 167/238/13 132/387/13 -f 214/391/75 250/388/75 278/390/75 -f 213/584/76 214/391/76 277/383/76 -f 277/383/16 278/390/16 280/393/16 -f 219/400/77 273/394/77 255/396/77 -f 220/585/78 256/397/78 274/399/78 -f 220/585/79 274/399/79 219/400/79 -f 273/394/13 274/399/13 276/402/13 -f 217/586/77 269/403/77 253/405/77 -f 218/409/78 254/406/78 270/408/78 -f 217/586/79 218/409/79 269/403/79 -f 269/403/13 270/408/13 272/411/13 -f 223/418/80 265/412/80 259/414/80 -f 224/587/81 260/415/81 266/417/81 -f 224/587/82 266/417/82 223/418/82 -f 268/588/10 265/412/10 267/419/10 -f 221/426/80 261/420/80 257/422/80 -f 222/589/81 258/423/81 262/425/81 -f 222/589/82 262/425/82 221/426/82 -f 261/420/10 262/425/10 264/428/10 -f 297/433/34 298/429/34 300/431/34 -f 207/590/70 208/432/70 297/433/70 -f 208/432/69 244/434/69 298/429/69 -f 207/590/68 297/433/68 243/437/68 -f 301/441/19 302/438/19 304/440/19 -f 202/591/83 302/438/83 201/442/83 -f 202/591/84 238/443/84 302/438/84 -f 201/442/85 301/441/85 237/446/85 -f 305/451/19 306/447/19 308/449/19 -f 203/592/83 204/450/83 305/451/83 -f 204/450/84 240/452/84 306/447/84 -f 203/592/85 305/451/85 239/455/85 -f 309/459/22 310/456/22 312/458/22 -f 199/593/86 310/456/86 200/460/86 -f 199/593/39 235/461/39 310/456/39 -f 200/460/40 309/459/40 236/464/40 -f 313/468/22 314/465/22 316/467/22 -f 197/594/86 314/465/86 198/469/86 -f 197/594/39 233/470/39 314/465/39 -f 198/469/40 313/468/40 234/473/40 -f 317/478/25 318/474/25 320/476/25 -f 193/595/87 194/477/87 317/478/87 -f 194/477/88 230/479/88 318/474/88 -f 193/595/89 317/478/89 229/482/89 -f 321/486/25 322/483/25 324/485/25 -f 196/596/87 322/483/87 195/487/87 -f 196/596/88 232/488/88 322/483/88 -f 195/487/89 321/486/89 231/491/89 -f 325/496/28 326/492/28 328/494/28 -f 189/597/90 190/495/90 325/496/90 -f 190/495/91 226/497/91 326/492/91 -f 189/597/92 325/496/92 225/500/92 -f 329/504/28 330/501/28 332/503/28 -f 192/598/90 330/501/90 191/505/90 -f 192/598/91 228/506/91 330/501/91 -f 191/505/92 329/504/92 227/509/92 -f 133/599/10 134/510/10 169/307/10 -f 180/305/37 169/307/37 181/308/37 -f 178/312/37 161/512/37 179/313/37 -f 125/600/34 126/514/34 161/512/34 -f 89/158/37 90/258/37 125/159/37 -f 92/164/37 128/516/37 91/170/37 -f 127/601/31 128/517/31 163/519/31 -f 176/317/37 163/519/37 177/318/37 +f 6/157/39 2/151/39 5/153/39 +f 1/158/3 3/154/3 5/156/3 +f 3/153/40 4/157/40 7/152/40 +f 4/155/22 2/156/22 8/154/22 +f 106/556/102 89/159/102 142/161/102 +f 105/229/37 104/162/37 141/164/37 +f 128/517/103 92/165/103 141/167/103 +f 107/221/37 106/168/37 143/170/37 +f 104/557/104 91/171/104 140/173/104 +f 109/214/37 108/174/37 145/176/37 +f 85/196/11 10/7/11 99/177/11 +f 20/541/6 22/18/6 91/179/6 +f 67/57/27 32/60/27 110/181/27 +f 12/6/2 14/5/2 83/183/2 +f 47/29/12 12/33/12 100/185/12 +f 36/542/7 38/21/7 93/187/7 +f 94/186/32 38/21/32 113/188/32 +f 113/558/16 74/189/16 112/191/16 +f 82/89/17 18/2/17 103/192/17 +f 78/559/19 75/193/19 115/195/19 +f 44/8/3 10/7/3 86/197/3 +f 75/67/33 40/70/33 114/199/33 +f 95/560/8 32/24/8 96/200/8 +f 46/561/22 79/201/22 99/203/22 +f 55/42/18 20/44/18 104/205/18 +f 90/103/23 26/15/23 107/206/23 +f 50/562/25 47/207/25 101/209/25 +f 54/563/28 51/210/28 103/212/28 +f 66/564/10 63/213/10 109/214/10 +f 63/52/24 28/54/24 108/216/24 +f 96/200/29 34/23/29 111/217/29 +f 40/11/4 42/10/4 87/219/4 +f 62/565/34 59/220/34 107/221/34 +f 84/182/14 14/5/14 101/222/14 +f 70/566/13 67/223/13 111/225/13 +f 28/27/9 30/26/9 97/227/9 +f 58/567/31 55/228/31 105/229/31 +f 113/558/37 112/191/37 149/258/37 +f 126/516/105 90/259/105 143/261/105 +f 115/195/37 114/194/37 151/263/37 +f 108/568/106 97/264/106 144/266/106 +f 99/203/37 116/202/37 135/268/37 +f 134/233/107 98/269/107 145/234/107 +f 137/569/37 101/209/37 136/271/37 +f 110/570/108 95/272/108 146/230/108 +f 103/212/37 102/211/37 139/274/37 +f 132/238/109 96/275/109 147/236/109 +f 111/225/37 110/224/37 147/278/37 +f 112/571/110 93/279/110 148/251/110 +f 121/331/111 85/280/111 135/282/111 +f 130/248/112 94/283/112 149/249/112 +f 100/572/113 83/285/113 136/287/113 +f 114/573/114 87/288/114 150/290/114 +f 120/356/115 84/291/115 137/293/115 +f 124/315/116 88/294/116 151/296/116 +f 102/574/117 81/297/117 138/299/117 +f 116/575/118 86/300/118 152/302/118 +f 118/349/119 82/303/119 139/305/119 +f 98/269/37 134/233/37 97/264/37 +f 145/176/10 144/175/10 181/309/10 +f 143/170/34 142/169/34 179/314/34 +f 129/576/16 130/317/16 165/242/16 +f 141/164/31 140/163/31 177/319/31 +f 149/258/16 148/257/16 185/254/16 +f 151/263/19 150/262/19 187/321/19 +f 135/268/22 152/267/22 171/327/22 +f 137/569/25 136/271/25 173/330/25 +f 139/274/28 138/273/28 175/334/28 +f 147/278/13 146/277/13 183/247/13 +f 117/577/28 118/337/28 153/339/28 +f 205/578/68 293/340/68 241/342/68 +f 174/333/37 153/339/37 175/334/37 +f 206/348/69 242/343/69 294/345/69 +f 173/330/37 172/329/37 156/347/37 +f 205/578/70 206/348/70 293/340/70 +f 82/303/37 118/349/37 81/297/37 +f 293/340/34 294/345/34 296/351/34 +f 119/579/25 120/352/25 155/346/25 +f 211/360/71 289/353/71 247/355/71 +f 83/285/37 84/291/37 119/286/37 +f 212/580/72 248/357/72 290/359/72 +f 86/300/37 85/280/37 122/301/37 +f 212/580/73 290/359/73 211/360/73 +f 171/327/37 188/325/37 157/335/37 +f 289/353/31 290/359/31 292/362/31 +f 186/311/37 159/310/37 187/321/37 +f 209/581/71 285/363/71 245/365/71 +f 157/335/22 158/324/22 121/367/22 +f 210/371/72 246/368/72 286/370/72 +f 88/294/37 124/315/37 87/288/37 +f 209/581/73 210/371/73 285/363/73 +f 123/582/19 124/372/19 159/310/19 +f 285/363/31 286/370/31 288/374/31 +f 215/381/74 281/375/74 251/377/74 +f 93/279/37 94/283/37 129/252/37 +f 216/583/75 252/378/75 282/380/75 +f 95/272/37 96/275/37 131/231/37 +f 216/583/76 282/380/76 215/381/76 +f 185/254/37 184/243/37 166/255/37 +f 281/375/16 282/380/16 284/383/16 +f 182/240/37 167/239/37 183/247/37 +f 213/584/74 277/384/74 249/386/74 +f 168/245/13 167/239/13 132/388/13 +f 214/392/75 250/389/75 278/391/75 +f 213/584/76 214/392/76 277/384/76 +f 277/384/16 278/391/16 280/394/16 +f 219/401/77 273/395/77 255/397/77 +f 220/585/78 256/398/78 274/400/78 +f 220/585/79 274/400/79 219/401/79 +f 273/395/13 274/400/13 276/403/13 +f 217/586/77 269/404/77 253/406/77 +f 218/410/78 254/407/78 270/409/78 +f 217/586/79 218/410/79 269/404/79 +f 269/404/13 270/409/13 272/412/13 +f 223/419/80 265/413/80 259/415/80 +f 224/587/81 260/416/81 266/418/81 +f 224/587/82 266/418/82 223/419/82 +f 268/588/10 265/413/10 267/420/10 +f 221/427/80 261/421/80 257/423/80 +f 222/589/81 258/424/81 262/426/81 +f 222/589/82 262/426/82 221/427/82 +f 261/421/10 262/426/10 264/429/10 +f 297/434/34 298/430/34 300/432/34 +f 207/590/70 208/433/70 297/434/70 +f 208/433/69 244/435/69 298/430/69 +f 207/590/68 297/434/68 243/438/68 +f 301/442/19 302/439/19 304/441/19 +f 202/591/83 302/439/83 201/443/83 +f 202/591/84 238/444/84 302/439/84 +f 201/443/85 301/442/85 237/447/85 +f 305/452/19 306/448/19 308/450/19 +f 203/592/83 204/451/83 305/452/83 +f 204/451/84 240/453/84 306/448/84 +f 203/592/85 305/452/85 239/456/85 +f 309/460/22 310/457/22 312/459/22 +f 199/593/86 310/457/86 200/461/86 +f 199/593/39 235/462/39 310/457/39 +f 200/461/40 309/460/40 236/465/40 +f 313/469/22 314/466/22 316/468/22 +f 197/594/86 314/466/86 198/470/86 +f 197/594/39 233/471/39 314/466/39 +f 198/470/40 313/469/40 234/474/40 +f 317/479/25 318/475/25 320/477/25 +f 193/595/87 194/478/87 317/479/87 +f 194/478/88 230/480/88 318/475/88 +f 193/595/89 317/479/89 229/483/89 +f 321/487/25 322/484/25 324/486/25 +f 196/596/87 322/484/87 195/488/87 +f 196/596/88 232/489/88 322/484/88 +f 195/488/89 321/487/89 231/492/89 +f 325/497/28 326/493/28 328/495/28 +f 189/597/90 190/496/90 325/497/90 +f 190/496/91 226/498/91 326/493/91 +f 189/597/92 325/497/92 225/501/92 +f 329/505/28 330/502/28 332/504/28 +f 192/598/90 330/502/90 191/506/90 +f 192/598/91 228/507/91 330/502/91 +f 191/506/92 329/505/92 227/510/92 +f 133/599/10 134/511/10 169/308/10 +f 180/306/37 169/308/37 181/309/37 +f 178/313/37 161/513/37 179/314/37 +f 125/600/34 126/515/34 161/513/34 +f 89/159/37 90/259/37 125/160/37 +f 92/165/37 128/517/37 91/171/37 +f 127/601/31 128/518/31 163/520/31 +f 176/318/37 163/520/37 177/319/37 diff --git a/assets/hbm/models/vault_frame_old.obj b/assets/hbm/models/vault_frame_old.obj new file mode 100644 index 000000000..ee5a5df5a --- /dev/null +++ b/assets/hbm/models/vault_frame_old.obj @@ -0,0 +1,1576 @@ +# Blender v2.76 (sub 0) OBJ File: 'vault_frame.blend' +# www.blender.org +o Cylinder +v 0.500000 5.000000 2.500000 +v 0.500000 0.000000 2.500000 +v 0.500000 5.000000 -2.500000 +v 0.500000 0.000000 -2.500000 +v -0.500000 5.000000 2.500000 +v -0.500000 0.000000 2.500000 +v -0.500000 5.000000 -2.500000 +v -0.500000 0.000000 -2.500000 +v -0.500000 0.762429 0.308123 +v 0.500000 0.762428 0.308123 +v -0.500000 0.970886 0.880855 +v 0.500000 0.970886 0.880854 +v -0.500000 1.367000 1.352926 +v 0.500000 1.367000 1.352926 +v -0.500000 1.894833 1.657669 +v 0.500000 1.894833 1.657669 +v -0.500000 2.501716 1.764679 +v 0.500000 2.501716 1.764679 +v -0.500000 3.101944 1.658843 +v 0.500000 3.101944 1.658843 +v -0.500000 3.635628 1.350719 +v 0.500000 3.635628 1.350719 +v -0.500000 4.027399 0.883825 +v 0.500000 4.027399 0.883825 +v -0.500000 4.238168 0.304744 +v 0.500000 4.238167 0.304744 +v -0.500000 4.238167 -0.304744 +v 0.500000 4.238167 -0.304744 +v -0.500000 4.027398 -0.883825 +v 0.500000 4.027398 -0.883825 +v -0.500001 3.635627 -1.350720 +v 0.500000 3.635627 -1.350720 +v -0.500001 3.101943 -1.658842 +v 0.499999 3.101943 -1.658842 +v -0.500000 2.501716 -1.764678 +v 0.500000 2.501716 -1.764678 +v -0.500001 1.894833 -1.657669 +v 0.500000 1.894833 -1.657669 +v -0.500001 1.367002 -1.352925 +v 0.500000 1.367001 -1.352925 +v -0.500000 0.970887 -0.880855 +v 0.500000 0.970886 -0.880855 +v -0.500000 0.762429 -0.308124 +v 0.500000 0.762429 -0.308124 +v -0.500000 0.327325 0.574589 +v 0.500000 0.327325 0.574589 +v 0.500000 0.466296 0.956409 +v -0.500000 0.466297 0.956409 +v -0.500000 1.204973 1.836729 +v 0.500000 1.204973 1.836729 +v 0.500000 1.556861 2.039891 +v -0.500000 1.556861 2.039891 +v -0.500000 2.688578 2.239443 +v 0.500000 2.688578 2.239443 +v 0.500000 3.088730 2.168886 +v -0.500000 3.088730 2.168886 +v -0.500000 4.083945 1.594298 +v 0.500000 4.083945 1.594298 +v 0.500000 4.345126 1.283035 +v -0.500000 4.345126 1.283035 +v -0.500000 4.738167 0.203162 +v 0.500000 4.738167 0.203162 +v 0.500000 4.738167 -0.203163 +v -0.500000 4.738167 -0.203163 +v -0.500000 4.345125 -1.283035 +v 0.500000 4.345125 -1.283035 +v 0.500000 4.083944 -1.594298 +v -0.500001 4.083944 -1.594298 +v -0.500001 3.088729 -2.168885 +v 0.499999 3.088729 -2.168885 +v 0.500000 2.688578 -2.239443 +v -0.500001 2.688578 -2.239443 +v -0.500001 1.556861 -2.039891 +v 0.500000 1.556861 -2.039891 +v 0.500000 1.204973 -1.836729 +v -0.500001 1.204974 -1.836729 +v -0.500001 0.466298 -0.956410 +v 0.499999 0.466297 -0.956411 +v 0.499999 0.327326 -0.574590 +v -0.500001 0.327326 -0.574590 +v 0.750000 1.894833 1.657669 +v 0.750000 2.501716 1.764679 +v 0.750000 0.970886 0.880854 +v 0.750000 1.367000 1.352926 +v 0.750000 0.762428 0.308123 +v 0.750000 0.762429 -0.308124 +v 0.750000 1.367001 -1.352925 +v 0.750000 0.970886 -0.880855 +v 0.750000 4.027399 0.883825 +v 0.750000 4.238167 0.304744 +v 0.750000 3.101944 1.658843 +v 0.750000 3.635628 1.350719 +v 0.750000 2.501716 -1.764678 +v 0.750000 1.894833 -1.657669 +v 0.750000 3.635627 -1.350720 +v 0.749999 3.101943 -1.658842 +v 0.750000 4.238167 -0.304744 +v 0.750000 4.027398 -0.883825 +v 0.562500 0.327325 0.574589 +v 0.562500 0.466296 0.956409 +v 0.562500 1.204973 1.836729 +v 0.562500 1.556861 2.039891 +v 0.562500 2.688578 2.239443 +v 0.562500 3.088730 2.168886 +v 0.562500 4.083945 1.594298 +v 0.562500 4.345126 1.283035 +v 0.562500 4.738167 0.203162 +v 0.562500 4.738167 -0.203163 +v 0.562500 4.345125 -1.283035 +v 0.562500 4.083944 -1.594298 +v 0.562499 3.088729 -2.168885 +v 0.562500 2.688578 -2.239443 +v 0.562500 1.556861 -2.039891 +v 0.562500 1.204973 -1.836729 +v 0.562499 0.466297 -0.956411 +v 0.562499 0.327326 -0.574590 +v 0.750000 1.947966 1.711219 +v 0.750000 2.433472 1.796827 +v 0.750000 0.977166 0.956029 +v 0.750000 1.294058 1.333687 +v 0.750000 0.718918 0.246499 +v 0.750000 0.718919 -0.246500 +v 0.750000 1.294059 -1.333686 +v 0.750000 0.977167 -0.956030 +v 0.750000 4.089362 0.840798 +v 0.750000 4.257977 0.377533 +v 0.750000 3.177068 1.665711 +v 0.750000 3.604014 1.419213 +v 0.750000 2.433472 -1.796827 +v 0.750000 1.947966 -1.711219 +v 0.750000 3.604013 -1.419213 +v 0.749999 3.177067 -1.665711 +v 0.750000 4.257977 -0.377534 +v 0.750000 4.089361 -0.840798 +v 0.562500 0.370835 0.459671 +v 0.562500 0.573495 1.016473 +v 0.562500 1.164436 1.720729 +v 0.562500 1.677588 2.016997 +v 0.562500 2.582962 2.176639 +v 0.562500 3.166496 2.073746 +v 0.562500 3.962668 1.614075 +v 0.562500 4.343544 1.160166 +v 0.562500 4.657976 0.296268 +v 0.562500 4.657976 -0.296269 +v 0.562500 4.343543 -1.160166 +v 0.562500 3.962667 -1.614076 +v 0.562499 3.166496 -2.073745 +v 0.562500 2.582962 -2.176638 +v 0.562500 1.677588 -2.016997 +v 0.562500 1.164437 -1.720729 +v 0.562499 0.573496 -1.016474 +v 0.562500 0.370836 -0.459672 +v 0.625000 1.947966 1.711219 +v 0.625000 2.433472 1.796827 +v 0.625000 0.977166 0.956029 +v 0.625000 1.294058 1.333687 +v 0.625000 0.718918 0.246499 +v 0.625000 0.718919 -0.246500 +v 0.625000 1.294059 -1.333686 +v 0.625000 0.977167 -0.956030 +v 0.625000 4.089362 0.840798 +v 0.625000 4.257977 0.377533 +v 0.625000 3.177068 1.665711 +v 0.625000 3.604014 1.419213 +v 0.625000 2.433472 -1.796827 +v 0.625000 1.947966 -1.711219 +v 0.625000 3.604013 -1.419213 +v 0.624999 3.177067 -1.665711 +v 0.625000 4.257977 -0.377534 +v 0.625000 4.089361 -0.840798 +v 0.625000 0.370835 0.459671 +v 0.625000 0.573495 1.016473 +v 0.625000 1.164436 1.720729 +v 0.625000 1.677588 2.016997 +v 0.625000 2.582962 2.176639 +v 0.625000 3.166496 2.073746 +v 0.625000 3.962668 1.614075 +v 0.625000 4.343544 1.160166 +v 0.625000 4.657976 0.296268 +v 0.625000 4.657976 -0.296269 +v 0.625000 4.343543 -1.160166 +v 0.625000 3.962667 -1.614076 +v 0.624999 3.166496 -2.073745 +v 0.625000 2.582962 -2.176638 +v 0.625000 1.677588 -2.016997 +v 0.625000 1.164437 -1.720729 +v 0.624999 0.573496 -1.016474 +v 0.625000 0.370836 -0.459672 +v 0.750000 2.045067 1.728341 +v 0.750000 2.142168 1.745462 +v 0.750000 2.239269 1.762584 +v 0.750000 2.336371 1.779706 +v 0.750000 1.040545 1.031561 +v 0.750000 1.103923 1.107092 +v 0.750000 1.167301 1.182624 +v 0.750000 1.230680 1.258155 +v 0.750000 0.718918 0.147899 +v 0.750000 0.718918 0.049299 +v 0.750000 0.718918 -0.049300 +v 0.750000 0.718918 -0.147900 +v 0.750000 1.230681 -1.258155 +v 0.750000 1.167302 -1.182624 +v 0.750000 1.103924 -1.107092 +v 0.750000 1.040545 -1.031561 +v 0.750000 4.123085 0.748145 +v 0.750000 4.156808 0.655492 +v 0.750000 4.190531 0.562839 +v 0.750000 4.224254 0.470186 +v 0.750000 3.262457 1.616412 +v 0.750000 3.347846 1.567112 +v 0.750000 3.433236 1.517812 +v 0.750000 3.518625 1.468513 +v 0.750000 2.336371 -1.779705 +v 0.750000 2.239269 -1.762584 +v 0.750000 2.142168 -1.745462 +v 0.750000 2.045067 -1.728341 +v 0.750000 3.518624 -1.468513 +v 0.749999 3.433235 -1.517812 +v 0.749999 3.347846 -1.567112 +v 0.749999 3.262456 -1.616411 +v 0.750000 4.224254 -0.470187 +v 0.750000 4.190530 -0.562840 +v 0.750000 4.156807 -0.655493 +v 0.750000 4.123084 -0.748146 +v 0.625000 2.045067 1.728341 +v 0.625000 2.142168 1.745462 +v 0.625000 2.239269 1.762584 +v 0.625000 2.336371 1.779706 +v 0.625000 1.040545 1.031561 +v 0.625000 1.103923 1.107092 +v 0.625000 1.167301 1.182624 +v 0.625000 1.230680 1.258155 +v 0.625000 0.718918 0.147899 +v 0.625000 0.718918 0.049299 +v 0.625000 0.718918 -0.049300 +v 0.625000 0.718918 -0.147900 +v 0.625000 1.230681 -1.258155 +v 0.625000 1.167302 -1.182624 +v 0.625000 1.103924 -1.107092 +v 0.625000 1.040545 -1.031561 +v 0.625000 4.123085 0.748145 +v 0.625000 4.156808 0.655492 +v 0.625000 4.190531 0.562839 +v 0.625000 4.224254 0.470186 +v 0.625000 3.262457 1.616412 +v 0.625000 3.347846 1.567112 +v 0.625000 3.433236 1.517812 +v 0.625000 3.518625 1.468513 +v 0.625000 2.336371 -1.779705 +v 0.625000 2.239269 -1.762584 +v 0.625000 2.142168 -1.745462 +v 0.625000 2.045067 -1.728341 +v 0.625000 3.518624 -1.468513 +v 0.624999 3.433235 -1.517812 +v 0.624999 3.347846 -1.567112 +v 0.624999 3.262456 -1.616411 +v 0.625000 4.224254 -0.470187 +v 0.625000 4.190530 -0.562840 +v 0.625000 4.156807 -0.655493 +v 0.625000 4.123084 -0.748146 +v 0.625000 4.553145 -0.589894 +v 0.625000 4.519423 -0.682547 +v 0.562500 4.519423 -0.682547 +v 0.562500 4.553145 -0.589894 +v 0.625000 4.485700 -0.775200 +v 0.625000 4.451977 -0.867853 +v 0.562500 4.451977 -0.867853 +v 0.562500 4.485700 -0.775200 +v 0.625000 3.693624 -1.771622 +v 0.624999 3.608234 -1.820921 +v 0.562499 3.608234 -1.820921 +v 0.562500 3.693624 -1.771622 +v 0.624999 3.522846 -1.870220 +v 0.624999 3.437456 -1.919520 +v 0.562499 3.437456 -1.919520 +v 0.562499 3.522846 -1.870220 +v 0.625000 2.275594 -2.124388 +v 0.625000 2.178493 -2.107266 +v 0.562500 2.178493 -2.107266 +v 0.562500 2.275594 -2.124388 +v 0.625000 2.081392 -2.090145 +v 0.625000 1.984291 -2.073024 +v 0.562500 1.984291 -2.073024 +v 0.562500 2.081392 -2.090145 +v 0.625000 3.437457 1.919520 +v 0.625000 3.522846 1.870221 +v 0.562500 3.522846 1.870221 +v 0.562500 3.437457 1.919520 +v 0.625000 3.608236 1.820921 +v 0.625000 3.693625 1.771621 +v 0.562500 3.693625 1.771621 +v 0.562500 3.608236 1.820921 +v 0.625000 4.451978 0.867852 +v 0.625000 4.485701 0.775199 +v 0.562500 4.485701 0.775199 +v 0.562500 4.451978 0.867852 +v 0.625000 4.519423 0.682546 +v 0.625000 4.553146 0.589893 +v 0.562500 4.553146 0.589893 +v 0.562500 4.519423 0.682546 +v 0.625000 0.962565 -1.483131 +v 0.625000 0.899187 -1.407600 +v 0.562500 0.899187 -1.407600 +v 0.562500 0.962565 -1.483131 +v 0.625000 0.835809 -1.332069 +v 0.625000 0.772430 -1.256537 +v 0.562500 0.772430 -1.256537 +v 0.562500 0.835809 -1.332069 +v 0.625000 0.368918 -0.147900 +v 0.625000 0.368918 -0.049301 +v 0.562500 0.368918 -0.049301 +v 0.562500 0.368918 -0.147900 +v 0.625000 0.368918 0.049299 +v 0.625000 0.368918 0.147898 +v 0.562500 0.368918 0.147898 +v 0.562500 0.368918 0.049299 +v 0.625000 0.772429 1.256536 +v 0.625000 0.835807 1.332068 +v 0.562500 0.835807 1.332068 +v 0.562500 0.772429 1.256536 +v 0.625000 0.899186 1.407599 +v 0.625000 0.962564 1.483131 +v 0.562500 0.962564 1.483131 +v 0.562500 0.899186 1.407599 +v 0.625000 1.984290 2.073024 +v 0.625000 2.081391 2.090145 +v 0.562500 2.081391 2.090145 +v 0.562500 1.984290 2.073024 +v 0.625000 2.178493 2.107267 +v 0.625000 2.275594 2.124388 +v 0.562500 2.275594 2.124388 +v 0.562500 2.178493 2.107267 +vt 0.674495 0.301724 +vt 0.744051 0.301724 +vt 0.744051 0.344587 +vt 0.634294 0.063011 +vt 0.564738 0.062987 +vt 0.564753 0.020124 +vt 0.616871 0.301724 +vt 0.616871 0.344588 +vt 0.547315 0.344588 +vt 0.590179 0.454379 +vt 0.547315 0.454379 +vt 0.547315 0.384823 +vt 0.585249 0.674595 +vt 0.628113 0.674595 +vt 0.628113 0.744151 +vt 0.761489 0.020118 +vt 0.761489 0.062981 +vt 0.691933 0.062981 +vt 0.586800 0.548190 +vt 0.629663 0.548190 +vt 0.629663 0.617746 +vt 0.451201 0.674595 +vt 0.451201 0.744151 +vt 0.408338 0.744151 +vt 0.451201 0.547415 +vt 0.451201 0.616971 +vt 0.408338 0.616971 +vt 0.547315 0.237973 +vt 0.616871 0.237973 +vt 0.616871 0.266236 +vt 0.547315 0.301724 +vt 0.547315 0.266236 +vt 0.616871 0.202485 +vt 0.634272 0.126762 +vt 0.564716 0.126738 +vt 0.564726 0.098475 +vt 0.634282 0.098499 +vt 0.634260 0.162250 +vt 0.564704 0.162226 +vt 0.674495 0.266236 +vt 0.674495 0.237973 +vt 0.744051 0.237973 +vt 0.744051 0.266236 +vt 0.744051 0.202485 +vt 0.761489 0.126732 +vt 0.691933 0.126732 +vt 0.691933 0.098469 +vt 0.761489 0.098469 +vt 0.691933 0.162220 +vt 0.663601 0.674595 +vt 0.691863 0.674595 +vt 0.691863 0.744151 +vt 0.663601 0.744151 +vt 0.727352 0.744151 +vt 0.486689 0.547415 +vt 0.514952 0.547415 +vt 0.514952 0.616971 +vt 0.486689 0.616971 +vt 0.550440 0.547415 +vt 0.550440 0.616971 +vt 0.514952 0.674595 +vt 0.514952 0.744151 +vt 0.486689 0.744151 +vt 0.486689 0.674595 +vt 0.550440 0.744151 +vt 0.693414 0.548190 +vt 0.693414 0.617746 +vt 0.665151 0.617746 +vt 0.665151 0.548190 +vt 0.728902 0.617746 +vt 0.625667 0.384823 +vt 0.653929 0.384823 +vt 0.653929 0.454379 +vt 0.590179 0.384823 +vt 0.625667 0.454379 +vt 0.689417 0.384823 +vt 0.689418 0.454379 +vt 0.249545 0.419394 +vt 0.278078 0.419377 +vt 0.437273 0.437603 +vt 0.107759 0.276798 +vt 0.112671 0.304627 +vt 0.089639 0.437603 +vt 0.174332 0.392033 +vt 0.152666 0.373861 +vt 0.352849 0.392119 +vt 0.374458 0.373974 +vt 0.414381 0.304802 +vt 0.761440 0.301724 +vt 0.486689 0.621318 +vt 0.674544 0.162220 +vt 0.687586 0.126732 +vt 0.689418 0.471767 +vt 0.653929 0.458726 +vt 0.089637 0.089759 +vt 0.419307 0.276979 +vt 0.437594 0.089923 +vt 0.687586 0.098469 +vt 0.625667 0.458726 +vt 0.547315 0.162220 +vt 0.560369 0.126736 +vt 0.585249 0.744151 +vt 0.628113 0.761540 +vt 0.550440 0.761540 +vt 0.514952 0.748498 +vt 0.121648 0.198105 +vt 0.135789 0.173628 +vt 0.197051 0.122258 +vt 0.223619 0.112599 +vt 0.405488 0.198235 +vt 0.391371 0.173744 +vt 0.330152 0.122319 +vt 0.303590 0.112636 +vt 0.154148 0.570166 +vt 0.234094 0.570183 +vt 0.215552 0.600446 +vt 0.132836 0.614938 +vt 0.099994 0.642495 +vt 0.066333 0.631220 +vt 0.078794 0.679218 +vt 0.071352 0.721439 +vt 0.038321 0.734443 +vt 0.020167 0.547365 +vt 0.368053 0.547438 +vt 0.127581 0.579832 +vt 0.052198 0.655705 +vt 0.020208 0.895350 +vt 0.043237 0.762285 +vt 0.083229 0.831507 +vt 0.100160 0.800306 +vt 0.104901 0.849667 +vt 0.132656 0.827534 +vt 0.172952 0.842159 +vt 0.180000 0.876995 +vt 0.208515 0.876943 +vt 0.215478 0.842107 +vt 0.367883 0.895009 +vt 0.255674 0.827470 +vt 0.283397 0.849534 +vt 0.305016 0.831395 +vt 0.344940 0.762245 +vt 0.309503 0.763161 +vt 0.349853 0.734435 +vt 0.260653 0.579856 +vt 0.288222 0.642514 +vt 0.255390 0.614954 +vt 0.316853 0.721441 +vt 0.309411 0.679233 +vt 0.336003 0.655732 +vt 0.321878 0.631251 +vt 0.020071 0.437604 +vt 0.437273 0.507130 +vt 0.089640 0.507130 +vt 0.507130 0.089988 +vt 0.506809 0.437667 +vt 0.089670 0.020167 +vt 0.437627 0.020332 +vt 0.788301 0.887799 +vt 0.792587 0.890825 +vt 0.776111 0.917371 +vt 0.728604 0.806122 +vt 0.720610 0.809148 +vt 0.656665 0.809148 +vt 0.750092 0.501493 +vt 0.729653 0.469684 +vt 0.737902 0.471921 +vt 0.773013 0.672556 +vt 0.781006 0.669530 +vt 0.844951 0.669530 +vt 0.792956 0.501493 +vt 0.788669 0.498466 +vt 0.805145 0.471921 +vt 0.768839 0.842054 +vt 0.776832 0.839028 +vt 0.840778 0.839028 +vt 0.621218 0.266236 +vt 0.674544 0.062981 +vt 0.674544 0.020118 +vt 0.550440 0.634360 +vt 0.514952 0.621318 +vt 0.547350 0.062981 +vt 0.547364 0.020118 +vt 0.634260 0.202485 +vt 0.621218 0.237973 +vt 0.629663 0.635135 +vt 0.586800 0.635135 +vt 0.665151 0.622093 +vt 0.877731 0.250212 +vt 0.797799 0.250212 +vt 0.797799 0.245865 +vt 0.748398 0.266236 +vt 0.604561 0.801775 +vt 0.604561 0.806122 +vt 0.524629 0.806122 +vt 0.634260 0.301724 +vt 0.634260 0.344588 +vt 0.728902 0.635135 +vt 0.693414 0.622093 +vt 0.451201 0.761540 +vt 0.809585 0.384823 +vt 0.809585 0.389170 +vt 0.729653 0.389170 +vt 0.761440 0.202485 +vt 0.748398 0.237973 +vt 0.663601 0.748498 +vt 0.488270 0.801775 +vt 0.488270 0.806122 +vt 0.408338 0.806122 +vt 0.877731 0.286572 +vt 0.877731 0.290919 +vt 0.797799 0.290919 +vt 0.768839 0.846401 +vt 0.848771 0.842054 +vt 0.727352 0.761540 +vt 0.691863 0.748498 +vt 0.486689 0.748498 +vt 0.590179 0.471768 +vt 0.547315 0.471768 +vt 0.773013 0.676903 +vt 0.852944 0.672556 +vt 0.560379 0.098474 +vt 0.773013 0.592041 +vt 0.773013 0.587694 +vt 0.852944 0.587694 +vt 0.451201 0.634360 +vt 0.408338 0.634360 +vt 0.728604 0.801775 +vt 0.648672 0.806122 +vt 0.807648 0.053565 +vt 0.824123 0.027020 +vt 0.828922 0.034270 +vt 0.908061 0.387849 +vt 0.924536 0.414395 +vt 0.903262 0.395099 +vt 0.874890 0.053565 +vt 0.853615 0.034270 +vt 0.858414 0.027019 +vt 0.795834 0.556109 +vt 0.781006 0.580320 +vt 0.777299 0.578050 +vt 0.820620 0.214280 +vt 0.805793 0.238491 +vt 0.802085 0.236221 +vt 0.830124 0.556110 +vt 0.848659 0.578050 +vt 0.844951 0.580321 +vt 0.465803 0.890438 +vt 0.482279 0.916984 +vt 0.461004 0.897688 +vt 0.415036 0.916984 +vt 0.431512 0.890438 +vt 0.436311 0.897688 +vt 0.869738 0.238491 +vt 0.854911 0.214280 +vt 0.873445 0.236221 +vt 0.805793 0.242838 +vt 0.869738 0.242838 +vt 0.831164 0.887799 +vt 0.851602 0.919608 +vt 0.843353 0.917371 +vt 0.596568 0.809148 +vt 0.532623 0.809148 +vt 0.869484 0.384823 +vt 0.873770 0.387849 +vt 0.857294 0.414395 +vt 0.801592 0.392196 +vt 0.737646 0.392197 +vt 0.912347 0.384823 +vt 0.932785 0.416631 +vt 0.480277 0.809148 +vt 0.819837 0.023993 +vt 0.869738 0.293945 +vt 0.805792 0.293945 +vt 0.862700 0.023993 +vt 0.883139 0.055802 +vt 0.781006 0.584668 +vt 0.844951 0.584668 +vt 0.427226 0.887412 +vt 0.793451 0.748947 +vt 0.773013 0.717138 +vt 0.781262 0.719375 +vt 0.470089 0.887412 +vt 0.490528 0.919220 +vt 0.915012 0.502892 +vt 0.910726 0.499866 +vt 0.927202 0.473320 +vt 0.863476 0.124745 +vt 0.859190 0.121718 +vt 0.875665 0.095173 +vt 0.872149 0.502892 +vt 0.851711 0.471084 +vt 0.859960 0.473320 +vt 0.820612 0.124745 +vt 0.800174 0.092936 +vt 0.808423 0.095173 +vt 0.705638 0.921545 +vt 0.701352 0.918519 +vt 0.717828 0.891973 +vt 0.836315 0.748947 +vt 0.832028 0.745920 +vt 0.848504 0.719375 +vt 0.662775 0.921545 +vt 0.642337 0.889737 +vt 0.650586 0.891973 +vt 0.776832 0.834680 +vt 0.773125 0.832410 +vt 0.791660 0.810469 +vt 0.840778 0.834681 +vt 0.581741 0.837707 +vt 0.596568 0.813496 +vt 0.600275 0.815766 +vt 0.781006 0.665182 +vt 0.844951 0.665182 +vt 0.824899 0.121718 +vt 0.829698 0.114468 +vt 0.854911 0.205585 +vt 0.720610 0.813496 +vt 0.656665 0.813496 +vt 0.854391 0.114468 +vt 0.532623 0.813496 +vt 0.547450 0.837707 +vt 0.528916 0.815766 +vt 0.786765 0.420755 +vt 0.801592 0.396544 +vt 0.805299 0.398814 +vt 0.737646 0.396544 +vt 0.827229 0.738670 +vt 0.480277 0.813496 +vt 0.416331 0.813496 +vt 0.797737 0.745920 +vt 0.802537 0.738670 +vt 0.869738 0.298293 +vt 0.805792 0.298292 +vt 0.752474 0.420755 +vt 0.733939 0.398814 +vt 0.820619 0.331198 +vt 0.820619 0.322503 +vt 0.854910 0.322504 +vt 0.533851 0.958558 +vt 0.532389 0.954464 +vt 0.556777 0.950371 +vt 0.556777 0.973605 +vt 0.532389 0.969511 +vt 0.533851 0.965417 +vt 0.465449 0.837707 +vt 0.431159 0.837707 +vt 0.559701 0.965417 +vt 0.667061 0.918519 +vt 0.529504 0.965417 +vt 0.529504 0.958558 +vt 0.431159 0.846401 +vt 0.923476 0.281118 +vt 0.922014 0.277024 +vt 0.946402 0.272930 +vt 0.876435 0.499866 +vt 0.946402 0.296164 +vt 0.922014 0.292070 +vt 0.923476 0.287976 +vt 0.949327 0.281118 +vt 0.919129 0.287976 +vt 0.919129 0.281118 +vt 0.928109 0.109699 +vt 0.926647 0.105605 +vt 0.951035 0.101511 +vt 0.786765 0.429449 +vt 0.752474 0.429449 +vt 0.951035 0.124745 +vt 0.926647 0.120651 +vt 0.928109 0.116557 +vt 0.953959 0.116557 +vt 0.547450 0.846401 +vt 0.923762 0.116557 +vt 0.923762 0.109699 +vt 0.162464 0.945359 +vt 0.161002 0.941265 +vt 0.185390 0.937171 +vt 0.185390 0.960405 +vt 0.161002 0.956311 +vt 0.162464 0.952217 +vt 0.188314 0.945359 +vt 0.158117 0.952217 +vt 0.158117 0.945359 +vt 0.255186 0.951558 +vt 0.256648 0.955652 +vt 0.232259 0.959746 +vt 0.795834 0.547415 +vt 0.830124 0.547415 +vt 0.232260 0.936512 +vt 0.256648 0.940606 +vt 0.255186 0.944700 +vt 0.229335 0.944700 +vt 0.259533 0.944700 +vt 0.259533 0.951558 +vt 0.907387 0.955893 +vt 0.911481 0.954430 +vt 0.915575 0.978819 +vt 0.892341 0.978819 +vt 0.896435 0.954430 +vt 0.900529 0.955893 +vt 0.907387 0.981743 +vt 0.900529 0.951545 +vt 0.907387 0.951545 +vt 0.949224 0.035551 +vt 0.950687 0.039645 +vt 0.926298 0.043739 +vt 0.926298 0.020505 +vt 0.950687 0.024599 +vt 0.949224 0.028693 +vt 0.923374 0.028693 +vt 0.953572 0.028693 +vt 0.953572 0.035551 +vt 0.896897 0.896055 +vt 0.895435 0.891961 +vt 0.919824 0.887867 +vt 0.919824 0.911101 +vt 0.895435 0.907007 +vt 0.896897 0.902913 +vt 0.922748 0.896055 +vt 0.892550 0.902913 +vt 0.895977 0.663020 +vt 0.894514 0.658926 +vt 0.918903 0.654832 +vt 0.918903 0.678066 +vt 0.894514 0.673972 +vt 0.895977 0.669878 +vt 0.921827 0.663020 +vt 0.891629 0.669878 +vt 0.891629 0.663020 +vt 0.024465 0.950581 +vt 0.020118 0.950581 +vt 0.020118 0.943723 +vt 0.050315 0.950581 +vt 0.024465 0.943723 +vt 0.047391 0.958769 +vt 0.023003 0.954675 +vt 0.023003 0.939629 +vt 0.047391 0.935535 +vt 0.908225 0.573265 +vt 0.908225 0.577613 +vt 0.901367 0.577613 +vt 0.901367 0.573265 +vt 0.901367 0.547415 +vt 0.916413 0.550339 +vt 0.912319 0.574728 +vt 0.897273 0.574728 +vt 0.893179 0.550339 +vt 0.968594 0.574816 +vt 0.968594 0.579163 +vt 0.961736 0.579163 +vt 0.968594 0.548965 +vt 0.961736 0.574816 +vt 0.976782 0.551889 +vt 0.972688 0.576278 +vt 0.957642 0.576278 +vt 0.953548 0.551889 +vt 0.914856 0.809963 +vt 0.919204 0.809963 +vt 0.919204 0.816821 +vt 0.914856 0.816821 +vt 0.889006 0.816821 +vt 0.891930 0.801775 +vt 0.916319 0.805869 +vt 0.916319 0.820915 +vt 0.891930 0.825009 +vt 0.557214 0.894864 +vt 0.561561 0.894864 +vt 0.561561 0.901723 +vt 0.557214 0.901723 +vt 0.531363 0.901723 +vt 0.534287 0.886677 +vt 0.558676 0.890771 +vt 0.558676 0.905817 +vt 0.534287 0.909911 +vt 0.903238 0.723036 +vt 0.903238 0.718688 +vt 0.910097 0.718688 +vt 0.903238 0.748886 +vt 0.910097 0.723036 +vt 0.895051 0.745962 +vt 0.899145 0.721574 +vt 0.914191 0.721574 +vt 0.918285 0.745962 +vt 0.116401 0.943723 +vt 0.120748 0.943723 +vt 0.120748 0.950581 +vt 0.116401 0.950581 +vt 0.090550 0.950581 +vt 0.093475 0.935535 +vt 0.117863 0.939629 +vt 0.117863 0.954675 +vt 0.093475 0.958769 +vt 0.309225 0.939882 +vt 0.309225 0.935535 +vt 0.316083 0.935535 +vt 0.309225 0.965733 +vt 0.316083 0.939882 +vt 0.301037 0.962809 +vt 0.305131 0.938420 +vt 0.320177 0.938420 +vt 0.324271 0.962809 +vt 0.934169 0.229504 +vt 0.934169 0.233852 +vt 0.927311 0.233852 +vt 0.927311 0.229504 +vt 0.927311 0.203654 +vt 0.942357 0.206578 +vt 0.938263 0.230966 +vt 0.923217 0.230966 +vt 0.919123 0.206578 +vt 0.825950 0.801775 +vt 0.825950 0.810469 +vt 0.795833 0.640971 +vt 0.830124 0.640971 +vt 0.830124 0.632277 +vt 0.826878 0.890825 +vt 0.754378 0.498466 +vt 0.671492 0.846401 +vt 0.671492 0.837707 +vt 0.705783 0.837707 +vt 0.844485 0.832410 +vt 0.878569 0.395099 +vt 0.822079 0.898076 +vt 0.797386 0.898076 +vt 0.777299 0.662912 +vt 0.759177 0.491216 +vt 0.783870 0.491216 +vt 0.724318 0.815766 +vt 0.652958 0.815766 +vt 0.671860 0.911269 +vt 0.802085 0.300562 +vt 0.696553 0.911269 +vt 0.873445 0.300563 +vt 0.412624 0.815766 +vt 0.881234 0.492616 +vt 0.905927 0.492616 +vt 0.483984 0.815766 +vt 0.848659 0.662912 +vt 0.674495 0.344587 +vt 0.634309 0.020148 +vt 0.691933 0.020118 +vt 0.586800 0.617746 +vt 0.408338 0.674595 +vt 0.408338 0.547415 +vt 0.547315 0.202485 +vt 0.674495 0.202485 +vt 0.761489 0.162220 +vt 0.727352 0.674595 +vt 0.550440 0.674595 +vt 0.728902 0.548190 +vt 0.761440 0.344587 +vt 0.585249 0.761540 +vt 0.172682 0.600439 +vt 0.078717 0.763193 +vt 0.288096 0.800252 +vt 0.020068 0.089759 +vt 0.767862 0.919608 +vt 0.813394 0.469684 +vt 0.877731 0.245865 +vt 0.524629 0.801775 +vt 0.408338 0.761540 +vt 0.729653 0.384823 +vt 0.408338 0.801775 +vt 0.797799 0.286572 +vt 0.848771 0.846401 +vt 0.852944 0.676903 +vt 0.852944 0.592042 +vt 0.648672 0.801775 +vt 0.849045 0.416631 +vt 0.416331 0.809148 +vt 0.799399 0.055802 +vt 0.406787 0.919220 +vt 0.935451 0.471084 +vt 0.883914 0.092936 +vt 0.726077 0.889737 +vt 0.856753 0.717138 +vt 0.820620 0.205585 +vt 0.854910 0.331198 +vt 0.559701 0.958558 +vt 0.465449 0.846401 +vt 0.949327 0.287976 +vt 0.953959 0.109699 +vt 0.581741 0.846401 +vt 0.188314 0.952218 +vt 0.229335 0.951558 +vt 0.900529 0.981743 +vt 0.923374 0.035551 +vt 0.922748 0.902913 +vt 0.892550 0.896055 +vt 0.921827 0.669878 +vt 0.050315 0.943723 +vt 0.908225 0.547415 +vt 0.961736 0.548965 +vt 0.889006 0.809963 +vt 0.531363 0.894864 +vt 0.910097 0.748886 +vt 0.090550 0.943723 +vt 0.316083 0.965733 +vt 0.934169 0.203654 +vt 0.791660 0.801775 +vt 0.795833 0.632277 +vt 0.705783 0.846401 +vn 0.000000 0.173600 -0.984800 +vn 0.000000 0.766000 -0.642800 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.766000 0.642800 +vn -0.000000 -0.939700 -0.342000 +vn -0.000000 -0.500000 -0.866000 +vn -0.000000 0.173600 0.984800 +vn 0.000000 -0.500000 0.866000 +vn 0.000000 -0.939700 0.342000 +vn 0.000000 0.939700 -0.342000 +vn 0.000000 0.522300 0.852800 +vn 0.000000 -0.148100 -0.989000 +vn 0.000000 0.500000 -0.866000 +vn 0.000000 0.948200 0.317600 +vn 0.000000 -0.749100 -0.662400 +vn 0.000000 -0.173600 -0.984800 +vn 0.000000 0.930500 -0.366200 +vn 0.000000 -0.999700 -0.025900 +vn 0.000000 -0.766000 -0.642800 +vn 0.000000 0.477400 -0.878700 +vn 0.000000 -0.782400 0.622700 +vn 0.000000 -1.000000 0.000000 +vn -0.000000 -0.199100 -0.980000 +vn 0.000000 -0.199100 0.980000 +vn 0.000000 -0.766000 0.642800 +vn -0.000000 -0.782400 -0.622700 +vn 0.000000 0.477400 0.878700 +vn 0.000000 -0.173600 0.984800 +vn 0.000000 -0.999700 0.025900 +vn -0.000000 0.930500 0.366200 +vn 0.000000 0.500000 0.866000 +vn 0.000000 -0.749100 0.662400 +vn 0.000000 0.948200 -0.317600 +vn 0.000000 0.939700 0.342000 +vn 0.000000 -0.148100 0.989000 +vn 0.000000 0.522300 -0.852800 +vn 1.000000 -0.000000 -0.000000 +vn -1.000000 -0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.908400 0.238500 0.343500 +vn 0.857500 0.082800 0.507700 +vn 0.908400 -0.038100 0.416400 +vn 0.000000 -0.477400 -0.878700 +vn 0.000000 0.782400 0.622700 +vn 0.000000 0.999700 -0.025900 +vn 0.000000 0.749100 -0.662400 +vn 0.000000 -0.930500 -0.366200 +vn 0.857500 0.389800 0.335700 +vn 0.908400 0.403500 0.109800 +vn 0.857500 0.514400 0.006600 +vn 0.908400 0.379700 -0.175200 +vn 0.857500 0.398300 -0.325600 +vn 0.908400 0.178200 -0.378300 +vn 0.857500 -0.481100 -0.182200 +vn 0.857500 0.095800 -0.505400 +vn 0.908400 -0.416700 0.034800 +vn 0.908400 -0.106600 -0.404300 +vn 0.857500 -0.485600 0.169700 +vn 0.857500 -0.251500 -0.448800 +vn 0.908400 -0.296800 0.294500 +vn 0.908400 -0.341600 -0.241200 +vn 0.857500 -0.262900 0.442200 +vn 0.000000 0.148100 -0.989000 +vn 0.000000 -0.948200 0.317600 +vn 0.000000 -0.522300 0.852800 +vn 0.000000 -0.522300 -0.852800 +vn 0.000000 -0.342000 0.939700 +vn 0.000000 0.342000 -0.939700 +vn 0.941700 0.316100 0.115000 +vn 0.000000 -0.866000 0.500000 +vn 0.000000 0.866000 -0.500000 +vn 0.941700 0.168200 0.291300 +vn 0.000000 0.984800 -0.173600 +vn 0.000000 -0.984800 0.173600 +vn 0.941700 -0.058400 -0.331200 +vn 0.000000 0.866000 0.500000 +vn 0.000000 -0.866000 -0.500000 +vn 0.941700 0.168200 -0.291300 +vn 0.000000 0.342000 0.939700 +vn 0.000000 -0.342000 -0.939700 +vn 0.941700 0.316100 -0.115000 +vn 0.941700 -0.257600 -0.216200 +vn 0.000000 -0.642800 0.766000 +vn 0.000000 0.642800 -0.766000 +vn 0.941700 -0.336300 0.000000 +vn 0.941700 -0.257600 0.216200 +vn 0.000000 0.642800 0.766000 +vn 0.000000 -0.642800 -0.766000 +vn 0.941700 -0.058400 0.331200 +vn 0.000000 0.984800 0.173600 +vn 0.000000 -0.984800 -0.173600 +vn 0.000000 0.199100 -0.980000 +vn 0.000000 0.199100 0.980000 +vn 0.000000 0.782400 -0.622700 +vn 0.000000 -0.477400 0.878700 +vn 0.000000 0.999700 0.025900 +vn 0.000000 -0.930500 0.366200 +vn 0.000000 0.749100 0.662400 +vn 0.000000 -0.948200 -0.317600 +vn 0.000000 0.148100 0.989000 +vn 0.857500 0.514400 -0.006600 +vn 0.908400 0.379700 0.175200 +vn 0.857500 0.398300 0.325600 +vn 0.908400 0.403500 -0.109800 +vn 0.857500 0.389800 -0.335700 +vn 0.908400 0.238500 -0.343500 +vn 0.857500 0.082800 -0.507700 +vn 0.908400 -0.038100 -0.416400 +vn 0.857500 -0.262900 -0.442200 +vn 0.908400 -0.341600 0.241200 +vn 0.908400 -0.296800 -0.294500 +vn 0.857500 -0.251500 0.448800 +vn 0.857500 -0.485600 -0.169700 +vn 0.908400 -0.106600 0.404300 +vn 0.908400 -0.416700 -0.034800 +vn 0.857500 0.095800 0.505400 +vn 0.857500 -0.481100 0.182200 +vn 0.908400 0.178200 0.378300 +s off +f 17/1/1 18/2/1 16/3/1 +f 13/4/2 14/5/2 12/6/2 +f 10/7/3 44/8/3 43/9/3 +f 42/10/4 40/11/4 39/12/4 +f 23/13/5 25/14/5 26/15/5 +f 19/16/6 21/17/6 22/18/6 +f 35/19/7 37/20/7 38/21/7 +f 33/22/8 34/23/8 32/24/8 +f 29/25/9 30/26/9 28/27/9 +f 48/28/10 47/29/10 46/30/10 +f 10/7/11 9/31/11 45/32/11 +f 12/33/12 47/29/12 48/28/12 +f 52/34/13 51/35/13 50/36/13 +f 14/5/14 13/4/14 49/37/14 +f 15/38/15 16/39/15 51/35/15 +f 53/40/16 56/41/16 55/42/16 +f 17/1/17 53/40/17 54/43/17 +f 20/44/18 55/42/18 56/41/18 +f 60/45/19 59/46/19 58/47/19 +f 21/17/20 57/48/20 58/47/20 +f 24/49/21 59/46/21 60/45/21 +f 61/50/22 64/51/22 63/52/22 +f 25/14/23 61/50/23 62/53/23 +f 28/54/24 63/52/24 64/51/24 +f 65/55/25 68/56/25 67/57/25 +f 29/25/26 65/55/26 66/58/26 +f 31/59/27 32/60/27 67/57/27 +f 72/61/28 71/62/28 70/63/28 +f 33/22/29 69/64/29 70/63/29 +f 36/65/30 71/62/30 72/61/30 +f 76/66/31 75/67/31 74/68/31 +f 37/20/32 73/69/32 74/68/32 +f 40/70/33 75/67/33 76/66/33 +f 77/71/34 80/72/34 79/73/34 +f 41/74/35 77/71/35 78/75/35 +f 43/76/36 44/77/36 79/73/36 +f 62/78/37 63/79/37 3/80/37 +f 54/81/37 55/82/37 1/83/37 +f 1/83/37 59/84/37 62/78/37 +f 58/85/37 59/84/37 1/83/37 +f 3/80/37 63/79/37 66/86/37 +f 3/80/37 67/87/37 70/88/37 +f 16/3/1 18/2/1 82/89/1 +f 30/26/26 66/58/26 109/90/26 +f 24/49/21 89/91/21 106/92/21 +f 66/86/37 67/87/37 3/80/37 +f 44/77/36 86/93/36 116/94/36 +f 1/83/37 2/95/37 54/81/37 +f 70/88/37 71/96/37 3/80/37 +f 3/80/37 71/96/37 4/97/37 +f 22/18/20 58/47/20 105/98/20 +f 42/10/35 78/75/35 115/99/35 +f 16/39/15 81/100/15 102/101/15 +f 24/102/5 26/15/5 90/103/5 +f 36/65/30 93/104/30 112/105/30 +f 54/81/37 2/95/37 51/106/37 +f 51/106/37 2/95/37 50/107/37 +f 50/107/37 2/95/37 47/108/37 +f 46/109/37 47/108/37 2/95/37 +f 71/96/37 74/110/37 4/97/37 +f 74/110/37 75/111/37 4/97/37 +f 78/112/37 4/97/37 75/111/37 +f 78/112/37 79/113/37 4/97/37 +f 4/97/37 79/113/37 46/109/37 +f 80/114/38 45/115/38 9/116/38 +f 41/117/38 39/118/38 76/119/38 +f 37/120/38 35/121/38 72/122/38 +f 8/123/38 6/124/38 45/115/38 +f 80/114/38 77/125/38 8/123/38 +f 77/125/38 76/119/38 8/123/38 +f 76/119/38 73/126/38 8/123/38 +f 73/126/38 72/122/38 8/123/38 +f 8/123/38 72/122/38 7/127/38 +f 72/122/38 69/128/38 7/127/38 +f 68/129/38 69/128/38 31/130/38 +f 68/129/38 65/131/38 7/127/38 +f 29/132/38 27/133/38 65/131/38 +f 65/131/38 27/133/38 7/127/38 +f 27/133/38 64/134/38 7/127/38 +f 7/127/38 64/134/38 61/135/38 +f 61/135/38 25/136/38 5/137/38 +f 25/136/38 23/138/38 60/139/38 +f 5/137/38 25/136/38 60/139/38 +f 60/139/38 57/140/38 5/137/38 +f 56/141/38 57/140/38 19/142/38 +f 56/141/38 53/143/38 5/137/38 +f 5/137/38 53/143/38 6/124/38 +f 45/115/38 6/124/38 48/144/38 +f 13/145/38 11/146/38 48/144/38 +f 17/147/38 15/148/38 52/149/38 +f 53/143/38 52/149/38 6/124/38 +f 52/149/38 49/150/38 6/124/38 +f 6/124/38 49/150/38 48/144/38 +f 2/95/39 1/83/39 5/151/39 +f 3/80/3 7/152/3 5/153/3 +f 4/97/40 8/154/40 7/155/40 +f 2/95/22 6/156/22 8/157/22 +f 1/83/37 55/82/37 58/85/37 +f 89/158/41 125/159/41 142/160/41 +f 104/161/37 140/162/37 141/163/37 +f 92/164/42 105/165/42 141/166/42 +f 106/167/37 142/168/37 143/169/37 +f 91/170/43 127/171/43 140/172/43 +f 108/173/37 144/174/37 145/175/37 +f 10/7/11 46/30/11 99/176/11 +f 22/18/6 92/177/6 91/178/6 +f 32/60/27 95/179/27 110/180/27 +f 14/5/2 84/181/2 83/182/2 +f 12/33/12 83/183/12 100/184/12 +f 38/21/7 94/185/7 93/186/7 +f 38/21/32 74/68/32 113/187/32 +f 74/188/16 71/189/16 112/190/16 +f 18/2/17 54/43/17 103/191/17 +f 75/192/19 114/193/19 115/194/19 +f 10/7/3 85/195/3 86/196/3 +f 40/70/33 87/197/33 114/198/33 +f 32/24/8 34/23/8 96/199/8 +f 79/200/22 116/201/22 99/202/22 +f 20/44/18 91/203/18 104/204/18 +f 26/15/23 62/53/23 107/205/23 +f 47/206/25 100/207/25 101/208/25 +f 51/209/28 102/210/28 103/211/28 +f 63/212/10 108/173/10 109/213/10 +f 28/54/24 97/214/24 108/215/24 +f 34/23/29 70/63/29 111/216/29 +f 42/10/4 88/217/4 87/218/4 +f 59/219/34 106/167/34 107/220/34 +f 14/5/14 50/36/14 101/221/14 +f 67/222/13 110/223/13 111/224/13 +f 30/26/9 98/225/9 97/226/9 +f 55/227/31 104/161/31 105/228/31 +f 146/229/44 131/230/44 167/231/44 +f 134/232/45 145/233/45 170/234/45 +f 147/235/46 168/236/46 132/237/46 +f 167/238/27 182/239/27 146/240/27 +f 165/241/30 184/242/30 148/243/30 +f 168/244/29 147/245/29 183/246/29 +f 130/247/47 149/248/47 166/249/47 +f 148/250/48 129/251/48 165/252/48 +f 185/253/32 166/254/32 149/255/32 +f 112/190/37 148/256/37 149/257/37 +f 90/258/49 107/259/49 143/260/49 +f 114/193/37 150/261/37 151/262/37 +f 97/263/50 133/264/50 144/265/50 +f 116/201/37 152/266/37 135/267/37 +f 98/268/51 109/269/51 145/233/51 +f 101/208/37 100/207/37 136/270/37 +f 95/271/52 131/230/52 146/229/52 +f 102/210/37 138/272/37 139/273/37 +f 96/274/53 111/275/53 147/235/53 +f 110/223/37 146/276/37 147/277/37 +f 93/278/54 129/251/54 148/250/54 +f 85/279/55 99/280/55 135/281/55 +f 94/282/56 113/283/56 149/248/56 +f 83/284/57 119/285/57 136/286/57 +f 87/287/58 123/288/58 150/289/58 +f 84/290/59 101/291/59 137/292/59 +f 88/293/60 115/294/60 151/295/60 +f 81/296/61 117/297/61 138/298/61 +f 86/299/62 122/300/62 152/301/62 +f 82/302/63 103/303/63 139/304/63 +f 134/232/37 133/264/37 97/263/37 +f 180/305/24 144/306/24 169/307/24 +f 144/174/10 180/305/10 181/308/10 +f 159/309/33 186/310/33 150/311/33 +f 142/168/34 178/312/34 179/313/34 +f 124/314/64 151/295/64 160/315/64 +f 130/316/16 166/254/16 165/241/16 +f 140/162/31 176/317/31 177/318/31 +f 150/289/65 123/288/65 159/319/65 +f 148/256/16 184/242/16 185/253/16 +f 187/320/35 160/321/35 151/322/35 +f 150/261/19 186/310/19 187/320/19 +f 158/323/36 188/324/36 152/325/36 +f 152/266/22 188/324/22 171/326/22 +f 152/301/66 122/300/66 158/327/66 +f 136/270/25 172/328/25 173/329/25 +f 121/330/67 135/281/67 157/331/67 +f 138/272/28 174/332/28 175/333/28 +f 171/326/11 157/334/11 135/335/11 +f 146/276/13 182/239/13 183/246/13 +f 118/336/28 154/337/28 153/338/28 +f 293/339/68 296/340/68 241/341/68 +f 153/338/37 154/337/37 175/333/37 +f 242/342/69 295/343/69 294/344/69 +f 172/328/37 155/345/37 156/346/37 +f 206/347/70 294/344/70 293/339/70 +f 118/348/37 117/297/37 81/296/37 +f 294/344/34 295/349/34 296/350/34 +f 120/351/25 156/346/25 155/345/25 +f 289/352/71 292/353/71 247/354/71 +f 84/290/37 120/355/37 119/285/37 +f 248/356/72 291/357/72 290/358/72 +f 85/279/37 121/330/37 122/300/37 +f 290/358/73 289/352/73 211/359/73 +f 188/324/37 158/323/37 157/334/37 +f 290/358/31 291/360/31 292/361/31 +f 159/309/37 160/321/37 187/320/37 +f 285/362/71 288/363/71 245/364/71 +f 158/323/22 122/365/22 121/366/22 +f 246/367/72 287/368/72 286/369/72 +f 124/314/37 123/288/37 87/287/37 +f 210/370/73 286/369/73 285/362/73 +f 124/371/19 160/321/19 159/309/19 +f 286/369/31 287/372/31 288/373/31 +f 281/374/74 284/375/74 251/376/74 +f 94/282/37 130/247/37 129/251/37 +f 252/377/75 283/378/75 282/379/75 +f 96/274/37 132/237/37 131/230/37 +f 282/379/76 281/374/76 215/380/76 +f 184/242/37 165/241/37 166/254/37 +f 282/379/16 283/381/16 284/382/16 +f 167/238/37 168/244/37 183/246/37 +f 277/383/74 280/384/74 249/385/74 +f 167/238/13 131/386/13 132/387/13 +f 250/388/75 279/389/75 278/390/75 +f 214/391/76 278/390/76 277/383/76 +f 278/390/16 279/392/16 280/393/16 +f 273/394/77 276/395/77 255/396/77 +f 256/397/78 275/398/78 274/399/78 +f 274/399/79 273/394/79 219/400/79 +f 274/399/13 275/401/13 276/402/13 +f 269/403/77 272/404/77 253/405/77 +f 254/406/78 271/407/78 270/408/78 +f 218/409/79 270/408/79 269/403/79 +f 270/408/13 271/410/13 272/411/13 +f 265/412/80 268/413/80 259/414/80 +f 260/415/81 267/416/81 266/417/81 +f 266/417/82 265/412/82 223/418/82 +f 265/412/10 266/417/10 267/419/10 +f 261/420/80 264/421/80 257/422/80 +f 258/423/81 263/424/81 262/425/81 +f 262/425/82 261/420/82 221/426/82 +f 262/425/10 263/427/10 264/428/10 +f 298/429/34 299/430/34 300/431/34 +f 208/432/70 298/429/70 297/433/70 +f 244/434/69 299/435/69 298/429/69 +f 297/433/68 300/436/68 243/437/68 +f 302/438/19 303/439/19 304/440/19 +f 302/438/83 301/441/83 201/442/83 +f 238/443/84 303/444/84 302/438/84 +f 301/441/85 304/445/85 237/446/85 +f 306/447/19 307/448/19 308/449/19 +f 204/450/83 306/447/83 305/451/83 +f 240/452/84 307/453/84 306/447/84 +f 305/451/85 308/454/85 239/455/85 +f 310/456/22 311/457/22 312/458/22 +f 310/456/86 309/459/86 200/460/86 +f 235/461/39 311/462/39 310/456/39 +f 309/459/40 312/463/40 236/464/40 +f 314/465/22 315/466/22 316/467/22 +f 314/465/86 313/468/86 198/469/86 +f 233/470/39 315/471/39 314/465/39 +f 313/468/40 316/472/40 234/473/40 +f 318/474/25 319/475/25 320/476/25 +f 194/477/87 318/474/87 317/478/87 +f 230/479/88 319/480/88 318/474/88 +f 317/478/89 320/481/89 229/482/89 +f 322/483/25 323/484/25 324/485/25 +f 322/483/87 321/486/87 195/487/87 +f 232/488/88 323/489/88 322/483/88 +f 321/486/89 324/490/89 231/491/89 +f 326/492/28 327/493/28 328/494/28 +f 190/495/90 326/492/90 325/496/90 +f 226/497/91 327/498/91 326/492/91 +f 325/496/92 328/499/92 225/500/92 +f 330/501/28 331/502/28 332/503/28 +f 330/501/90 329/504/90 191/505/90 +f 228/506/91 331/507/91 330/501/91 +f 329/504/92 332/508/92 227/509/92 +f 134/510/10 170/511/10 169/307/10 +f 169/307/37 170/511/37 181/308/37 +f 161/512/37 162/513/37 179/313/37 +f 126/514/34 162/513/34 161/512/34 +f 90/258/37 126/515/37 125/159/37 +f 128/516/37 127/171/37 91/170/37 +f 128/517/31 164/518/31 163/519/31 +f 163/519/37 164/518/37 177/318/37 +f 170/511/26 145/520/26 181/308/26 +f 144/265/93 133/264/93 169/521/93 +f 126/515/94 143/260/94 162/522/94 +f 142/160/95 125/159/95 161/523/95 +f 161/512/21 178/312/21 142/524/21 +f 128/516/96 141/166/96 164/525/96 +f 140/172/97 127/171/97 163/526/97 +f 163/519/18 176/317/18 140/527/18 +f 164/518/20 141/528/20 177/318/20 +f 118/348/98 139/304/98 154/529/98 +f 154/337/17 139/530/17 175/333/17 +f 138/298/99 117/297/99 153/531/99 +f 153/338/15 174/332/15 138/532/15 +f 173/329/14 156/346/14 137/533/14 +f 120/355/100 137/292/100 156/534/100 +f 136/286/101 119/285/101 155/535/101 +f 155/345/12 172/328/12 136/536/12 +f 162/513/23 143/537/23 179/313/23 +f 15/538/1 17/1/1 16/3/1 +f 11/539/2 13/4/2 12/6/2 +f 9/31/3 10/7/3 43/9/3 +f 41/74/4 42/10/4 39/12/4 +f 24/102/5 23/13/5 26/15/5 +f 20/540/6 19/16/6 22/18/6 +f 36/541/7 35/19/7 38/21/7 +f 31/542/8 33/22/8 32/24/8 +f 27/543/9 29/25/9 28/27/9 +f 45/32/10 48/28/10 46/30/10 +f 46/30/11 10/7/11 45/32/11 +f 11/544/12 12/33/12 48/28/12 +f 49/37/13 52/34/13 50/36/13 +f 50/36/14 14/5/14 49/37/14 +f 52/34/15 15/38/15 51/35/15 +f 54/43/16 53/40/16 55/42/16 +f 18/2/17 17/1/17 54/43/17 +f 19/545/18 20/44/18 56/41/18 +f 57/48/19 60/45/19 58/47/19 +f 22/18/20 21/17/20 58/47/20 +f 23/546/21 24/49/21 60/45/21 +f 62/53/22 61/50/22 63/52/22 +f 26/15/23 25/14/23 62/53/23 +f 27/547/24 28/54/24 64/51/24 +f 66/58/25 65/55/25 67/57/25 +f 30/26/26 29/25/26 66/58/26 +f 68/56/27 31/59/27 67/57/27 +f 69/64/28 72/61/28 70/63/28 +f 34/23/29 33/22/29 70/63/29 +f 35/548/30 36/65/30 72/61/30 +f 73/69/31 76/66/31 74/68/31 +f 38/21/32 37/20/32 74/68/32 +f 39/549/33 40/70/33 76/66/33 +f 78/75/34 77/71/34 79/73/34 +f 42/10/35 41/74/35 78/75/35 +f 80/72/36 43/76/36 79/73/36 +f 1/83/37 62/78/37 3/80/37 +f 81/550/1 16/3/1 82/89/1 +f 98/225/26 30/26/26 109/90/26 +f 59/46/21 24/49/21 106/92/21 +f 79/73/36 44/77/36 116/94/36 +f 92/177/20 22/18/20 105/98/20 +f 88/217/35 42/10/35 115/99/35 +f 51/35/15 16/39/15 102/101/15 +f 89/551/5 24/102/5 90/103/5 +f 71/62/30 36/65/30 112/105/30 +f 2/95/37 4/97/37 46/109/37 +f 43/552/38 80/114/38 9/116/38 +f 77/125/38 41/117/38 76/119/38 +f 73/126/38 37/120/38 72/122/38 +f 80/114/38 8/123/38 45/115/38 +f 33/553/38 31/130/38 69/128/38 +f 68/129/38 7/127/38 69/128/38 +f 5/137/38 7/127/38 61/135/38 +f 21/554/38 19/142/38 57/140/38 +f 56/141/38 5/137/38 57/140/38 +f 49/150/38 13/145/38 48/144/38 +f 53/143/38 17/147/38 52/149/38 +f 6/555/39 2/95/39 5/151/39 +f 1/83/3 3/80/3 5/153/3 +f 3/80/40 4/97/40 7/155/40 +f 4/97/22 2/95/22 8/157/22 +f 106/556/102 89/158/102 142/160/102 +f 105/228/37 104/161/37 141/163/37 +f 128/516/103 92/164/103 141/166/103 +f 107/220/37 106/167/37 143/169/37 +f 104/557/104 91/170/104 140/172/104 +f 109/213/37 108/173/37 145/175/37 +f 85/195/11 10/7/11 99/176/11 +f 20/540/6 22/18/6 91/178/6 +f 67/57/27 32/60/27 110/180/27 +f 12/6/2 14/5/2 83/182/2 +f 47/29/12 12/33/12 100/184/12 +f 36/541/7 38/21/7 93/186/7 +f 94/185/32 38/21/32 113/187/32 +f 113/558/16 74/188/16 112/190/16 +f 82/89/17 18/2/17 103/191/17 +f 78/559/19 75/192/19 115/194/19 +f 44/8/3 10/7/3 86/196/3 +f 75/67/33 40/70/33 114/198/33 +f 95/560/8 32/24/8 96/199/8 +f 46/561/22 79/200/22 99/202/22 +f 55/42/18 20/44/18 104/204/18 +f 90/103/23 26/15/23 107/205/23 +f 50/562/25 47/206/25 101/208/25 +f 54/563/28 51/209/28 103/211/28 +f 66/564/10 63/212/10 109/213/10 +f 63/52/24 28/54/24 108/215/24 +f 96/199/29 34/23/29 111/216/29 +f 40/11/4 42/10/4 87/218/4 +f 62/565/34 59/219/34 107/220/34 +f 84/181/14 14/5/14 101/221/14 +f 70/566/13 67/222/13 111/224/13 +f 28/27/9 30/26/9 97/226/9 +f 58/567/31 55/227/31 105/228/31 +f 113/558/37 112/190/37 149/257/37 +f 126/515/105 90/258/105 143/260/105 +f 115/194/37 114/193/37 151/262/37 +f 108/568/106 97/263/106 144/265/106 +f 99/202/37 116/201/37 135/267/37 +f 134/232/107 98/268/107 145/233/107 +f 137/569/37 101/208/37 136/270/37 +f 110/570/108 95/271/108 146/229/108 +f 103/211/37 102/210/37 139/273/37 +f 132/237/109 96/274/109 147/235/109 +f 111/224/37 110/223/37 147/277/37 +f 112/571/110 93/278/110 148/250/110 +f 121/330/111 85/279/111 135/281/111 +f 130/247/112 94/282/112 149/248/112 +f 100/572/113 83/284/113 136/286/113 +f 114/573/114 87/287/114 150/289/114 +f 120/355/115 84/290/115 137/292/115 +f 124/314/116 88/293/116 151/295/116 +f 102/574/117 81/296/117 138/298/117 +f 116/575/118 86/299/118 152/301/118 +f 118/348/119 82/302/119 139/304/119 +f 98/268/37 134/232/37 97/263/37 +f 145/175/10 144/174/10 181/308/10 +f 143/169/34 142/168/34 179/313/34 +f 129/576/16 130/316/16 165/241/16 +f 141/163/31 140/162/31 177/318/31 +f 149/257/16 148/256/16 185/253/16 +f 151/262/19 150/261/19 187/320/19 +f 135/267/22 152/266/22 171/326/22 +f 137/569/25 136/270/25 173/329/25 +f 139/273/28 138/272/28 175/333/28 +f 147/277/13 146/276/13 183/246/13 +f 117/577/28 118/336/28 153/338/28 +f 205/578/68 293/339/68 241/341/68 +f 174/332/37 153/338/37 175/333/37 +f 206/347/69 242/342/69 294/344/69 +f 173/329/37 172/328/37 156/346/37 +f 205/578/70 206/347/70 293/339/70 +f 82/302/37 118/348/37 81/296/37 +f 293/339/34 294/344/34 296/350/34 +f 119/579/25 120/351/25 155/345/25 +f 211/359/71 289/352/71 247/354/71 +f 83/284/37 84/290/37 119/285/37 +f 212/580/72 248/356/72 290/358/72 +f 86/299/37 85/279/37 122/300/37 +f 212/580/73 290/358/73 211/359/73 +f 171/326/37 188/324/37 157/334/37 +f 289/352/31 290/358/31 292/361/31 +f 186/310/37 159/309/37 187/320/37 +f 209/581/71 285/362/71 245/364/71 +f 157/334/22 158/323/22 121/366/22 +f 210/370/72 246/367/72 286/369/72 +f 88/293/37 124/314/37 87/287/37 +f 209/581/73 210/370/73 285/362/73 +f 123/582/19 124/371/19 159/309/19 +f 285/362/31 286/369/31 288/373/31 +f 215/380/74 281/374/74 251/376/74 +f 93/278/37 94/282/37 129/251/37 +f 216/583/75 252/377/75 282/379/75 +f 95/271/37 96/274/37 131/230/37 +f 216/583/76 282/379/76 215/380/76 +f 185/253/37 184/242/37 166/254/37 +f 281/374/16 282/379/16 284/382/16 +f 182/239/37 167/238/37 183/246/37 +f 213/584/74 277/383/74 249/385/74 +f 168/244/13 167/238/13 132/387/13 +f 214/391/75 250/388/75 278/390/75 +f 213/584/76 214/391/76 277/383/76 +f 277/383/16 278/390/16 280/393/16 +f 219/400/77 273/394/77 255/396/77 +f 220/585/78 256/397/78 274/399/78 +f 220/585/79 274/399/79 219/400/79 +f 273/394/13 274/399/13 276/402/13 +f 217/586/77 269/403/77 253/405/77 +f 218/409/78 254/406/78 270/408/78 +f 217/586/79 218/409/79 269/403/79 +f 269/403/13 270/408/13 272/411/13 +f 223/418/80 265/412/80 259/414/80 +f 224/587/81 260/415/81 266/417/81 +f 224/587/82 266/417/82 223/418/82 +f 268/588/10 265/412/10 267/419/10 +f 221/426/80 261/420/80 257/422/80 +f 222/589/81 258/423/81 262/425/81 +f 222/589/82 262/425/82 221/426/82 +f 261/420/10 262/425/10 264/428/10 +f 297/433/34 298/429/34 300/431/34 +f 207/590/70 208/432/70 297/433/70 +f 208/432/69 244/434/69 298/429/69 +f 207/590/68 297/433/68 243/437/68 +f 301/441/19 302/438/19 304/440/19 +f 202/591/83 302/438/83 201/442/83 +f 202/591/84 238/443/84 302/438/84 +f 201/442/85 301/441/85 237/446/85 +f 305/451/19 306/447/19 308/449/19 +f 203/592/83 204/450/83 305/451/83 +f 204/450/84 240/452/84 306/447/84 +f 203/592/85 305/451/85 239/455/85 +f 309/459/22 310/456/22 312/458/22 +f 199/593/86 310/456/86 200/460/86 +f 199/593/39 235/461/39 310/456/39 +f 200/460/40 309/459/40 236/464/40 +f 313/468/22 314/465/22 316/467/22 +f 197/594/86 314/465/86 198/469/86 +f 197/594/39 233/470/39 314/465/39 +f 198/469/40 313/468/40 234/473/40 +f 317/478/25 318/474/25 320/476/25 +f 193/595/87 194/477/87 317/478/87 +f 194/477/88 230/479/88 318/474/88 +f 193/595/89 317/478/89 229/482/89 +f 321/486/25 322/483/25 324/485/25 +f 196/596/87 322/483/87 195/487/87 +f 196/596/88 232/488/88 322/483/88 +f 195/487/89 321/486/89 231/491/89 +f 325/496/28 326/492/28 328/494/28 +f 189/597/90 190/495/90 325/496/90 +f 190/495/91 226/497/91 326/492/91 +f 189/597/92 325/496/92 225/500/92 +f 329/504/28 330/501/28 332/503/28 +f 192/598/90 330/501/90 191/505/90 +f 192/598/91 228/506/91 330/501/91 +f 191/505/92 329/504/92 227/509/92 +f 133/599/10 134/510/10 169/307/10 +f 180/305/37 169/307/37 181/308/37 +f 178/312/37 161/512/37 179/313/37 +f 125/600/34 126/514/34 161/512/34 +f 89/158/37 90/258/37 125/159/37 +f 92/164/37 128/516/37 91/170/37 +f 127/601/31 128/517/31 163/519/31 +f 176/317/37 163/519/37 177/318/37 diff --git a/assets/hbm/textures/blocks/brick_compound.png b/assets/hbm/textures/blocks/brick_compound.png new file mode 100644 index 000000000..a5be07db3 Binary files /dev/null and b/assets/hbm/textures/blocks/brick_compound.png differ diff --git a/assets/hbm/textures/blocks/vault_bg.png b/assets/hbm/textures/blocks/vault_bg.png new file mode 100644 index 000000000..b39ce7232 Binary files /dev/null and b/assets/hbm/textures/blocks/vault_bg.png differ diff --git a/assets/hbm/textures/items/ammo_9mm.png b/assets/hbm/textures/items/ammo_9mm.png index 1a4327e22..e09cffa6c 100644 Binary files a/assets/hbm/textures/items/ammo_9mm.png and b/assets/hbm/textures/items/ammo_9mm.png differ diff --git a/assets/hbm/textures/items/ammo_9mm_ap.png b/assets/hbm/textures/items/ammo_9mm_ap.png index b9704f58c..6ed83db36 100644 Binary files a/assets/hbm/textures/items/ammo_9mm_ap.png and b/assets/hbm/textures/items/ammo_9mm_ap.png differ diff --git a/assets/hbm/textures/items/ammo_9mm_du.png b/assets/hbm/textures/items/ammo_9mm_du.png index 03f636cee..7e91e2076 100644 Binary files a/assets/hbm/textures/items/ammo_9mm_du.png and b/assets/hbm/textures/items/ammo_9mm_du.png differ diff --git a/assets/hbm/textures/items/assembly_smg.png b/assets/hbm/textures/items/assembly_smg.png index 9580c6732..eb4610c78 100644 Binary files a/assets/hbm/textures/items/assembly_smg.png and b/assets/hbm/textures/items/assembly_smg.png differ diff --git a/assets/hbm/textures/models/BalefireCrashed.png b/assets/hbm/textures/models/BalefireCrashed.png index 9d0a2216f..e70a0a14f 100644 Binary files a/assets/hbm/textures/models/BalefireCrashed.png and b/assets/hbm/textures/models/BalefireCrashed.png differ diff --git a/assets/hbm/textures/models/missileDoomsday.png b/assets/hbm/textures/models/missileDoomsday.png index 083168766..7b1a258e2 100755 Binary files a/assets/hbm/textures/models/missileDoomsday.png and b/assets/hbm/textures/models/missileDoomsday.png differ diff --git a/assets/hbm/textures/models/missileNeon.png b/assets/hbm/textures/models/missileNeon.png new file mode 100644 index 000000000..63073be85 Binary files /dev/null and b/assets/hbm/textures/models/missileNeon.png differ diff --git a/assets/hbm/textures/models/vault_frame.png b/assets/hbm/textures/models/vault_frame.png index acf06d5d7..86622755c 100644 Binary files a/assets/hbm/textures/models/vault_frame.png and b/assets/hbm/textures/models/vault_frame.png differ diff --git a/assets/hbm/textures/models/vault_frame_old.png b/assets/hbm/textures/models/vault_frame_old.png new file mode 100644 index 000000000..acf06d5d7 Binary files /dev/null and b/assets/hbm/textures/models/vault_frame_old.png differ diff --git a/com/hbm/handler/BulletConfigFactory.java b/com/hbm/handler/BulletConfigFactory.java index 84d11830a..33bec3576 100644 --- a/com/hbm/handler/BulletConfigFactory.java +++ b/com/hbm/handler/BulletConfigFactory.java @@ -20,6 +20,8 @@ public class BulletConfigFactory { bullet.spread = 0.05F; bullet.dmgMin = 15; bullet.dmgMax = 17; + bullet.bulletsMin = 1; + bullet.bulletsMax = 1; bullet.gravity = 0D; bullet.maxAge = 100; bullet.doesRicochet = true; @@ -51,6 +53,8 @@ public class BulletConfigFactory { bullet.velocity = 5.0F; bullet.spread = 0.005F; + bullet.bulletsMin = 1; + bullet.bulletsMax = 1; bullet.gravity = 0D; bullet.maxAge = 100; bullet.doesRicochet = true; @@ -80,6 +84,8 @@ public class BulletConfigFactory { bullet.velocity = 5.0F; bullet.spread = 0.05F; + bullet.bulletsMin = 5; + bullet.bulletsMax = 8; bullet.gravity = 0D; bullet.maxAge = 100; bullet.doesRicochet = true; @@ -109,8 +115,8 @@ public class BulletConfigFactory { BulletConfiguration bullet = standardBulletConfig(); bullet.ammo = ModItems.gun_revolver_iron_ammo; - bullet.dmgMin = 5; - bullet.dmgMax = 10; + bullet.dmgMin = 2; + bullet.dmgMax = 4; return bullet; } @@ -120,8 +126,8 @@ public class BulletConfigFactory { BulletConfiguration bullet = standardBulletConfig(); bullet.ammo = ModItems.gun_revolver_ammo; - bullet.dmgMin = 10; - bullet.dmgMax = 20; + bullet.dmgMin = 3; + bullet.dmgMax = 5; return bullet; } @@ -131,8 +137,8 @@ public class BulletConfigFactory { BulletConfiguration bullet = standardBulletConfig(); bullet.ammo = ModItems.gun_revolver_lead_ammo; - bullet.dmgMin = 5; - bullet.dmgMax = 10; + bullet.dmgMin = 2; + bullet.dmgMax = 3; bullet.effects = new ArrayList(); bullet.effects.add(new PotionEffect(HbmPotion.radiation.id, 10 * 20, 4)); @@ -145,8 +151,8 @@ public class BulletConfigFactory { BulletConfiguration bullet = standardBulletConfig(); bullet.ammo = ModItems.gun_revolver_gold_ammo; - bullet.dmgMin = 20; - bullet.dmgMax = 25; + bullet.dmgMin = 10; + bullet.dmgMax = 15; return bullet; } @@ -168,8 +174,8 @@ public class BulletConfigFactory { BulletConfiguration bullet = standardBulletConfig(); bullet.ammo = ModItems.gun_revolver_cursed_ammo; - bullet.dmgMin = 25; - bullet.dmgMax = 35; + bullet.dmgMin = 12; + bullet.dmgMax = 15; return bullet; } @@ -180,7 +186,7 @@ public class BulletConfigFactory { bullet.ammo = ModItems.gun_revolver_nightmare_ammo; bullet.dmgMin = 1; - bullet.dmgMax = 100; + bullet.dmgMax = 50; return bullet; } diff --git a/com/hbm/handler/BulletConfigSyncingUtil.java b/com/hbm/handler/BulletConfigSyncingUtil.java index 022a77000..b364d0270 100644 --- a/com/hbm/handler/BulletConfigSyncingUtil.java +++ b/com/hbm/handler/BulletConfigSyncingUtil.java @@ -23,12 +23,16 @@ public class BulletConfigSyncingUtil { } } - /// dupicate ids will cause wrong configs to be loaded /// + /// 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 void loadConfigsForSync() { configSet.add(new ConfigKeyPair(BulletConfigFactory.getTestConfig(), TEST_CONFIG)); + configSet.add(new ConfigKeyPair(BulletConfigFactory.getRevIronConfig(), IRON_REVOLVER)); + configSet.add(new ConfigKeyPair(BulletConfigFactory.getRevSteelConfig(), STEEL_REVOLVER)); } public static BulletConfiguration pullConfig(int key) { @@ -41,5 +45,16 @@ public class BulletConfigSyncingUtil { return null;//configSet.get(TEST_CONFIG).config; } + + public static int getKey(BulletConfiguration config) { + + for(int i = 0; i < configSet.size(); i++) { + + if(configSet.get(i).config == config) + return configSet.get(i).key; + } + + return -1; + } } diff --git a/com/hbm/handler/BulletConfiguration.java b/com/hbm/handler/BulletConfiguration.java index 8ba73b2f0..0036a86b5 100644 --- a/com/hbm/handler/BulletConfiguration.java +++ b/com/hbm/handler/BulletConfiguration.java @@ -15,6 +15,10 @@ public class BulletConfiguration { public float spread; //weapon durability reduced (centered around 10) public float tear; + //greatest amount of pellets created each shot + public int bulletsMin; + //least amount of pellets created each shot + public int bulletsMax; //damage bounds public float dmgMin; diff --git a/com/hbm/handler/GunConfigFactory.java b/com/hbm/handler/GunConfigFactory.java index 3f56fe67e..25db8c665 100644 --- a/com/hbm/handler/GunConfigFactory.java +++ b/com/hbm/handler/GunConfigFactory.java @@ -10,23 +10,22 @@ public class GunConfigFactory { GunConfiguration config = new GunConfiguration(); - config.rateOfFire = 20; - config.bulletsMin = 1; - config.bulletsMax = 1; + config.rateOfFire = 10; config.gunMode = 0; - config.firingMode = 0; + config.firingMode = 1; config.hasReloadAnim = false; config.hasFiringAnim = false; config.hasSpinup = false; config.hasSpindown = false; - config.reloadDuration = 0; + config.reloadDuration = 10; config.firingDuration = 0; config.ammoCap = 6; config.reloadType = 1; config.allowsInfinity = true; - config.config = new ArrayList(); - config.config.add(BulletConfigFactory.getTestConfig()); + config.config = new ArrayList(); + config.config.add(BulletConfigSyncingUtil.STEEL_REVOLVER); + config.config.add(BulletConfigSyncingUtil.IRON_REVOLVER); return config; } diff --git a/com/hbm/handler/GunConfiguration.java b/com/hbm/handler/GunConfiguration.java index fec75b1d2..1fd9c59d9 100644 --- a/com/hbm/handler/GunConfiguration.java +++ b/com/hbm/handler/GunConfiguration.java @@ -12,14 +12,8 @@ public class GunConfiguration { * restrictions must be applied in gun's logic, mechanism may be dysfunctional if these rules are ignored */ - //TODO: bind RoF and spread to ammo - //amount of ticks between each bullet public int rateOfFire; - //greatest amount of pellets created each shot - public int bulletsMin; - //least amount of pellets created each shot - public int bulletsMax; //0 = normal, 1 = release, 2 = both public int gunMode; //0 = manual, 1 = automatic @@ -35,6 +29,7 @@ public class GunConfiguration { public boolean hasSpindown; //how long the reload animation will play + //MUST BE GREATER THAN ZERO ! ! ! public int reloadDuration; //duration of every animation cycle public int firingDuration; @@ -47,6 +42,6 @@ public class GunConfiguration { public boolean allowsInfinity; //bullet configs for main and alt fire - public List config; + public List config; } diff --git a/com/hbm/handler/nei/PressRecipeHandler.java b/com/hbm/handler/nei/PressRecipeHandler.java index 2bec5d550..60aa82e70 100644 --- a/com/hbm/handler/nei/PressRecipeHandler.java +++ b/com/hbm/handler/nei/PressRecipeHandler.java @@ -76,7 +76,7 @@ public class PressRecipeHandler extends TemplateRecipeHandler { @Override public String getRecipeName() { - return "Steam Press"; + return "Burner Press"; } @Override diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 466e1f064..883ce2eb8 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -1552,7 +1552,7 @@ public class ModItems { ingot_pu238 = new ItemRadioactive().setUnlocalizedName("ingot_pu238").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_pu238"); ingot_pu239 = new ItemRadioactive().setUnlocalizedName("ingot_pu239").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_pu239"); ingot_pu240 = new ItemRadioactive().setUnlocalizedName("ingot_pu240").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_pu240"); - ingot_neptunium = new ItemCustomLore().setUnlocalizedName("ingot_neptunium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_neptunium"); + ingot_neptunium = new ItemRadioactive().setUnlocalizedName("ingot_neptunium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_neptunium"); ingot_titanium = new Item().setUnlocalizedName("ingot_titanium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_titanium"); sulfur = new Item().setUnlocalizedName("sulfur").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":sulfur"); @@ -1580,8 +1580,8 @@ public class ModItems { plate_iron = new Item().setUnlocalizedName("plate_iron").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_iron"); ingot_lead = new Item().setUnlocalizedName("ingot_lead").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_lead"); plate_lead = new Item().setUnlocalizedName("plate_lead").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_lead"); - ingot_schrabidium = new ItemCustomLore().setUnlocalizedName("ingot_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_schrabidium"); - plate_schrabidium = new ItemCustomLore().setUnlocalizedName("plate_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_schrabidium"); + ingot_schrabidium = new ItemRadioactive().setUnlocalizedName("ingot_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_schrabidium"); + plate_schrabidium = new ItemRadioactive().setUnlocalizedName("plate_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_schrabidium"); plate_copper = new Item().setUnlocalizedName("plate_copper").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_copper"); plate_gold = new Item().setUnlocalizedName("plate_gold").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_gold"); plate_advanced_alloy = new Item().setUnlocalizedName("plate_advanced_alloy").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_advanced_alloy"); @@ -1604,8 +1604,8 @@ public class ModItems { plate_polymer = new Item().setUnlocalizedName("plate_polymer").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_polymer"); plate_dineutronium = new Item().setUnlocalizedName("plate_dineutronium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_dineutronium"); plate_desh = new Item().setUnlocalizedName("plate_desh").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_desh"); - ingot_solinium = new ItemCustomLore().setUnlocalizedName("ingot_solinium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_solinium"); - nugget_solinium = new ItemCustomLore().setUnlocalizedName("nugget_solinium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_solinium"); + ingot_solinium = new ItemRadioactive().setUnlocalizedName("ingot_solinium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_solinium"); + nugget_solinium = new ItemRadioactive().setUnlocalizedName("nugget_solinium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_solinium"); photo_panel = new Item().setUnlocalizedName("photo_panel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":photo_panel"); sat_base = new Item().setUnlocalizedName("sat_base").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":sat_base"); thruster_nuclear = new Item().setUnlocalizedName("thruster_nuclear").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":thruster_nuclear"); @@ -1655,7 +1655,7 @@ public class ModItems { wire_tungsten = new ItemCustomLore().setUnlocalizedName("wire_tungsten").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wire_tungsten"); neutron_reflector = new Item().setUnlocalizedName("neutron_reflector").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":neutron_reflector"); nugget_lead = new Item().setUnlocalizedName("nugget_lead").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_lead"); - nugget_schrabidium = new ItemCustomLore().setUnlocalizedName("nugget_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_schrabidium"); + nugget_schrabidium = new ItemRadioactive().setUnlocalizedName("nugget_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_schrabidium"); nugget_beryllium = new Item().setUnlocalizedName("nugget_beryllium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_beryllium"); hazmat_cloth = new Item().setUnlocalizedName("hazmat_cloth").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":hazmat_cloth"); hazmat_cloth_red = new Item().setUnlocalizedName("hazmat_cloth_red").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":hazmat_cloth_red"); @@ -1669,8 +1669,8 @@ public class ModItems { plate_combine_steel = new Item().setUnlocalizedName("plate_combine_steel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_combine_steel"); powder_lead = new Item().setUnlocalizedName("powder_lead").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_lead"); - powder_neptunium = new ItemCustomLore().setUnlocalizedName("powder_neptunium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_neptunium"); - powder_schrabidium = new ItemCustomLore().setUnlocalizedName("powder_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_schrabidium"); + powder_neptunium = new ItemRadioactive().setUnlocalizedName("powder_neptunium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_neptunium"); + powder_schrabidium = new ItemRadioactive().setUnlocalizedName("powder_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_schrabidium"); powder_aluminium = new Item().setUnlocalizedName("powder_aluminium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_aluminium"); powder_beryllium = new Item().setUnlocalizedName("powder_beryllium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_beryllium"); powder_copper = new Item().setUnlocalizedName("powder_copper").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_copper"); @@ -1760,7 +1760,7 @@ public class ModItems { wire_aluminium = new Item().setUnlocalizedName("wire_aluminium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wire_aluminium"); wire_copper = new Item().setUnlocalizedName("wire_copper").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wire_copper"); wire_gold = new Item().setUnlocalizedName("wire_gold").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wire_gold"); - wire_schrabidium = new ItemCustomLore().setUnlocalizedName("wire_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wire_schrabidium"); + wire_schrabidium = new ItemRadioactive().setUnlocalizedName("wire_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wire_schrabidium"); wire_magnetized_tungsten = new Item().setUnlocalizedName("wire_magnetized_tungsten").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wire_magnetized_tungsten"); coil_magnetized_tungsten = new Item().setUnlocalizedName("coil_magnetized_tungsten").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":coil_magnetized_tungsten"); coil_gold = new Item().setUnlocalizedName("coil_gold").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":coil_gold"); @@ -1893,8 +1893,8 @@ public class ModItems { wiring_red_copper = new ItemWiring().setUnlocalizedName("wiring_red_copper").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wiring_red_copper"); - pellet_rtg = new ItemCustomLore().setUnlocalizedName("pellet_rtg").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg"); - pellet_rtg_weak = new ItemCustomLore().setUnlocalizedName("pellet_rtg_weak").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_weak"); + pellet_rtg = new ItemRadioactive().setUnlocalizedName("pellet_rtg").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg"); + pellet_rtg_weak = new ItemRadioactive().setUnlocalizedName("pellet_rtg_weak").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_weak"); tritium_deuterium_cake = new ItemCustomLore().setUnlocalizedName("tritium_deuterium_cake").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":tritium_deuterium_cake"); piston_selenium = new Item().setUnlocalizedName("piston_selenium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":piston_selenium"); @@ -1932,7 +1932,7 @@ public class ModItems { cell_antimatter = new ItemDrop().setUnlocalizedName("cell_antimatter").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.cell_empty).setTextureName(RefStrings.MODID + ":cell_antimatter"); cell_deuterium = new Item().setUnlocalizedName("cell_deuterium").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.cell_empty).setTextureName(RefStrings.MODID + ":cell_deuterium"); cell_tritium = new ItemRadioactive().setUnlocalizedName("cell_tritium").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.cell_empty).setTextureName(RefStrings.MODID + ":cell_tritium"); - cell_sas3 = new ItemCustomLore().setUnlocalizedName("cell_sas3").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.cell_empty).setTextureName(RefStrings.MODID + ":cell_sas3"); + cell_sas3 = new ItemRadioactive().setUnlocalizedName("cell_sas3").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.cell_empty).setTextureName(RefStrings.MODID + ":cell_sas3"); cell_anti_schrabidium = new ItemDrop().setUnlocalizedName("cell_anti_schrabidium").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.cell_empty).setTextureName(RefStrings.MODID + ":cell_anti_schrabidium"); singularity = new ItemDrop().setUnlocalizedName("singularity").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.nuclear_waste).setTextureName(RefStrings.MODID + ":singularity"); singularity_counter_resonant = new ItemDrop().setUnlocalizedName("singularity_counter_resonant").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.nuclear_waste).setTextureName(RefStrings.MODID + ":singularity_alt"); @@ -2076,56 +2076,56 @@ public class ModItems { recycled_misc = new Item().setUnlocalizedName("recycled_misc").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":recycled_misc"); rod_empty = new Item().setUnlocalizedName("rod_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_empty"); - rod_th232 = new ItemCustomLore().setUnlocalizedName("rod_th232").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_th232"); - rod_uranium = new ItemCustomLore().setUnlocalizedName("rod_uranium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_uranium"); - rod_u233 = new ItemCustomLore().setUnlocalizedName("rod_u233").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_u233"); - rod_u235 = new ItemCustomLore().setUnlocalizedName("rod_u235").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_u235"); - rod_u238 = new ItemCustomLore().setUnlocalizedName("rod_u238").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_u238"); - rod_plutonium = new ItemCustomLore().setUnlocalizedName("rod_plutonium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_plutonium"); - rod_pu238 = new ItemCustomLore().setUnlocalizedName("rod_pu238").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_pu238"); - rod_pu239 = new ItemCustomLore().setUnlocalizedName("rod_pu239").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_pu239"); - rod_pu240 = new ItemCustomLore().setUnlocalizedName("rod_pu240").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_pu240"); - rod_neptunium = new ItemCustomLore().setUnlocalizedName("rod_neptunium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_neptunium"); + rod_th232 = new ItemRadioactive().setUnlocalizedName("rod_th232").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_th232"); + rod_uranium = new ItemRadioactive().setUnlocalizedName("rod_uranium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_uranium"); + rod_u233 = new ItemRadioactive().setUnlocalizedName("rod_u233").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_u233"); + rod_u235 = new ItemRadioactive().setUnlocalizedName("rod_u235").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_u235"); + rod_u238 = new ItemRadioactive().setUnlocalizedName("rod_u238").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_u238"); + rod_plutonium = new ItemRadioactive().setUnlocalizedName("rod_plutonium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_plutonium"); + rod_pu238 = new ItemRadioactive().setUnlocalizedName("rod_pu238").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_pu238"); + rod_pu239 = new ItemRadioactive().setUnlocalizedName("rod_pu239").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_pu239"); + rod_pu240 = new ItemRadioactive().setUnlocalizedName("rod_pu240").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_pu240"); + rod_neptunium = new ItemRadioactive().setUnlocalizedName("rod_neptunium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_neptunium"); rod_lead = new Item().setUnlocalizedName("rod_lead").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_lead"); - rod_schrabidium = new ItemCustomLore().setUnlocalizedName("rod_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_schrabidium"); - rod_solinium = new ItemCustomLore().setUnlocalizedName("rod_solinium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_solinium"); - rod_euphemium = new ItemCustomLore().setUnlocalizedName("rod_euphemium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_euphemium"); - rod_australium = new ItemCustomLore().setUnlocalizedName("rod_australium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_australium"); - rod_weidanium = new ItemCustomLore().setUnlocalizedName("rod_weidanium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_weidanium"); - rod_reiium = new ItemCustomLore().setUnlocalizedName("rod_reiium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_reiium"); - rod_unobtainium = new ItemCustomLore().setUnlocalizedName("rod_unobtainium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_unobtainium"); - rod_daffergon = new ItemCustomLore().setUnlocalizedName("rod_daffergon").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_daffergon"); - rod_verticium = new ItemCustomLore().setUnlocalizedName("rod_verticium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_verticium"); + rod_schrabidium = new ItemRadioactive().setUnlocalizedName("rod_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_schrabidium"); + rod_solinium = new ItemRadioactive().setUnlocalizedName("rod_solinium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_solinium"); + rod_euphemium = new ItemRadioactive().setUnlocalizedName("rod_euphemium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_euphemium"); + rod_australium = new ItemRadioactive().setUnlocalizedName("rod_australium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_australium"); + rod_weidanium = new ItemRadioactive().setUnlocalizedName("rod_weidanium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_weidanium"); + rod_reiium = new ItemRadioactive().setUnlocalizedName("rod_reiium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_reiium"); + rod_unobtainium = new ItemRadioactive().setUnlocalizedName("rod_unobtainium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_unobtainium"); + rod_daffergon = new ItemRadioactive().setUnlocalizedName("rod_daffergon").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_daffergon"); + rod_verticium = new ItemRadioactive().setUnlocalizedName("rod_verticium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_verticium"); rod_dual_empty = new Item().setUnlocalizedName("rod_dual_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_dual_empty"); - rod_dual_th232 = new ItemCustomLore().setUnlocalizedName("rod_dual_th232").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_th232"); - rod_dual_uranium = new ItemCustomLore().setUnlocalizedName("rod_dual_uranium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_uranium"); - rod_dual_u233 = new ItemCustomLore().setUnlocalizedName("rod_dual_u233").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_u233"); - rod_dual_u235 = new ItemCustomLore().setUnlocalizedName("rod_dual_u235").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_u235"); - rod_dual_u238 = new ItemCustomLore().setUnlocalizedName("rod_dual_u238").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_u238"); - rod_dual_plutonium = new ItemCustomLore().setUnlocalizedName("rod_dual_plutonium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_plutonium"); - rod_dual_pu238 = new ItemCustomLore().setUnlocalizedName("rod_dual_pu238").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_pu238"); - rod_dual_pu239 = new ItemCustomLore().setUnlocalizedName("rod_dual_pu239").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_pu239"); - rod_dual_pu240 = new ItemCustomLore().setUnlocalizedName("rod_dual_pu240").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_pu240"); - rod_dual_neptunium = new ItemCustomLore().setUnlocalizedName("rod_dual_neptunium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_neptunium"); + rod_dual_th232 = new ItemRadioactive().setUnlocalizedName("rod_dual_th232").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_th232"); + rod_dual_uranium = new ItemRadioactive().setUnlocalizedName("rod_dual_uranium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_uranium"); + rod_dual_u233 = new ItemRadioactive().setUnlocalizedName("rod_dual_u233").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_u233"); + rod_dual_u235 = new ItemRadioactive().setUnlocalizedName("rod_dual_u235").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_u235"); + rod_dual_u238 = new ItemRadioactive().setUnlocalizedName("rod_dual_u238").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_u238"); + rod_dual_plutonium = new ItemRadioactive().setUnlocalizedName("rod_dual_plutonium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_plutonium"); + rod_dual_pu238 = new ItemRadioactive().setUnlocalizedName("rod_dual_pu238").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_pu238"); + rod_dual_pu239 = new ItemRadioactive().setUnlocalizedName("rod_dual_pu239").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_pu239"); + rod_dual_pu240 = new ItemRadioactive().setUnlocalizedName("rod_dual_pu240").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_pu240"); + rod_dual_neptunium = new ItemRadioactive().setUnlocalizedName("rod_dual_neptunium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_neptunium"); rod_dual_lead = new Item().setUnlocalizedName("rod_dual_lead").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_lead"); - rod_dual_schrabidium = new ItemCustomLore().setUnlocalizedName("rod_dual_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_schrabidium"); - rod_dual_solinium = new ItemCustomLore().setUnlocalizedName("rod_dual_solinium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_solinium"); + rod_dual_schrabidium = new ItemRadioactive().setUnlocalizedName("rod_dual_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_schrabidium"); + rod_dual_solinium = new ItemRadioactive().setUnlocalizedName("rod_dual_solinium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_solinium"); rod_quad_empty = new Item().setUnlocalizedName("rod_quad_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_quad_empty"); - rod_quad_th232 = new ItemCustomLore().setUnlocalizedName("rod_quad_th232").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_th232"); - rod_quad_uranium = new ItemCustomLore().setUnlocalizedName("rod_quad_uranium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_uranium"); - rod_quad_u233 = new ItemCustomLore().setUnlocalizedName("rod_quad_u233").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_u233"); - rod_quad_u235 = new ItemCustomLore().setUnlocalizedName("rod_quad_u235").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_u235"); - rod_quad_u238 = new ItemCustomLore().setUnlocalizedName("rod_quad_u238").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_u238"); - rod_quad_plutonium = new ItemCustomLore().setUnlocalizedName("rod_quad_plutonium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_plutonium"); - rod_quad_pu238 = new ItemCustomLore().setUnlocalizedName("rod_quad_pu238").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_pu238"); - rod_quad_pu239 = new ItemCustomLore().setUnlocalizedName("rod_quad_pu239").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_pu239"); - rod_quad_pu240 = new ItemCustomLore().setUnlocalizedName("rod_quad_pu240").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_pu240"); - rod_quad_neptunium = new ItemCustomLore().setUnlocalizedName("rod_quad_neptunium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_neptunium"); + rod_quad_th232 = new ItemRadioactive().setUnlocalizedName("rod_quad_th232").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_th232"); + rod_quad_uranium = new ItemRadioactive().setUnlocalizedName("rod_quad_uranium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_uranium"); + rod_quad_u233 = new ItemRadioactive().setUnlocalizedName("rod_quad_u233").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_u233"); + rod_quad_u235 = new ItemRadioactive().setUnlocalizedName("rod_quad_u235").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_u235"); + rod_quad_u238 = new ItemRadioactive().setUnlocalizedName("rod_quad_u238").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_u238"); + rod_quad_plutonium = new ItemRadioactive().setUnlocalizedName("rod_quad_plutonium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_plutonium"); + rod_quad_pu238 = new ItemRadioactive().setUnlocalizedName("rod_quad_pu238").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_pu238"); + rod_quad_pu239 = new ItemRadioactive().setUnlocalizedName("rod_quad_pu239").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_pu239"); + rod_quad_pu240 = new ItemRadioactive().setUnlocalizedName("rod_quad_pu240").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_pu240"); + rod_quad_neptunium = new ItemRadioactive().setUnlocalizedName("rod_quad_neptunium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_neptunium"); rod_quad_lead = new Item().setUnlocalizedName("rod_quad_lead").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_lead"); - rod_quad_schrabidium = new ItemCustomLore().setUnlocalizedName("rod_quad_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_schrabidium"); - rod_quad_solinium = new ItemCustomLore().setUnlocalizedName("rod_quad_solinium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_solinium"); + rod_quad_schrabidium = new ItemRadioactive().setUnlocalizedName("rod_quad_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_schrabidium"); + rod_quad_solinium = new ItemRadioactive().setUnlocalizedName("rod_quad_solinium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_solinium"); rod_thorium_fuel = new ItemFuelRod(100000, 10).setUnlocalizedName("rod_thorium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_thorium_fuel"); rod_dual_thorium_fuel = new ItemFuelRod(100000, 20).setUnlocalizedName("rod_dual_thorium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_thorium_fuel"); @@ -2155,43 +2155,43 @@ public class ModItems { rod_dual_lithium = new ItemCustomLore().setUnlocalizedName("rod_dual_lithium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_lithium"); rod_quad_lithium = new ItemCustomLore().setUnlocalizedName("rod_quad_lithium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_lithium"); - rod_tritium = new ItemCustomLore().setUnlocalizedName("rod_tritium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_tritium"); - rod_dual_tritium = new ItemCustomLore().setUnlocalizedName("rod_dual_tritium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_tritium"); - rod_quad_tritium = new ItemCustomLore().setUnlocalizedName("rod_quad_tritium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_tritium"); + rod_tritium = new ItemRadioactive().setUnlocalizedName("rod_tritium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_tritium"); + rod_dual_tritium = new ItemRadioactive().setUnlocalizedName("rod_dual_tritium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_tritium"); + rod_quad_tritium = new ItemRadioactive().setUnlocalizedName("rod_quad_tritium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_tritium"); - trinitite = new ItemCustomLore().setUnlocalizedName("trinitite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":trinitite_new"); - nuclear_waste = new ItemCustomLore().setUnlocalizedName("nuclear_waste").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste"); - nuclear_waste_tiny = new ItemCustomLore().setUnlocalizedName("nuclear_waste_tiny").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_tiny"); - waste_uranium = new ItemCustomLore().setUnlocalizedName("waste_uranium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_uranium"); - waste_thorium = new ItemCustomLore().setUnlocalizedName("waste_thorium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_thorium"); - waste_plutonium = new ItemCustomLore().setUnlocalizedName("waste_plutonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_plutonium"); - waste_mox = new ItemCustomLore().setUnlocalizedName("waste_mox").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_mox"); - waste_schrabidium = new ItemCustomLore().setUnlocalizedName("waste_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_schrabidium"); - waste_uranium_hot = new ItemCustomLore().setUnlocalizedName("waste_uranium_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_uranium_hot"); - waste_thorium_hot = new ItemCustomLore().setUnlocalizedName("waste_thorium_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_thorium_hot"); - waste_plutonium_hot = new ItemCustomLore().setUnlocalizedName("waste_plutonium_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_plutonium_hot"); - waste_mox_hot = new ItemCustomLore().setUnlocalizedName("waste_mox_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_mox_hot"); - waste_schrabidium_hot = new ItemCustomLore().setUnlocalizedName("waste_schrabidium_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_schrabidium_hot"); + trinitite = new ItemRadioactive().setUnlocalizedName("trinitite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":trinitite_new"); + nuclear_waste = new ItemRadioactive().setUnlocalizedName("nuclear_waste").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste"); + nuclear_waste_tiny = new ItemRadioactive().setUnlocalizedName("nuclear_waste_tiny").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_tiny"); + waste_uranium = new ItemRadioactive().setUnlocalizedName("waste_uranium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_uranium"); + waste_thorium = new ItemRadioactive().setUnlocalizedName("waste_thorium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_thorium"); + waste_plutonium = new ItemRadioactive().setUnlocalizedName("waste_plutonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_plutonium"); + waste_mox = new ItemRadioactive().setUnlocalizedName("waste_mox").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_mox"); + waste_schrabidium = new ItemRadioactive().setUnlocalizedName("waste_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_schrabidium"); + waste_uranium_hot = new ItemRadioactive().setUnlocalizedName("waste_uranium_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_uranium_hot"); + waste_thorium_hot = new ItemRadioactive().setUnlocalizedName("waste_thorium_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_thorium_hot"); + waste_plutonium_hot = new ItemRadioactive().setUnlocalizedName("waste_plutonium_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_plutonium_hot"); + waste_mox_hot = new ItemRadioactive().setUnlocalizedName("waste_mox_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_mox_hot"); + waste_schrabidium_hot = new ItemRadioactive().setUnlocalizedName("waste_schrabidium_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_schrabidium_hot"); scrap = new Item().setUnlocalizedName("scrap").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":scrap"); containment_box = new ItemLeadBox().setUnlocalizedName("containment_box").setCreativeTab(null).setTextureName(RefStrings.MODID + ":containment_box"); - rod_thorium_fuel_depleted = new ItemCustomLore().setUnlocalizedName("rod_thorium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_thorium_fuel_depleted"); - rod_dual_thorium_fuel_depleted = new ItemCustomLore().setUnlocalizedName("rod_dual_thorium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_thorium_fuel_depleted"); - rod_quad_thorium_fuel_depleted = new ItemCustomLore().setUnlocalizedName("rod_quad_thorium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_thorium_fuel_depleted"); - rod_uranium_fuel_depleted = new ItemCustomLore().setUnlocalizedName("rod_uranium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_uranium_fuel_depleted"); - rod_dual_uranium_fuel_depleted = new ItemCustomLore().setUnlocalizedName("rod_dual_uranium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_uranium_fuel_depleted"); - rod_quad_uranium_fuel_depleted = new ItemCustomLore().setUnlocalizedName("rod_quad_uranium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_uranium_fuel_depleted"); - rod_plutonium_fuel_depleted = new ItemCustomLore().setUnlocalizedName("rod_plutonium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_plutonium_fuel_depleted"); - rod_dual_plutonium_fuel_depleted = new ItemCustomLore().setUnlocalizedName("rod_dual_plutonium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_plutonium_fuel_depleted"); - rod_quad_plutonium_fuel_depleted = new ItemCustomLore().setUnlocalizedName("rod_quad_plutonium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_plutonium_fuel_depleted"); - rod_mox_fuel_depleted = new ItemCustomLore().setUnlocalizedName("rod_mox_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_mox_fuel_depleted"); - rod_dual_mox_fuel_depleted = new ItemCustomLore().setUnlocalizedName("rod_dual_mox_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_mox_fuel_depleted"); - rod_quad_mox_fuel_depleted = new ItemCustomLore().setUnlocalizedName("rod_quad_mox_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_mox_fuel_depleted"); - rod_schrabidium_fuel_depleted = new ItemCustomLore().setUnlocalizedName("rod_schrabidium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_schrabidium_fuel_depleted"); - rod_dual_schrabidium_fuel_depleted = new ItemCustomLore().setUnlocalizedName("rod_dual_schrabidium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_schrabidium_fuel_depleted"); - rod_quad_schrabidium_fuel_depleted = new ItemCustomLore().setUnlocalizedName("rod_quad_schrabidium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_schrabidium_fuel_depleted"); - rod_waste = new ItemCustomLore().setUnlocalizedName("rod_waste").setMaxStackSize(1).setCreativeTab(null).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_waste"); - rod_dual_waste = new ItemCustomLore().setUnlocalizedName("rod_dual_waste").setMaxStackSize(1).setCreativeTab(null).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_waste"); - rod_quad_waste = new ItemCustomLore().setUnlocalizedName("rod_quad_waste").setMaxStackSize(1).setCreativeTab(null).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_waste"); + rod_thorium_fuel_depleted = new ItemRadioactive().setUnlocalizedName("rod_thorium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_thorium_fuel_depleted"); + rod_dual_thorium_fuel_depleted = new ItemRadioactive().setUnlocalizedName("rod_dual_thorium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_thorium_fuel_depleted"); + rod_quad_thorium_fuel_depleted = new ItemRadioactive().setUnlocalizedName("rod_quad_thorium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_thorium_fuel_depleted"); + rod_uranium_fuel_depleted = new ItemRadioactive().setUnlocalizedName("rod_uranium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_uranium_fuel_depleted"); + rod_dual_uranium_fuel_depleted = new ItemRadioactive().setUnlocalizedName("rod_dual_uranium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_uranium_fuel_depleted"); + rod_quad_uranium_fuel_depleted = new ItemRadioactive().setUnlocalizedName("rod_quad_uranium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_uranium_fuel_depleted"); + rod_plutonium_fuel_depleted = new ItemRadioactive().setUnlocalizedName("rod_plutonium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_plutonium_fuel_depleted"); + rod_dual_plutonium_fuel_depleted = new ItemRadioactive().setUnlocalizedName("rod_dual_plutonium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_plutonium_fuel_depleted"); + rod_quad_plutonium_fuel_depleted = new ItemRadioactive().setUnlocalizedName("rod_quad_plutonium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_plutonium_fuel_depleted"); + rod_mox_fuel_depleted = new ItemRadioactive().setUnlocalizedName("rod_mox_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_mox_fuel_depleted"); + rod_dual_mox_fuel_depleted = new ItemRadioactive().setUnlocalizedName("rod_dual_mox_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_mox_fuel_depleted"); + rod_quad_mox_fuel_depleted = new ItemRadioactive().setUnlocalizedName("rod_quad_mox_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_mox_fuel_depleted"); + rod_schrabidium_fuel_depleted = new ItemRadioactive().setUnlocalizedName("rod_schrabidium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_schrabidium_fuel_depleted"); + rod_dual_schrabidium_fuel_depleted = new ItemRadioactive().setUnlocalizedName("rod_dual_schrabidium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_schrabidium_fuel_depleted"); + rod_quad_schrabidium_fuel_depleted = new ItemRadioactive().setUnlocalizedName("rod_quad_schrabidium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_schrabidium_fuel_depleted"); + rod_waste = new ItemRadioactive().setUnlocalizedName("rod_waste").setMaxStackSize(1).setCreativeTab(null).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_waste"); + rod_dual_waste = new ItemRadioactive().setUnlocalizedName("rod_dual_waste").setMaxStackSize(1).setCreativeTab(null).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_waste"); + rod_quad_waste = new ItemRadioactive().setUnlocalizedName("rod_quad_waste").setMaxStackSize(1).setCreativeTab(null).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_waste"); pellet_cluster = new ItemCustomLore().setUnlocalizedName("pellet_cluster").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":pellet_cluster"); powder_fire = new ItemCustomLore().setUnlocalizedName("powder_fire").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_fire"); @@ -2308,7 +2308,7 @@ public class ModItems { gun_revolver_gold = new GunRevolver(gun_revolver_gold_ammo, 20, 30, false, false).setMaxDamage(1000).setUnlocalizedName("gun_revolver_gold").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_gold"); gun_revolver_lead_ammo = new Item().setUnlocalizedName("gun_revolver_lead_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_lead_ammo"); gun_revolver_lead = new GunRevolver(gun_revolver_lead_ammo, 5, 15, false, true).setMaxDamage(250).setUnlocalizedName("gun_revolver_lead").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_lead"); - gun_revolver_schrabidium_ammo = new ItemCustomLore().setUnlocalizedName("gun_revolver_schrabidium_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_schrabidium_ammo"); + gun_revolver_schrabidium_ammo = new ItemRadioactive().setUnlocalizedName("gun_revolver_schrabidium_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_schrabidium_ammo"); gun_revolver_schrabidium = new GunRevolver(gun_revolver_schrabidium_ammo, 10000, 100000, true, false).setMaxDamage(100000).setUnlocalizedName("gun_revolver_schrabidium").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_schrabidium"); gun_revolver_cursed_ammo = new ItemCustomLore().setUnlocalizedName("gun_revolver_cursed_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_cursed_ammo"); gun_revolver_cursed = new GunRevolver(gun_revolver_cursed_ammo, 25, 40, false, false).setMaxDamage(5000).setUnlocalizedName("gun_revolver_cursed").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_cursed"); diff --git a/com/hbm/items/special/ItemRadioactive.java b/com/hbm/items/special/ItemRadioactive.java index aa4a0da21..0377e5f54 100644 --- a/com/hbm/items/special/ItemRadioactive.java +++ b/com/hbm/items/special/ItemRadioactive.java @@ -89,6 +89,17 @@ public class ItemRadioactive extends ItemCustomLore { //Library.applyRadiation(living, 60, 19, 40, 14); Library.applyRadData(living, 5F/20F * mod); } + + //Strong Fire + + if (this == ModItems.waste_uranium_hot || + this == ModItems.waste_plutonium_hot || + this == ModItems.waste_mox_hot || + this == ModItems.waste_schrabidium_hot) { + //Library.applyRadiation(living, 60, 19, 40, 14); + Library.applyRadData(living, 5F/20F * mod); + living.setFire(5); + } //Strong Nuggets diff --git a/com/hbm/items/weapon/ItemGunBase.java b/com/hbm/items/weapon/ItemGunBase.java index 463940e53..90bac18b9 100644 --- a/com/hbm/items/weapon/ItemGunBase.java +++ b/com/hbm/items/weapon/ItemGunBase.java @@ -5,8 +5,12 @@ import java.util.List; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; +import com.hbm.entity.projectile.EntityBulletBase; +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.packet.GunButtonPacket; import com.hbm.packet.PacketDispatcher; import com.hbm.render.misc.RenderScreenOverlay.Crosshair; @@ -27,8 +31,8 @@ import net.minecraftforge.client.event.MouseEvent; public class ItemGunBase extends Item implements IHoldableWeapon { - private GunConfiguration mainConfig; - private GunConfiguration altConfig; + public GunConfiguration mainConfig; + public GunConfiguration altConfig; @SideOnly(Side.CLIENT) public boolean m1;// = false; @@ -102,6 +106,7 @@ public class ItemGunBase extends Item implements IHoldableWeapon { if(Keyboard.isKeyDown(Keyboard.KEY_R)) { PacketDispatcher.wrapper.sendToServer(new GunButtonPacket(true, (byte) 2)); setIsReloading(stack, true); + resetReloadCycle(stack); } } } else { @@ -119,6 +124,18 @@ public class ItemGunBase extends Item implements IHoldableWeapon { private void updateServer(ItemStack stack, World world, EntityPlayer entity, int slot, boolean isCurrentItem) { + if(getDelay(stack) > 0) + setDelay(stack, getDelay(stack) - 1); + + if(mainConfig.firingMode == 1 && getIsMouseDown(stack) && getDelay(stack) == 0 && getMag(stack) > 0) { + fire(stack, world, entity); + setDelay(stack, mainConfig.rateOfFire); + setMag(stack, getMag(stack) - 1); + } + + if(getIsReloading(stack)) { + reload(stack, world, entity); + } } //tries to shoot, bullet checks are done here @@ -128,28 +145,126 @@ public class ItemGunBase extends Item implements IHoldableWeapon { //called every time the gun shoots, overridden to change bullet entity/special additions private void fire(ItemStack stack, World world, EntityPlayer player) { - + + EntityBulletBase bullet = new EntityBulletBase(world, mainConfig.config.get(getMagType(stack)), player); + world.spawnEntityInWorld(bullet); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_revolver_gold_ammo)); } //called on click (server side, called by mouse packet) public void startAction(ItemStack stack, World world, EntityPlayer player, boolean main) { - + + if(mainConfig.firingMode == 0 && getIsMouseDown(stack) && getDelay(stack) == 0 && getMag(stack) > 0) { + fire(stack, world, player); + setDelay(stack, mainConfig.rateOfFire); + setMag(stack, getMag(stack) - 1); + } } //called on click release - private void endAction(ItemStack stack, World world, EntityPlayer player, boolean main) { + public void endAction(ItemStack stack, World world, EntityPlayer player, boolean main) { } //reload action, if existent private void reload(ItemStack stack, World world, EntityPlayer player) { + if(getReloadCycle(stack) == 0) { + + //if the mag has bullet in them -> load only the same type + if(getMag(stack) > 0) { + + Item ammo = BulletConfigSyncingUtil.pullConfig(mainConfig.config.get(getMagType(stack))).ammo; + + int count = 1; + + if(mainConfig.reloadType == 1) { + + count = mainConfig.ammoCap - getMag(stack); + } + + for(int i = 0; i < count; i++) { + + if(getMag(stack) < mainConfig.ammoCap) { + + if(player.inventory.hasItem(ammo)) { + player.inventory.consumeInventoryItem(ammo); + setMag(stack, getMag(stack) + 1); + } else { + setIsReloading(stack, false); + break; + } + } + + if(getMag(stack) == mainConfig.ammoCap) { + setIsReloading(stack, false); + break; + } else { + resetReloadCycle(stack); + } + } + + //if the mag has no bullets in them -> load new type + } else { + + Item ammo = null; + + //determine new type + for(Integer config : mainConfig.config) { + + BulletConfiguration cfg = BulletConfigSyncingUtil.pullConfig(config); + + if(player.inventory.hasItem(cfg.ammo)) { + ammo = cfg.ammo; + setMagType(stack, mainConfig.config.indexOf(config)); + break; + } + } + + //load new type if bullets are present + if(ammo != null) { + + int count = 1; + + if(mainConfig.reloadType == 1) { + + count = mainConfig.ammoCap - getMag(stack); + } + + for(int i = 0; i < count; i++) { + + if(getMag(stack) < mainConfig.ammoCap) { + + if(player.inventory.hasItem(ammo)) { + player.inventory.consumeInventoryItem(ammo); + setMag(stack, getMag(stack) + 1); + } else { + setIsReloading(stack, false); + break; + } + } + + if(getMag(stack) == mainConfig.ammoCap) { + setIsReloading(stack, false); + break; + } else { + resetReloadCycle(stack); + } + } + } + } + } else { + setReloadCycle(stack, getReloadCycle(stack) - 1); + } } //item mouseover text @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) { - + + list.add("Ammo: " + getMag(stack)); + list.add("Ammo Type: " + getMagType(stack)); + list.add("Reload DLAY: " + getReloadCycle(stack)); } /*//returns main config from itemstack @@ -162,6 +277,11 @@ public class ItemGunBase extends Item implements IHoldableWeapon { return null; }*/ + /// sets reload cycle to config defult /// + public static void resetReloadCycle(ItemStack stack) { + writeNBT(stack, "reload", ((ItemGunBase)stack.getItem()).mainConfig.reloadDuration); + } + /// if reloading routine is active /// public static void setIsReloading(ItemStack stack, boolean b) { writeNBT(stack, "isReloading", b ? 1 : 0); @@ -182,11 +302,11 @@ public class ItemGunBase extends Item implements IHoldableWeapon { /// if alt mouse button is down /// public static void setIsAltDown(ItemStack stack, boolean b) { - writeNBT(stack, "isMouseDown", b ? 1 : 0); + writeNBT(stack, "isAltDown", b ? 1 : 0); } public static boolean getIsAltDown(ItemStack stack) { - return readNBT(stack, "isMouseDown") == 1; + return readNBT(stack, "isAltDown") == 1; } /// RoF cooldown /// diff --git a/com/hbm/lib/RefStrings.java b/com/hbm/lib/RefStrings.java index 3397a651f..010773073 100644 --- a/com/hbm/lib/RefStrings.java +++ b/com/hbm/lib/RefStrings.java @@ -5,13 +5,10 @@ public class RefStrings { public static final String NAME = "Hbm's Nuclear Tech Mod"; public static final String VERSION = "1.0.27 BETA (3030B)"; //HBM's Beta Naming Convention: - //V T (X-Y-Z) + //V T (X) //V -> next release version //T -> build type - //X -> halogene (or noble gas if we're out of halogenes) - //Y -> some word that sounds cool - //Z -> build number - //Example: 1.0.25 BETA (Astatine-Lyra-X01) + //X -> days since 10/10/10 public static final String CLIENTSIDE = "com.hbm.main.ClientProxy"; public static final String SERVERSIDE = "com.hbm.main.ServerProxy"; } diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index 323448768..77aa0dd1d 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -837,27 +837,27 @@ public class CraftingManager { //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_uzi_ammo, 16), new Object[] { "L", "P", "G", 'P', "plateIron", 'L', "plateSteel", 'G', Items.gunpowder })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pellet_flechette, 1), new Object[] { " L ", " L ", "LLL", 'L', "nuggetLead" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_iron, 16), new Object[] { " I", "GC", " P", 'I', "ingotIron", 'G', Items.gunpowder, 'C', ModItems.casing_357, 'P', ModItems.primer_357 })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_steel, 16), new Object[] { " I", "GC", " P", 'I', "ingotLead", 'G', Items.gunpowder, 'C', ModItems.casing_357, 'P', ModItems.primer_357 })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_lead, 16), new Object[] { " I", "GC", " P", 'I', ModItems.ingot_u235, 'G', Items.gunpowder, 'C', "paneGlassColorless", 'P', ModItems.primer_357 })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_lead, 16), new Object[] { " I", "GC", " P", 'I', ModItems.ingot_pu239, 'G', Items.gunpowder, 'C', "paneGlassColorless", 'P', ModItems.primer_357 })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_lead, 16), new Object[] { " I", "GC", " P", 'I', ModItems.trinitite, 'G', Items.gunpowder, 'C', "paneGlassColorless", 'P', ModItems.primer_357 })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_lead, 16), new Object[] { " I", "GC", " P", 'I', ModItems.nuclear_waste_tiny, 'G', Items.gunpowder, 'C', "paneGlassColorless", 'P', ModItems.primer_357 })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_gold, 16), new Object[] { " I", "GC", " P", 'I', "ingotGold", 'G', Items.gunpowder, 'C', ModItems.casing_357, 'P', ModItems.primer_357 })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_schrabidium, 16), new Object[] { " I ", "GCN", " P ", 'I', "ingotSchrabidium", 'G', Items.gunpowder, 'C', ModItems.casing_357, 'P', ModItems.primer_357, 'N', Items.nether_star })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_nightmare, 16), new Object[] { " I", "GC", " P", 'I', "ingotTungsten", 'G', Items.gunpowder, 'C', ModItems.casing_357, 'P', ModItems.primer_357 })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_smg, 24), new Object[] { " I", "GC", " P", 'I', "ingotLead", 'G', Items.gunpowder, 'C', ModItems.casing_9, 'P', ModItems.primer_9 })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_uzi, 24), new Object[] { " I", "GC", " P", 'I', "ingotIron", 'G', Items.gunpowder, 'C', ModItems.casing_9, 'P', ModItems.primer_9 })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_lacunae, 24), new Object[] { " I", "GC", " P", 'I', "ingotCopper", 'G', Items.gunpowder, 'C', ModItems.casing_9, 'P', ModItems.primer_9 })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_nopip, 16), new Object[] { " I", "GC", " P", 'I', "ingotLead", 'G', Items.gunpowder, 'C', ModItems.casing_44, 'P', ModItems.primer_44 })); - //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_pip, 16), new Object[] { " I ", "GCM", " P ", 'I', "ingotLead", 'G', Items.gunpowder, 'C', ModItems.casing_44, 'P', ModItems.primer_44, 'M', ModItems.powder_magic })); - GameRegistry.addRecipe(new ItemStack(ModItems.ammo_12gauge, 8), new Object[] { " I ", "GCL", " P ", 'I', ModItems.pellet_buckshot, 'G', Items.gunpowder, 'C', ModItems.casing_buckshot, 'P', ModItems.primer_buckshot, 'L', ModItems.plate_polymer }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_20gauge, 8), new Object[] { " I ", "GCL", " P ", 'I', ModItems.pellet_buckshot, 'G', Items.gunpowder, 'C', ModItems.casing_buckshot, 'P', ModItems.primer_buckshot, 'L', "plateCopper" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_20gauge_slug, 8), new Object[] { " I ", "GCL", " P ", 'I', "ingotLead", 'G', Items.gunpowder, 'C', ModItems.casing_buckshot, 'P', ModItems.primer_buckshot, 'L', "plateCopper" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_20gauge_explosive, 8), new Object[] { " I ", "GCL", " P ", 'I', ModItems.pellet_cluster, 'G', Items.gunpowder, 'C', ModItems.casing_buckshot, 'P', ModItems.primer_buckshot, 'L', "plateCopper" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_20gauge_flechette, 8), new Object[] { " I ", "GCL", " P ", 'I', ModItems.pellet_flechette, 'G', Items.gunpowder, 'C', ModItems.casing_buckshot, 'P', ModItems.primer_buckshot, 'L', "plateCopper" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_iron, 16), new Object[] { " I", "GC", " P", 'I', "ingotIron", 'G', ModItems.cordite, 'C', ModItems.casing_357, 'P', ModItems.primer_357 })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_steel, 16), new Object[] { " I", "GC", " P", 'I', "ingotLead", 'G', ModItems.cordite, 'C', ModItems.casing_357, 'P', ModItems.primer_357 })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_lead, 16), new Object[] { " I", "GC", " P", 'I', ModItems.ingot_u235, 'G', ModItems.cordite, 'C', "paneGlassColorless", 'P', ModItems.primer_357 })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_lead, 16), new Object[] { " I", "GC", " P", 'I', ModItems.ingot_pu239, 'G', ModItems.cordite, 'C', "paneGlassColorless", 'P', ModItems.primer_357 })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_lead, 16), new Object[] { " I", "GC", " P", 'I', ModItems.trinitite, 'G', ModItems.cordite, 'C', "paneGlassColorless", 'P', ModItems.primer_357 })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_lead, 16), new Object[] { " I", "GC", " P", 'I', ModItems.nuclear_waste_tiny, 'G', ModItems.cordite, 'C', "paneGlassColorless", 'P', ModItems.primer_357 })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_gold, 16), new Object[] { " I", "GC", " P", 'I', "ingotGold", 'G', ModItems.cordite, 'C', ModItems.casing_357, 'P', ModItems.primer_357 })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_schrabidium, 16), new Object[] { " I ", "GCN", " P ", 'I', "ingotSchrabidium", 'G', ModItems.cordite, 'C', ModItems.casing_357, 'P', ModItems.primer_357, 'N', Items.nether_star })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_nightmare, 16), new Object[] { " I", "GC", " P", 'I', "ingotTungsten", 'G', ModItems.cordite, 'C', ModItems.casing_357, 'P', ModItems.primer_357 })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_smg, 24), new Object[] { " I", "GC", " P", 'I', "ingotLead", 'G', ModItems.cordite, 'C', ModItems.casing_9, 'P', ModItems.primer_9 })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_uzi, 24), new Object[] { " I", "GC", " P", 'I', "ingotIron", 'G', ModItems.cordite, 'C', ModItems.casing_9, 'P', ModItems.primer_9 })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_lacunae, 24), new Object[] { " I", "GC", " P", 'I', "ingotCopper", 'G', ModItems.cordite, 'C', ModItems.casing_9, 'P', ModItems.primer_9 })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_nopip, 16), new Object[] { " I", "GC", " P", 'I', "ingotLead", 'G', ModItems.cordite, 'C', ModItems.casing_44, 'P', ModItems.primer_44 })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_pip, 16), new Object[] { " I ", "GCM", " P ", 'I', "ingotLead", 'G', ModItems.cordite, 'C', ModItems.casing_44, 'P', ModItems.primer_44, 'M', ModItems.powder_magic })); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_12gauge, 8), new Object[] { " I ", "GCL", " P ", 'I', ModItems.pellet_buckshot, 'G', ModItems.cordite, 'C', ModItems.casing_buckshot, 'P', ModItems.primer_buckshot, 'L', ModItems.plate_polymer }); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_20gauge, 8), new Object[] { " I ", "GCL", " P ", 'I', ModItems.pellet_buckshot, 'G', ModItems.cordite, 'C', ModItems.casing_buckshot, 'P', ModItems.primer_buckshot, 'L', "plateCopper" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_20gauge_slug, 8), new Object[] { " I ", "GCL", " P ", 'I', "ingotLead", 'G', ModItems.cordite, 'C', ModItems.casing_buckshot, 'P', ModItems.primer_buckshot, 'L', "plateCopper" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_20gauge_explosive, 8), new Object[] { " I ", "GCL", " P ", 'I', ModItems.pellet_cluster, 'G', ModItems.cordite, 'C', ModItems.casing_buckshot, 'P', ModItems.primer_buckshot, 'L', "plateCopper" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_20gauge_flechette, 8), new Object[] { " I ", "GCL", " P ", 'I', ModItems.pellet_flechette, 'G', ModItems.cordite, 'C', ModItems.casing_buckshot, 'P', ModItems.primer_buckshot, 'L', "plateCopper" })); GameRegistry.addRecipe(new ItemStack(ModItems.gun_revolver_nightmare2_ammo, 8), new Object[] { "I", "C", "P", 'I', ModItems.powder_power, 'C', ModItems.casing_buckshot, 'P', ModItems.primer_buckshot }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_calamity, 8), new Object[] { " I ", "GCG", " P ", 'I', "ingotLead", 'G', Items.gunpowder, 'C', ModItems.casing_50, 'P', ModItems.primer_50 })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_calamity, 8), new Object[] { " I ", "GCG", " P ", 'I', "ingotLead", 'G', ModItems.cordite, 'C', ModItems.casing_50, 'P', ModItems.primer_50 })); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_12gauge_incendiary, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_12gauge, 'A', ModItems.powder_fire }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_20gauge_incendiary, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_20gauge, 'A', ModItems.powder_fire }); diff --git a/com/hbm/main/ModEventHandler.java b/com/hbm/main/ModEventHandler.java index 981a435d9..3ae9c6f6d 100644 --- a/com/hbm/main/ModEventHandler.java +++ b/com/hbm/main/ModEventHandler.java @@ -6,6 +6,7 @@ import java.util.Random; import com.hbm.entity.missile.EntityMissileBaseAdvanced; import com.hbm.entity.mob.EntityNuclearCreeper; +import com.hbm.entity.projectile.EntityBurningFOEQ; import com.hbm.entity.projectile.EntityMeteor; import com.hbm.items.ModItems; import com.hbm.lib.Library; @@ -64,6 +65,12 @@ public class ModEventHandler RadEntitySavedData eData = RadEntitySavedData.getData(event.entityLiving.worldObj); eData.setRadForEntity(event.entityLiving, 0); + + if(event.entity.getUniqueID().toString().equals(Library.HbMinecraft)) { + EntityBurningFOEQ foeq = new EntityBurningFOEQ(event.entity.worldObj); + foeq.setPositionAndRotation(event.entity.posX, 500, event.entity.posZ, 0.0F, 0.0F); + event.entity.worldObj.spawnEntityInWorld(foeq); + } } @SubscribeEvent diff --git a/com/hbm/main/ModEventHandlerClient.java b/com/hbm/main/ModEventHandlerClient.java index 7a6782ab2..3d1ed9ecc 100644 --- a/com/hbm/main/ModEventHandlerClient.java +++ b/com/hbm/main/ModEventHandlerClient.java @@ -66,8 +66,11 @@ public class ModEventHandlerClient { RenderPlayer renderer = event.renderer; EntityPlayer player = event.entityPlayer; - if(player.getHeldItem() != null && player.getHeldItem().getItem() instanceof IHoldableWeapon) + if(player.getHeldItem() != null && player.getHeldItem().getItem() instanceof IHoldableWeapon) { renderer.modelBipedMain.aimedBow = true; + renderer.modelArmor.aimedBow = true; + renderer.modelArmorChestplate.aimedBow = true; + } } @SubscribeEvent diff --git a/com/hbm/main/ResourceManager.java b/com/hbm/main/ResourceManager.java index ced51d1be..a0a31eaa7 100644 --- a/com/hbm/main/ResourceManager.java +++ b/com/hbm/main/ResourceManager.java @@ -284,7 +284,7 @@ public class ResourceManager { public static final IModelCustom missileV2 = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missileV2.obj")); public static final IModelCustom missileStrong = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missileGeneric.obj")); public static final IModelCustom missileHuge = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missileHuge.obj")); - public static final IModelCustom missileNuclear = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missileNuclear.obj")); + public static final IModelCustom missileNuclear = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missileNeon.obj")); public static final IModelCustom missileMIRV = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missileMIRV.obj")); public static final IModelCustom missileThermo = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missileThermo.obj")); public static final IModelCustom missileDoomsday = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missileDoomsday.obj")); @@ -322,7 +322,7 @@ public class ResourceManager { public static final ResourceLocation missileHuge_IN_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missileHuge_IN.png"); public static final ResourceLocation missileHuge_CL_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missileHuge_CL.png"); public static final ResourceLocation missileHuge_BU_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missileHuge_BU.png"); - public static final ResourceLocation missileNuclear_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missileNuclear.png"); + public static final ResourceLocation missileNuclear_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missileNeon.png"); public static final ResourceLocation missileMIRV_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missileMIRV.png"); public static final ResourceLocation missileEndo_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missileEndo.png"); public static final ResourceLocation missileExo_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missileExo.png"); diff --git a/com/hbm/packet/GunButtonPacket.java b/com/hbm/packet/GunButtonPacket.java index db4ff1eed..e3ec0efb7 100644 --- a/com/hbm/packet/GunButtonPacket.java +++ b/com/hbm/packet/GunButtonPacket.java @@ -73,9 +73,23 @@ public class GunButtonPacket implements IMessage { ItemGunBase item = (ItemGunBase)p.getHeldItem().getItem(); switch(m.button) { - case 0: ItemGunBase.setIsMouseDown(p.getHeldItem(), m.state); item.startAction(p.getHeldItem(), p.worldObj, p, true); break; - case 1: ItemGunBase.setIsAltDown(p.getHeldItem(), m.state); item.startAction(p.getHeldItem(), p.worldObj, p, false); break; - case 2: ItemGunBase.setIsReloading(p.getHeldItem(), true); break; + case 0: ItemGunBase.setIsMouseDown(p.getHeldItem(), m.state); + if(m.state) + item.startAction(p.getHeldItem(), p.worldObj, p, true); + else + item.endAction(p.getHeldItem(), p.worldObj, p, true); + break; + + case 1: ItemGunBase.setIsAltDown(p.getHeldItem(), m.state); + if(m.state) + item.startAction(p.getHeldItem(), p.worldObj, p, false); + else + item.endAction(p.getHeldItem(), p.worldObj, p, false); + break; + + case 2: ItemGunBase.setIsReloading(p.getHeldItem(), true); + ItemGunBase.resetReloadCycle(p.getHeldItem()); + break; } }