diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index ee05a8c76..6f67681a1 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -36,6 +36,7 @@ hbmfluid.biogas=Biogas hbmfluid.biofuel=Biodiesel hbmfluid.sas3=Schrabidiumtrisulfat hbmfluid.nitan=NITAN© 100 Oktan Supertreibstoff +hbmfluid.cryogel=Kryogel chem.TEST=Test chem.FP_HEAVYOIL=Schwerölverarbeitung diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index f2be84df7..33ef14469 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -36,6 +36,7 @@ hbmfluid.biogas=Biogas hbmfluid.biofuel=Biofuel hbmfluid.sas3=Schrabidium Trisulfide hbmfluid.nitan=NITAN© 100 Octane Super Fuel +hbmfluid.cryogel=Cryogel chem.TEST=Test chem.FP_HEAVYOIL=Heavy Oil Processing diff --git a/assets/hbm/models/ams_base.obj b/assets/hbm/models/ams_base.obj index 2b111dc37..e8d049802 100644 --- a/assets/hbm/models/ams_base.obj +++ b/assets/hbm/models/ams_base.obj @@ -73,6 +73,136 @@ v -0.229610 1.750000 -0.554328 v -0.229610 2.000000 -0.554328 v 0.750000 3.000000 0.750000 v 0.750000 3.000000 -0.750000 +vt 0.259127 0.259128 +vt 0.544865 0.259127 +vt 0.544865 0.544865 +vt 0.695462 0.306750 +vt 0.743085 0.306750 +vt 0.743085 0.497242 +vt 0.306750 0.108530 +vt 0.497242 0.108530 +vt 0.108530 0.497242 +vt 0.108530 0.306751 +vt 0.497242 0.695462 +vt 0.306751 0.695462 +vt 0.259127 0.544865 +vt 0.695462 0.497242 +vt 0.043049 0.876806 +vt 0.013285 0.876806 +vt 0.013285 0.847042 +vt 0.328787 0.876806 +vt 0.328787 0.906570 +vt 0.043049 0.906570 +vt 0.328787 0.847042 +vt 0.358551 0.847042 +vt 0.358551 0.876806 +vt 0.043049 0.847042 +vt 0.043049 0.817277 +vt 0.328787 0.817277 +vt 0.328787 0.936335 +vt 0.414884 0.876806 +vt 0.385120 0.876806 +vt 0.385120 0.847042 +vt 0.700622 0.876806 +vt 0.700622 0.906570 +vt 0.414884 0.906570 +vt 0.700622 0.847042 +vt 0.730386 0.847042 +vt 0.730386 0.876806 +vt 0.414884 0.847042 +vt 0.414884 0.817277 +vt 0.700622 0.817277 +vt 0.700622 0.936335 +vt 0.060908 0.497242 +vt 0.037096 0.473431 +vt 0.037096 0.330562 +vt 0.060907 0.306751 +vt 0.306750 0.060908 +vt 0.497242 0.060907 +vt 0.497242 0.743085 +vt 0.306751 0.743085 +vt 0.330562 0.037096 +vt 0.330562 0.013285 +vt 0.473431 0.013285 +vt 0.473431 0.037096 +vt 0.473431 0.766897 +vt 0.330562 0.766897 +vt 0.766897 0.330562 +vt 0.766897 0.473431 +vt 0.960146 0.013285 +vt 0.960146 0.156153 +vt 0.817277 0.156153 +vt 0.473431 0.790708 +vt 0.330562 0.790708 +vt 0.790708 0.330562 +vt 0.790708 0.473431 +vt 0.013285 0.473431 +vt 0.013285 0.330562 +vt 0.370051 0.986715 +vt 0.347753 0.986715 +vt 0.347753 0.962904 +vt 0.325455 0.986715 +vt 0.325455 0.962904 +vt 0.303157 0.986715 +vt 0.303157 0.962904 +vt 0.280859 0.986715 +vt 0.280859 0.962904 +vt 0.258561 0.986715 +vt 0.258561 0.962904 +vt 0.236263 0.986715 +vt 0.236263 0.962904 +vt 0.213965 0.986715 +vt 0.213965 0.962904 +vt 0.191668 0.986715 +vt 0.191668 0.962904 +vt 0.169370 0.986715 +vt 0.169370 0.962904 +vt 0.147072 0.986715 +vt 0.147072 0.962904 +vt 0.817277 0.448983 +vt 0.849026 0.460208 +vt 0.817277 0.550007 +vt 0.124774 0.986715 +vt 0.124774 0.962904 +vt 0.817277 0.698391 +vt 0.850952 0.698391 +vt 0.817277 0.793637 +vt 0.102476 0.986715 +vt 0.102476 0.962904 +vt 0.817277 0.576576 +vt 0.850952 0.576576 +vt 0.817277 0.671822 +vt 0.080178 0.986715 +vt 0.080178 0.962904 +vt 0.817277 0.321391 +vt 0.849026 0.332615 +vt 0.817277 0.422414 +vt 0.057880 0.986715 +vt 0.057880 0.962904 +vt 0.817277 0.227623 +vt 0.884476 0.182722 +vt 0.929376 0.249921 +vt 0.035582 0.986715 +vt 0.013285 0.986715 +vt 0.013285 0.962904 +vt 0.035582 0.962904 +vt 0.043049 0.936335 +vt 0.414884 0.936335 +vt 0.817277 0.013285 +vt 0.370050 0.962904 +vt 0.920843 0.270521 +vt 0.862178 0.294821 +vt 0.905076 0.286288 +vt 0.884476 0.294821 +vt 0.841577 0.286288 +vt 0.825810 0.270521 +vt 0.817277 0.249921 +vt 0.825810 0.207022 +vt 0.841577 0.191256 +vt 0.862178 0.182722 +vt 0.905076 0.191256 +vt 0.920843 0.207023 +vt 0.929376 0.227623 vn 0.000000 -1.000000 0.000000 vn 1.000000 0.000000 0.000000 vn 0.000000 0.316200 -0.948700 @@ -102,127 +232,113 @@ vn -0.831500 0.000000 -0.555600 vn -0.195100 0.000000 -0.980800 vn -0.555600 0.000000 -0.831500 s off -f 3//1 4//1 2//1 -f 8//2 28//2 27//2 -f 7//3 8//3 4//3 -f 5//4 7//4 3//4 -f 6//5 5//5 1//5 -f 8//6 6//6 2//6 -f 12//7 11//7 9//7 -f 16//8 15//8 11//8 -f 14//2 13//2 15//2 -f 10//9 9//9 13//9 -f 11//1 15//1 13//1 -f 16//10 12//10 10//10 -f 20//9 19//9 17//9 -f 24//7 23//7 19//7 -f 22//8 21//8 23//8 -f 18//2 17//2 21//2 -f 19//1 23//1 21//1 -f 24//10 20//10 18//10 -f 26//10 30//10 29//10 -f 5//7 26//7 25//7 -f 7//8 25//8 28//8 -f 6//9 27//9 26//9 -f 29//9 33//9 36//9 -f 25//10 29//10 32//10 -f 27//10 31//10 30//10 -f 28//10 32//10 31//10 -f 35//10 36//10 33//10 -f 31//8 35//8 34//8 -f 32//7 36//7 35//7 -f 30//2 34//2 33//2 -f 40//11 42//11 41//11 -f 42//12 44//12 43//12 -f 44//13 46//13 45//13 -f 46//14 48//14 47//14 -f 48//15 50//15 49//15 -f 50//16 52//16 51//16 -f 52//17 54//17 53//17 -f 54//18 56//18 55//18 -f 56//19 58//19 57//19 -f 58//20 60//20 59//20 -f 27//21 31//21 71//21 -f 60//22 62//22 61//22 -f 32//23 28//23 72//23 -f 62//24 64//24 63//24 -f 29//21 25//21 38//21 -f 64//25 66//25 65//25 -f 26//23 30//23 37//23 -f 66//26 68//26 67//26 -f 60//10 52//10 44//10 -f 70//27 40//27 39//27 -f 68//28 70//28 69//28 -f 53//1 65//1 69//1 -f 1//1 3//1 2//1 -f 6//2 8//2 27//2 -f 3//3 7//3 4//3 -f 1//4 5//4 3//4 -f 2//5 6//5 1//5 -f 4//6 8//6 2//6 -f 10//7 12//7 9//7 -f 12//8 16//8 11//8 -f 16//2 14//2 15//2 -f 14//9 10//9 13//9 -f 9//1 11//1 13//1 -f 14//10 16//10 10//10 -f 18//9 20//9 17//9 -f 20//7 24//7 19//7 -f 24//8 22//8 23//8 -f 22//2 18//2 21//2 -f 17//1 19//1 21//1 -f 22//10 24//10 18//10 -f 25//10 26//10 29//10 -f 7//7 5//7 25//7 -f 8//8 7//8 28//8 -f 5//9 6//9 26//9 -f 32//9 29//9 36//9 -f 28//10 25//10 32//10 -f 26//10 27//10 30//10 -f 27//10 28//10 31//10 -f 34//10 35//10 33//10 -f 30//8 31//8 34//8 -f 31//7 32//7 35//7 -f 29//2 30//2 33//2 -f 39//11 40//11 41//11 -f 41//12 42//12 43//12 -f 43//13 44//13 45//13 -f 45//14 46//14 47//14 -f 47//15 48//15 49//15 -f 49//16 50//16 51//16 -f 51//17 52//17 53//17 -f 53//18 54//18 55//18 -f 55//19 56//19 57//19 -f 57//20 58//20 59//20 -f 59//22 60//22 61//22 -f 61//24 62//24 63//24 -f 63//25 64//25 65//25 -f 65//26 66//26 67//26 -f 44//10 42//10 68//10 -f 40//10 70//10 68//10 -f 68//10 66//10 64//10 -f 64//10 62//10 60//10 -f 60//10 58//10 52//10 -f 56//10 54//10 52//10 -f 52//10 50//10 48//10 -f 48//10 46//10 44//10 -f 42//10 40//10 68//10 -f 68//10 64//10 44//10 -f 58//10 56//10 52//10 -f 52//10 48//10 44//10 -f 44//10 64//10 60//10 -f 69//27 70//27 39//27 -f 67//28 68//28 69//28 -f 69//1 39//1 41//1 -f 41//1 43//1 45//1 -f 45//1 47//1 49//1 -f 49//1 51//1 53//1 -f 53//1 55//1 57//1 -f 57//1 59//1 53//1 -f 61//1 63//1 65//1 -f 65//1 67//1 69//1 -f 69//1 41//1 45//1 -f 45//1 49//1 69//1 -f 53//1 59//1 61//1 -f 61//1 65//1 53//1 -f 69//1 49//1 53//1 +f 3/1/1 4/2/1 2/3/1 +f 8/4/2 28/5/2 27/6/2 +f 7/7/3 8/8/3 4/2/3 +f 5/9/4 7/10/4 3/1/4 +f 6/11/5 5/12/5 1/13/5 +f 8/4/6 6/14/6 2/3/6 +f 12/15/7 11/16/7 9/17/7 +f 16/18/8 15/19/8 11/20/8 +f 14/21/2 13/22/2 15/23/2 +f 10/24/9 9/25/9 13/26/9 +f 11/20/1 15/19/1 13/27/1 +f 16/18/10 12/15/10 10/24/10 +f 20/28/9 19/29/9 17/30/9 +f 24/31/7 23/32/7 19/33/7 +f 22/34/8 21/35/8 23/36/8 +f 18/37/2 17/38/2 21/39/2 +f 19/33/1 23/32/1 21/40/1 +f 24/31/10 20/28/10 18/37/10 +f 26/41/10 30/42/10 29/43/10 +f 5/9/7 26/41/7 25/44/7 +f 7/7/8 25/45/8 28/46/8 +f 6/11/9 27/47/9 26/48/9 +f 29/49/9 33/50/9 36/51/9 +f 25/45/10 29/49/10 32/52/10 +f 27/47/10 31/53/10 30/54/10 +f 28/5/10 32/55/10 31/56/10 +f 35/57/10 36/58/10 33/59/10 +f 31/53/8 35/60/8 34/61/8 +f 32/55/7 36/62/7 35/63/7 +f 30/42/2 34/64/2 33/65/2 +f 40/66/11 42/67/11 41/68/11 +f 42/67/12 44/69/12 43/70/12 +f 44/69/13 46/71/13 45/72/13 +f 46/71/14 48/73/14 47/74/14 +f 48/73/15 50/75/15 49/76/15 +f 50/75/16 52/77/16 51/78/16 +f 52/77/17 54/79/17 53/80/17 +f 54/79/18 56/81/18 55/82/18 +f 56/81/19 58/83/19 57/84/19 +f 58/83/20 60/85/20 59/86/20 +f 27/87/21 31/88/21 71/89/21 +f 60/85/22 62/90/22 61/91/22 +f 32/92/23 28/93/23 72/94/23 +f 62/90/24 64/95/24 63/96/24 +f 29/97/21 25/98/21 38/99/21 +f 64/95/25 66/100/25 65/101/25 +f 26/102/23 30/103/23 37/104/23 +f 66/100/26 68/105/26 67/106/26 +f 60/107/10 52/108/10 44/109/10 +f 70/110/27 40/111/27 39/112/27 +f 68/105/28 70/110/28 69/113/28 +f 1/13/1 3/1/1 2/3/1 +f 6/14/2 8/4/2 27/6/2 +f 3/1/3 7/7/3 4/2/3 +f 1/13/4 5/9/4 3/1/4 +f 2/3/5 6/11/5 1/13/5 +f 4/2/6 8/4/6 2/3/6 +f 10/24/7 12/15/7 9/17/7 +f 12/15/8 16/18/8 11/20/8 +f 16/18/2 14/21/2 15/23/2 +f 14/21/9 10/24/9 13/26/9 +f 9/114/1 11/20/1 13/27/1 +f 14/21/10 16/18/10 10/24/10 +f 18/37/9 20/28/9 17/30/9 +f 20/28/7 24/31/7 19/33/7 +f 24/31/8 22/34/8 23/36/8 +f 22/34/2 18/37/2 21/39/2 +f 17/115/1 19/33/1 21/40/1 +f 22/34/10 24/31/10 18/37/10 +f 25/44/10 26/41/10 29/43/10 +f 7/10/7 5/9/7 25/44/7 +f 8/8/8 7/7/8 28/46/8 +f 5/12/9 6/11/9 26/48/9 +f 32/52/9 29/49/9 36/51/9 +f 28/46/10 25/45/10 32/52/10 +f 26/48/10 27/47/10 30/54/10 +f 27/6/10 28/5/10 31/56/10 +f 34/116/10 35/57/10 33/59/10 +f 30/54/8 31/53/8 34/61/8 +f 31/56/7 32/55/7 35/63/7 +f 29/43/2 30/42/2 33/65/2 +f 39/117/11 40/66/11 41/68/11 +f 41/68/12 42/67/12 43/70/12 +f 43/70/13 44/69/13 45/72/13 +f 45/72/14 46/71/14 47/74/14 +f 47/74/15 48/73/15 49/76/15 +f 49/76/16 50/75/16 51/78/16 +f 51/78/17 52/77/17 53/80/17 +f 53/80/18 54/79/18 55/82/18 +f 55/82/19 56/81/19 57/84/19 +f 57/84/20 58/83/20 59/86/20 +f 59/86/22 60/85/22 61/91/22 +f 61/91/24 62/90/24 63/96/24 +f 63/96/25 64/95/25 65/101/25 +f 65/101/26 66/100/26 67/106/26 +f 44/109/10 42/118/10 68/119/10 +f 40/120/10 70/121/10 68/119/10 +f 68/119/10 66/122/10 64/123/10 +f 64/123/10 62/124/10 60/107/10 +f 60/107/10 58/125/10 52/108/10 +f 56/126/10 54/127/10 52/108/10 +f 52/108/10 50/128/10 48/129/10 +f 48/129/10 46/130/10 44/109/10 +f 42/118/10 40/120/10 68/119/10 +f 68/119/10 64/123/10 44/109/10 +f 58/125/10 56/126/10 52/108/10 +f 52/108/10 48/129/10 44/109/10 +f 44/109/10 64/123/10 60/107/10 +f 69/113/27 70/110/27 39/112/27 +f 67/106/28 68/105/28 69/113/28 diff --git a/assets/hbm/models/ams_emitter.obj b/assets/hbm/models/ams_emitter.obj index 608a9ccd6..d06fec049 100644 --- a/assets/hbm/models/ams_emitter.obj +++ b/assets/hbm/models/ams_emitter.obj @@ -1,22 +1,22 @@ # Blender v2.76 (sub 0) OBJ File: 'ams_emitter.blend' # www.blender.org o Circle -v 0.000000 6.250000 -2.500000 -v -0.956709 6.250000 -2.309699 -v -1.767767 6.250000 -1.767767 -v -2.309699 6.250000 -0.956709 -v -2.500000 6.250000 0.000000 -v -2.309699 6.250000 0.956709 -v -1.767767 6.250000 1.767767 -v -0.956709 6.250000 2.309699 -v -0.000000 6.250000 2.500000 -v 0.956708 6.250000 2.309699 -v 1.767766 6.250000 1.767768 -v 2.309699 6.250000 0.956709 -v 2.500000 6.250000 -0.000000 -v 2.309699 6.250000 -0.956709 -v 1.767766 6.250000 -1.767768 -v 0.956707 6.250000 -2.309699 +v 0.000000 5.750000 -2.500000 +v -0.956709 5.750000 -2.309699 +v -1.767767 5.750000 -1.767767 +v -2.309699 5.750000 -0.956709 +v -2.500000 5.750000 0.000000 +v -2.309699 5.750000 0.956709 +v -1.767767 5.750000 1.767767 +v -0.956709 5.750000 2.309699 +v -0.000000 5.750000 2.500000 +v 0.956708 5.750000 2.309699 +v 1.767766 5.750000 1.767768 +v 2.309699 5.750000 0.956709 +v 2.500000 5.750000 -0.000000 +v 2.309699 5.750000 -0.956709 +v 1.767766 5.750000 -1.767768 +v 0.956707 5.750000 -2.309699 v -0.956709 4.500000 -2.309699 v 0.000000 4.500000 -2.500000 v -1.767767 4.500000 -1.767767 @@ -201,110 +201,650 @@ v 0.200000 0.000000 0.000000 v 0.184776 0.000000 -0.076537 v 0.141422 0.000000 -0.141421 v 0.076537 0.000000 -0.184776 -v -0.861038 6.250000 -2.078729 -v -0.000000 6.250000 -2.250000 -v -1.590990 6.250000 -1.590990 -v -2.078729 6.250000 -0.861038 -v -2.250000 6.250000 0.000000 -v -2.078729 6.250000 0.861038 -v -1.590990 6.250000 1.590990 -v -0.861038 6.250000 2.078729 -v -0.000000 6.250000 2.250000 -v 0.861037 6.250000 2.078729 -v 1.590990 6.250000 1.590991 -v 2.078729 6.250000 0.861038 -v 2.250000 6.250000 -0.000000 -v 2.078728 6.250000 -0.861038 -v 1.590990 6.250000 -1.590991 -v 0.861037 6.250000 -2.078729 -v -0.861038 6.500000 -2.078729 -v -0.000000 6.500000 -2.250000 -v -1.590990 6.500000 -1.590990 -v -2.078729 6.500000 -0.861038 -v -2.250000 6.500000 0.000000 -v -2.078729 6.500000 0.861038 -v -1.590990 6.500000 1.590990 -v -0.861038 6.500000 2.078729 -v -0.000000 6.500000 2.250000 -v 0.861037 6.500000 2.078729 -v 1.590990 6.500000 1.590991 -v 2.078729 6.500000 0.861038 -v 2.250000 6.500000 -0.000000 -v 2.078728 6.500000 -0.861038 -v 1.590990 6.500000 -1.590991 -v 0.861037 6.500000 -2.078729 -v -0.000000 6.500000 -1.750000 -v -0.669696 6.500000 -1.616789 -v -1.237437 6.500000 -1.237437 -v -1.616789 6.500000 -0.669696 -v -1.750000 6.500000 0.000000 -v -1.616789 6.500000 0.669696 -v -1.237437 6.500000 1.237437 -v -0.669696 6.500000 1.616789 -v -0.000000 6.500000 1.750000 -v 0.669696 6.500000 1.616789 -v 1.237437 6.500000 1.237437 -v 1.616789 6.500000 0.669696 -v 1.750000 6.500000 -0.000000 -v 1.616789 6.500000 -0.669696 -v 1.237437 6.500000 -1.237437 -v 0.669695 6.500000 -1.616789 -v -0.669696 6.250000 -1.616789 -v -0.000000 6.250000 -1.750000 -v -1.237437 6.250000 -1.237437 -v -1.616789 6.250000 -0.669696 -v -1.750000 6.250000 0.000000 -v -1.616789 6.250000 0.669696 -v -1.237437 6.250000 1.237437 -v -0.669696 6.250000 1.616789 -v -0.000000 6.250000 1.750000 -v 0.669696 6.250000 1.616789 -v 1.237437 6.250000 1.237437 -v 1.616789 6.250000 0.669696 -v 1.750000 6.250000 -0.000000 -v 1.616789 6.250000 -0.669696 -v 1.237437 6.250000 -1.237437 -v 0.669695 6.250000 -1.616789 -v -0.156250 6.250000 0.156250 -v -0.156250 6.500000 0.156250 -v -0.156250 6.250000 -0.156250 -v -0.156250 6.500000 -0.156250 -v 0.156250 6.250000 0.156250 -v 0.156250 6.500000 0.156250 -v 0.156250 6.250000 -0.156250 -v 0.156250 6.500000 -0.156250 -v -0.156250 6.250000 -0.843750 -v -0.156250 6.500000 -0.843750 -v -0.156250 6.250000 -1.156250 -v -0.156250 6.500000 -1.156250 -v 0.156250 6.250000 -0.843750 -v 0.156250 6.500000 -0.843750 -v 0.156250 6.250000 -1.156250 -v 0.156250 6.500000 -1.156250 -v -0.156250 6.250000 1.156250 -v -0.156250 6.500000 1.156250 -v -0.156250 6.250000 0.843750 -v -0.156250 6.500000 0.843750 -v 0.156250 6.250000 1.156250 -v 0.156250 6.500000 1.156250 -v 0.156250 6.250000 0.843750 -v 0.156250 6.500000 0.843750 -v 0.843750 6.250000 0.156250 -v 0.843750 6.500000 0.156250 -v 0.843750 6.250000 -0.156250 -v 0.843750 6.500000 -0.156250 -v 1.156250 6.250000 0.156250 -v 1.156250 6.500000 0.156250 -v 1.156250 6.250000 -0.156250 -v 1.156250 6.500000 -0.156250 -v -1.156250 6.250000 0.156250 -v -1.156250 6.500000 0.156250 -v -1.156250 6.250000 -0.156250 -v -1.156250 6.500000 -0.156250 -v -0.843750 6.250000 0.156250 -v -0.843750 6.500000 0.156250 -v -0.843750 6.250000 -0.156250 -v -0.843750 6.500000 -0.156250 +v -0.861038 5.750000 -2.078729 +v -0.000000 5.750000 -2.250000 +v -1.590990 5.750000 -1.590990 +v -2.078729 5.750000 -0.861038 +v -2.250000 5.750000 0.000000 +v -2.078729 5.750000 0.861038 +v -1.590990 5.750000 1.590990 +v -0.861038 5.750000 2.078729 +v -0.000000 5.750000 2.250000 +v 0.861037 5.750000 2.078729 +v 1.590990 5.750000 1.590991 +v 2.078729 5.750000 0.861038 +v 2.250000 5.750000 -0.000000 +v 2.078728 5.750000 -0.861038 +v 1.590990 5.750000 -1.590991 +v 0.861037 5.750000 -2.078729 +v -0.861038 6.000000 -2.078729 +v -0.000000 6.000000 -2.250000 +v -1.590990 6.000000 -1.590990 +v -2.078729 6.000000 -0.861038 +v -2.250000 6.000000 0.000000 +v -2.078729 6.000000 0.861038 +v -1.590990 6.000000 1.590990 +v -0.861038 6.000000 2.078729 +v -0.000000 6.000000 2.250000 +v 0.861037 6.000000 2.078729 +v 1.590990 6.000000 1.590991 +v 2.078729 6.000000 0.861038 +v 2.250000 6.000000 -0.000000 +v 2.078728 6.000000 -0.861038 +v 1.590990 6.000000 -1.590991 +v 0.861037 6.000000 -2.078729 +v -0.000000 6.000000 -1.750000 +v -0.669696 6.000000 -1.616789 +v -1.237437 6.000000 -1.237437 +v -1.616789 6.000000 -0.669696 +v -1.750000 6.000000 0.000000 +v -1.616789 6.000000 0.669696 +v -1.237437 6.000000 1.237437 +v -0.669696 6.000000 1.616789 +v -0.000000 6.000000 1.750000 +v 0.669696 6.000000 1.616789 +v 1.237437 6.000000 1.237437 +v 1.616789 6.000000 0.669696 +v 1.750000 6.000000 -0.000000 +v 1.616789 6.000000 -0.669696 +v 1.237437 6.000000 -1.237437 +v 0.669695 6.000000 -1.616789 +v -0.669696 5.750000 -1.616789 +v -0.000000 5.750000 -1.750000 +v -1.237437 5.750000 -1.237437 +v -1.616789 5.750000 -0.669696 +v -1.750000 5.750000 0.000000 +v -1.616789 5.750000 0.669696 +v -1.237437 5.750000 1.237437 +v -0.669696 5.750000 1.616789 +v -0.000000 5.750000 1.750000 +v 0.669696 5.750000 1.616789 +v 1.237437 5.750000 1.237437 +v 1.616789 5.750000 0.669696 +v 1.750000 5.750000 -0.000000 +v 1.616789 5.750000 -0.669696 +v 1.237437 5.750000 -1.237437 +v 0.669695 5.750000 -1.616789 +v -0.156250 5.750000 0.156250 +v -0.156250 6.000000 0.156250 +v -0.156250 5.750000 -0.156250 +v -0.156250 6.000000 -0.156250 +v 0.156250 5.750000 0.156250 +v 0.156250 6.000000 0.156250 +v 0.156250 5.750000 -0.156250 +v 0.156250 6.000000 -0.156250 +v -0.156250 5.750000 -0.843750 +v -0.156250 6.000000 -0.843750 +v -0.156250 5.750000 -1.156250 +v -0.156250 6.000000 -1.156250 +v 0.156250 5.750000 -0.843750 +v 0.156250 6.000000 -0.843750 +v 0.156250 5.750000 -1.156250 +v 0.156250 6.000000 -1.156250 +v -0.156250 5.750000 1.156250 +v -0.156250 6.000000 1.156250 +v -0.156250 5.750000 0.843750 +v -0.156250 6.000000 0.843750 +v 0.156250 5.750000 1.156250 +v 0.156250 6.000000 1.156250 +v 0.156250 5.750000 0.843750 +v 0.156250 6.000000 0.843750 +v 0.843750 5.750000 0.156250 +v 0.843750 6.000000 0.156250 +v 0.843750 5.750000 -0.156250 +v 0.843750 6.000000 -0.156250 +v 1.156250 5.750000 0.156250 +v 1.156250 6.000000 0.156250 +v 1.156250 5.750000 -0.156250 +v 1.156250 6.000000 -0.156250 +v -1.156250 5.750000 0.156250 +v -1.156250 6.000000 0.156250 +v -1.156250 5.750000 -0.156250 +v -1.156250 6.000000 -0.156250 +v -0.843750 5.750000 0.156250 +v -0.843750 6.000000 0.156250 +v -0.843750 5.750000 -0.156250 +v -0.843750 6.000000 -0.156250 +vt 0.576667 0.382357 +vt 0.574662 0.392437 +vt 0.538573 0.392437 +vt 0.496469 0.330973 +vt 0.456371 0.330973 +vt 0.460380 0.285188 +vt 0.496469 0.382357 +vt 0.536568 0.330973 +vt 0.215778 0.382357 +vt 0.215778 0.330973 +vt 0.255877 0.330973 +vt 0.536568 0.382357 +vt 0.576667 0.330973 +vt 0.255877 0.382357 +vt 0.295976 0.330973 +vt 0.616765 0.330973 +vt 0.295976 0.382357 +vt 0.336074 0.330973 +vt 0.015285 0.382357 +vt 0.015284 0.330972 +vt 0.055383 0.330973 +vt 0.616766 0.382357 +vt 0.656864 0.330973 +vt 0.336074 0.382357 +vt 0.376173 0.330973 +vt 0.055383 0.382357 +vt 0.095482 0.330973 +vt 0.376173 0.382357 +vt 0.416272 0.330973 +vt 0.095482 0.382357 +vt 0.135581 0.330973 +vt 0.416272 0.382357 +vt 0.135581 0.382357 +vt 0.175680 0.330973 +vt 0.456371 0.382357 +vt 0.175679 0.382357 +vt 0.037893 0.157761 +vt 0.097889 0.105396 +vt 0.113878 0.127662 +vt 0.179689 0.285188 +vt 0.500479 0.285188 +vt 0.219788 0.285188 +vt 0.251867 0.285188 +vt 0.540578 0.285188 +vt 0.572657 0.285188 +vt 0.259887 0.285188 +vt 0.291966 0.285188 +vt 0.580677 0.285188 +vt 0.612756 0.285188 +vt 0.299986 0.285188 +vt 0.332065 0.285188 +vt 0.019294 0.285188 +vt 0.051373 0.285188 +vt 0.620775 0.285188 +vt 0.340084 0.285188 +vt 0.372163 0.285188 +vt 0.059393 0.285188 +vt 0.091472 0.285188 +vt 0.380183 0.285188 +vt 0.412262 0.285188 +vt 0.099492 0.285188 +vt 0.131571 0.285188 +vt 0.420282 0.285188 +vt 0.452361 0.285188 +vt 0.139591 0.285188 +vt 0.171670 0.285188 +vt 0.189877 0.179213 +vt 0.218452 0.092694 +vt 0.228419 0.093797 +vt 0.261577 0.254619 +vt 0.255468 0.186780 +vt 0.277841 0.183511 +vt 0.061828 0.181659 +vt 0.131117 0.145504 +vt 0.292505 0.250984 +vt 0.300105 0.177215 +vt 0.087230 0.202411 +vt 0.149618 0.159807 +vt 0.323346 0.243600 +vt 0.322079 0.167732 +vt 0.113991 0.219762 +vt 0.169262 0.170979 +vt 0.383419 0.217381 +vt 0.353768 0.232390 +vt 0.141924 0.233653 +vt 0.343644 0.154778 +vt 0.364814 0.137796 +vt 0.170832 0.244091 +vt 0.211262 0.184588 +vt 0.412039 0.198787 +vt 0.385834 0.115603 +vt 0.200531 0.251087 +vt 0.233200 0.187119 +vt 0.015284 0.131361 +vt 0.082701 0.076692 +vt 0.439698 0.177079 +vt 0.407253 0.085317 +vt 0.230843 0.254619 +vt 0.239371 0.093934 +vt 0.239618 0.072162 +vt 0.247952 0.071284 +vt 0.296126 0.071516 +vt 0.228839 0.093866 +vt 0.238944 0.093914 +vt 0.171086 0.062488 +vt 0.175333 0.069930 +vt 0.302698 0.064011 +vt 0.307469 0.055415 +vt 0.175485 0.070183 +vt 0.181789 0.076717 +vt 0.249882 0.092898 +vt 0.182018 0.076970 +vt 0.189634 0.082346 +vt 0.260206 0.090763 +vt 0.189926 0.082579 +vt 0.198460 0.086853 +vt 0.270174 0.087542 +vt 0.279254 0.083423 +vt 0.198801 0.087053 +vt 0.208001 0.090261 +vt 0.279613 0.083253 +vt 0.208379 0.090422 +vt 0.218048 0.092578 +vt 0.288334 0.077911 +vt 0.295869 0.071756 +vt 0.056392 0.914653 +vt 0.132886 0.927485 +vt 0.132886 0.933900 +vt 0.869643 0.540606 +vt 0.882474 0.464113 +vt 0.888890 0.464113 +vt 0.053268 0.804993 +vt 0.066100 0.728499 +vt 0.072515 0.728499 +vt 0.445643 0.752607 +vt 0.458474 0.676114 +vt 0.464890 0.676114 +vt 0.844491 0.479833 +vt 0.445643 0.793715 +vt 0.477722 0.752607 +vt 0.117166 0.971884 +vt 0.040672 0.984716 +vt 0.056392 0.946732 +vt 0.869643 0.581714 +vt 0.901722 0.540606 +vt 0.926873 0.479833 +vt 0.939705 0.556326 +vt 0.072515 0.687392 +vt 0.028116 0.744219 +vt 0.173993 0.933901 +vt 0.420491 0.691834 +vt 0.458474 0.635006 +vt 0.464890 0.635006 +vt 0.110499 0.744219 +vt 0.123330 0.820713 +vt 0.085347 0.804993 +vt 0.888890 0.423006 +vt 0.053268 0.846101 +vt 0.502873 0.691834 +vt 0.515705 0.768327 +vt 0.117166 0.889501 +vt 0.015284 0.914653 +vt 0.830792 0.951097 +vt 0.794703 0.951097 +vt 0.794703 0.920266 +vt 0.758615 0.951097 +vt 0.758615 0.920266 +vt 0.722526 0.951097 +vt 0.722526 0.920266 +vt 0.686437 0.951097 +vt 0.686437 0.920266 +vt 0.650348 0.951097 +vt 0.650348 0.920266 +vt 0.614259 0.951097 +vt 0.614259 0.920266 +vt 0.578170 0.951097 +vt 0.578170 0.920266 +vt 0.542081 0.951097 +vt 0.542081 0.920266 +vt 0.505992 0.951097 +vt 0.505992 0.920266 +vt 0.469904 0.951097 +vt 0.469904 0.920266 +vt 0.433815 0.951097 +vt 0.433815 0.920266 +vt 0.397726 0.951097 +vt 0.397726 0.920266 +vt 0.361637 0.951097 +vt 0.361637 0.920266 +vt 0.325548 0.951097 +vt 0.325548 0.920266 +vt 0.465371 0.495677 +vt 0.574130 0.423006 +vt 0.646801 0.531766 +vt 0.289459 0.951097 +vt 0.253371 0.951097 +vt 0.253371 0.920266 +vt 0.289459 0.920266 +vt 0.420991 0.565108 +vt 0.292700 0.590626 +vt 0.395472 0.436816 +vt 0.719181 0.487879 +vt 0.759280 0.487879 +vt 0.759280 0.554291 +vt 0.867188 0.750076 +vt 0.867188 0.790175 +vt 0.800776 0.790175 +vt 0.729244 0.269031 +vt 0.729244 0.202619 +vt 0.769342 0.202619 +vt 0.295181 0.699879 +vt 0.335280 0.699879 +vt 0.335280 0.766291 +vt 0.932061 0.754086 +vt 0.932061 0.786165 +vt 0.733254 0.137746 +vt 0.765333 0.137746 +vt 0.299191 0.635006 +vt 0.331270 0.635006 +vt 0.723191 0.423006 +vt 0.755270 0.423006 +vt 0.755270 0.677697 +vt 0.723191 0.677697 +vt 0.677370 0.786165 +vt 0.677370 0.754086 +vt 0.769342 0.269031 +vt 0.765333 0.392437 +vt 0.331270 0.889697 +vt 0.299191 0.889697 +vt 0.916953 0.831986 +vt 0.687433 0.152855 +vt 0.811153 0.152855 +vt 0.295181 0.766291 +vt 0.253371 0.650115 +vt 0.377090 0.650115 +vt 0.719181 0.554291 +vt 0.677370 0.438115 +vt 0.801090 0.438115 +vt 0.800776 0.750076 +vt 0.916953 0.708266 +vt 0.231240 0.072328 +vt 0.231712 0.026114 +vt 0.237435 0.026033 +vt 0.186929 0.060062 +vt 0.192978 0.063389 +vt 0.256122 0.069706 +vt 0.199735 0.066312 +vt 0.264005 0.067454 +vt 0.207066 0.068734 +vt 0.271480 0.064580 +vt 0.214843 0.070580 +vt 0.288020 0.078121 +vt 0.222942 0.071792 +vt 0.278425 0.061160 +vt 0.302514 0.064267 +vt 0.284716 0.057300 +vt 0.181720 0.056495 +vt 0.290222 0.053155 +vt 0.294822 0.049005 +vt 0.678402 0.031412 +vt 0.669962 0.018780 +vt 0.675194 0.015284 +vt 0.191981 0.019123 +vt 0.197814 0.020724 +vt 0.275449 0.017353 +vt 0.280450 0.015284 +vt 0.243126 0.025633 +vt 0.203354 0.022170 +vt 0.248762 0.024920 +vt 0.208942 0.023455 +vt 0.214582 0.024527 +vt 0.254320 0.023906 +vt 0.259780 0.022611 +vt 0.265126 0.021063 +vt 0.220266 0.025345 +vt 0.225983 0.025881 +vt 0.270348 0.019296 +vt 0.199577 0.615944 +vt 0.190120 0.611038 +vt 0.207351 0.577829 +vt 0.293971 0.392437 +vt 0.614761 0.392437 +vt 0.334069 0.392437 +vt 0.297981 0.392437 +vt 0.053378 0.392437 +vt 0.656864 0.382357 +vt 0.654859 0.392437 +vt 0.618770 0.392437 +vt 0.374168 0.392437 +vt 0.093477 0.392437 +vt 0.057388 0.392437 +vt 0.414267 0.392437 +vt 0.378178 0.392437 +vt 0.133576 0.392437 +vt 0.097487 0.392437 +vt 0.454366 0.392437 +vt 0.418277 0.392437 +vt 0.173675 0.392437 +vt 0.494464 0.392437 +vt 0.458376 0.392437 +vt 0.213773 0.392437 +vt 0.177684 0.392437 +vt 0.534563 0.392437 +vt 0.498474 0.392437 +vt 0.253872 0.392437 +vt 0.217783 0.392437 +vt 0.071828 0.434180 +vt 0.078601 0.442565 +vt 0.049155 0.466352 +vt 0.168195 0.643923 +vt 0.161178 0.635681 +vt 0.115804 0.423108 +vt 0.118139 0.434367 +vt 0.076846 0.644247 +vt 0.080428 0.632551 +vt 0.121498 0.645127 +vt 0.124188 0.656427 +vt 0.161793 0.436204 +vt 0.158035 0.447565 +vt 0.042355 0.614556 +vt 0.049951 0.605877 +vt 0.194501 0.464302 +vt 0.187358 0.472652 +vt 0.022135 0.577324 +vt 0.031743 0.572139 +vt 0.214916 0.499915 +vt 0.205668 0.505129 +vt 0.015284 0.537262 +vt 0.025706 0.535543 +vt 0.222657 0.539314 +vt 0.212378 0.541224 +vt 0.021047 0.497306 +vt 0.031469 0.498947 +vt 0.217775 0.579261 +vt 0.039873 0.461315 +vt 0.151861 0.616145 +vt 0.122654 0.622531 +vt 0.091843 0.612268 +vt 0.067470 0.591915 +vt 0.052264 0.565301 +vt 0.047059 0.535866 +vt 0.051400 0.506071 +vt 0.065114 0.480078 +vt 0.087336 0.462177 +vt 0.116489 0.456621 +vt 0.146881 0.467314 +vt 0.170584 0.486335 +vt 0.185602 0.512103 +vt 0.191175 0.541265 +vt 0.187262 0.570991 +vt 0.173736 0.597549 +vt 0.140610 0.476860 +vt 0.112539 0.469840 +vt 0.527642 0.026026 +vt 0.638166 0.099876 +vt 0.607576 0.145656 +vt 0.076432 0.585285 +vt 0.098921 0.602292 +vt 0.161957 0.492790 +vt 0.140760 0.477010 +vt 0.062548 0.562014 +vt 0.076334 0.585108 +vt 0.175461 0.515369 +vt 0.162052 0.492961 +vt 0.057898 0.536026 +vt 0.062503 0.561827 +vt 0.180428 0.541667 +vt 0.175506 0.515554 +vt 0.062158 0.508155 +vt 0.057903 0.535834 +vt 0.176544 0.568573 +vt 0.180450 0.541858 +vt 0.074836 0.485758 +vt 0.062126 0.507941 +vt 0.163818 0.592042 +vt 0.176545 0.568777 +vt 0.093957 0.471847 +vt 0.074863 0.485524 +vt 0.144940 0.606580 +vt 0.163798 0.592281 +vt 0.112325 0.469536 +vt 0.094020 0.471520 +vt 0.099062 0.602489 +vt 0.126336 0.609101 +vt 0.126559 0.609401 +vt 0.144885 0.606911 +vt 0.610243 0.660698 +vt 0.599966 0.660698 +vt 0.599966 0.647852 +vt 0.610243 0.673544 +vt 0.599966 0.673544 +vt 0.610243 0.686391 +vt 0.599966 0.686391 +vt 0.610243 0.647852 +vt 0.599966 0.635006 +vt 0.556551 0.660698 +vt 0.546274 0.660698 +vt 0.546274 0.647852 +vt 0.623089 0.660698 +vt 0.556551 0.673544 +vt 0.546274 0.673544 +vt 0.556551 0.686391 +vt 0.546274 0.686391 +vt 0.556551 0.647852 +vt 0.546274 0.635006 +vt 0.569397 0.660698 +vt 0.614714 0.212659 +vt 0.604437 0.212659 +vt 0.604437 0.199813 +vt 0.614714 0.225505 +vt 0.604437 0.225505 +vt 0.614714 0.238351 +vt 0.604437 0.238351 +vt 0.614714 0.199813 +vt 0.604437 0.186966 +vt 0.627560 0.212659 +vt 0.561022 0.212659 +vt 0.550745 0.212659 +vt 0.550745 0.199813 +vt 0.561022 0.225505 +vt 0.550745 0.225505 +vt 0.561022 0.238351 +vt 0.550745 0.238351 +vt 0.561022 0.199813 +vt 0.550745 0.186966 +vt 0.573868 0.212659 +vt 0.507330 0.212659 +vt 0.497053 0.212659 +vt 0.497053 0.199813 +vt 0.507330 0.225505 +vt 0.497053 0.225505 +vt 0.507330 0.238351 +vt 0.497053 0.238351 +vt 0.507330 0.199813 +vt 0.497053 0.186966 +vt 0.520176 0.212659 +vt 0.492459 0.285188 +vt 0.211768 0.285188 +vt 0.532558 0.285188 +vt 0.652854 0.285188 +vt 0.466484 0.153968 +vt 0.249457 0.092927 +vt 0.259793 0.090841 +vt 0.269783 0.087668 +vt 0.831659 0.556326 +vt 0.477722 0.793715 +vt 0.901722 0.581714 +vt 0.066100 0.687392 +vt 0.015284 0.820713 +vt 0.173993 0.927485 +vt 0.407659 0.768327 +vt 0.882474 0.423006 +vt 0.085347 0.846101 +vt 0.040672 0.876670 +vt 0.015284 0.946732 +vt 0.830792 0.920266 +vt 0.632991 0.565108 +vt 0.607472 0.590626 +vt 0.574130 0.604437 +vt 0.538042 0.604437 +vt 0.504700 0.590626 +vt 0.479181 0.565108 +vt 0.465370 0.531766 +vt 0.479181 0.462335 +vt 0.504700 0.436816 +vt 0.538042 0.423006 +vt 0.607472 0.436816 +vt 0.632991 0.462335 +vt 0.646801 0.495677 +vt 0.267181 0.462335 +vt 0.292700 0.436817 +vt 0.326042 0.423006 +vt 0.362130 0.423006 +vt 0.420991 0.462335 +vt 0.434802 0.495677 +vt 0.434802 0.531766 +vt 0.395472 0.590626 +vt 0.362130 0.604437 +vt 0.326042 0.604437 +vt 0.267181 0.565108 +vt 0.253371 0.531766 +vt 0.253371 0.495677 +vt 0.733254 0.392437 +vt 0.678402 0.015284 +vt 0.681366 0.016512 +vt 0.683634 0.018780 +vt 0.684862 0.021744 +vt 0.684862 0.024952 +vt 0.683634 0.027916 +vt 0.681366 0.030184 +vt 0.675194 0.031412 +vt 0.672230 0.030184 +vt 0.669962 0.027916 +vt 0.668735 0.024952 +vt 0.668735 0.021744 +vt 0.672230 0.016512 +vt 0.216808 0.582736 +vt 0.257882 0.392437 +vt 0.578672 0.392437 +vt 0.017289 0.392437 +vt 0.338079 0.392437 +vt 0.137586 0.392437 +vt 0.042381 0.457966 +vt 0.197138 0.619280 +vt 0.076267 0.431306 +vt 0.117916 0.656823 +vt 0.163868 0.646980 +vt 0.121897 0.423006 +vt 0.072832 0.641230 +vt 0.165179 0.439215 +vt 0.040344 0.611062 +vt 0.196606 0.467437 +vt 0.021321 0.573858 +vt 0.215947 0.503218 +vt 0.015284 0.533902 +vt 0.222802 0.542656 +vt 0.022187 0.493911 +vt 0.581644 0.156397 +vt 0.553575 0.156397 +vt 0.527642 0.145656 +vt 0.507794 0.125808 +vt 0.497053 0.099876 +vt 0.497053 0.071806 +vt 0.507794 0.045874 +vt 0.553575 0.015284 +vt 0.581644 0.015284 +vt 0.607576 0.026026 +vt 0.627424 0.045874 +vt 0.638166 0.071806 +vt 0.627424 0.125808 +vt 0.610243 0.635006 +vt 0.623089 0.647852 +vt 0.556551 0.635006 +vt 0.569397 0.647852 +vt 0.614714 0.186966 +vt 0.627560 0.199813 +vt 0.561022 0.186966 +vt 0.573868 0.199813 +vt 0.507330 0.186966 +vt 0.520176 0.199813 vn 0.000000 1.000000 0.000000 vn 0.880600 -0.440300 0.175200 vn 0.980800 0.000000 -0.195100 @@ -355,10 +895,6 @@ vn -0.527100 -0.843300 0.104800 vn 0.527100 -0.843300 -0.104800 vn -0.446800 -0.843300 0.298600 vn 0.446800 -0.843300 -0.298600 -vn 0.000000 0.843300 -0.537400 -vn -0.000000 0.843300 0.537400 -vn 0.537400 0.843300 0.000000 -vn -0.537400 0.843300 0.000000 vn -0.000000 -0.843300 0.537400 vn 0.000000 -0.843300 -0.537400 vn -0.537400 -0.843300 0.000000 @@ -388,541 +924,533 @@ vn 0.640900 -0.035600 0.766800 vn -0.766800 -0.035600 -0.640900 vn 0.766800 -0.035600 -0.640900 s off -f 15//1 215//1 214//1 -f 29//2 28//2 44//2 -f 13//3 29//3 30//3 -f 6//4 22//4 23//4 -f 14//5 30//5 31//5 -f 7//6 23//6 24//6 -f 15//7 31//7 32//7 -f 8//8 24//8 25//8 -f 1//9 18//9 17//9 -f 16//10 32//10 18//10 -f 9//11 25//11 26//11 -f 2//12 17//12 19//12 -f 10//13 26//13 27//13 -f 3//14 19//14 20//14 -f 11//15 27//15 28//15 -f 4//16 20//16 21//16 -f 12//17 28//17 29//17 -f 5//18 21//18 22//18 -f 33//12 49//12 51//12 -f 22//19 21//19 37//19 -f 30//20 29//20 45//20 -f 22//21 38//21 39//21 -f 30//22 46//22 47//22 -f 23//23 39//23 40//23 -f 31//24 47//24 48//24 -f 24//25 40//25 41//25 -f 18//26 34//26 33//26 -f 18//27 32//27 48//27 -f 25//28 41//28 42//28 -f 17//29 33//29 35//29 -f 26//30 42//30 43//30 -f 19//31 35//31 36//31 -f 27//32 43//32 44//32 -f 20//33 36//33 37//33 -f 55//34 71//34 72//34 -f 42//13 58//13 59//13 -f 35//14 51//14 52//14 -f 43//15 59//15 60//15 -f 36//16 52//16 53//16 -f 44//17 60//17 61//17 -f 37//18 53//18 54//18 -f 46//3 45//3 61//3 -f 38//4 54//4 55//4 -f 46//5 62//5 63//5 -f 39//6 55//6 56//6 -f 47//7 63//7 64//7 -f 40//8 56//8 57//8 -f 34//9 50//9 49//9 -f 48//10 64//10 50//10 -f 41//11 57//11 58//11 -f 73//35 177//35 178//35 -f 64//36 63//36 79//36 -f 56//37 72//37 73//37 -f 50//38 66//38 65//38 -f 64//39 80//39 66//39 -f 58//40 57//40 73//40 -f 49//41 65//41 67//41 -f 59//42 58//42 74//42 -f 51//43 67//43 68//43 -f 60//44 59//44 75//44 -f 52//45 68//45 69//45 -f 60//46 76//46 77//46 -f 53//47 69//47 70//47 -f 62//48 61//48 77//48 -f 54//49 70//49 71//49 -f 62//50 78//50 79//50 -f 93//51 92//51 84//51 -f 89//52 96//52 88//52 -f 91//53 90//53 82//53 -f 95//54 94//54 86//54 -f 100//55 108//55 107//55 -f 104//56 112//56 111//56 -f 98//57 106//57 105//57 -f 102//58 110//58 109//58 -f 96//17 112//17 104//17 -f 86//59 102//59 101//59 -f 93//3 85//3 99//3 -f 88//60 104//60 103//60 -f 89//18 81//18 103//18 -f 91//59 105//59 106//59 -f 90//10 106//10 98//10 -f 93//60 107//60 108//60 -f 94//8 110//8 102//8 -f 94//61 95//61 109//61 -f 91//11 83//11 97//11 -f 89//62 111//62 112//62 -f 82//61 98//61 97//61 -f 95//9 87//9 101//9 -f 92//16 108//16 100//16 -f 84//62 100//62 99//62 -f 116//10 118//10 117//10 -f 118//7 120//7 119//7 -f 120//5 122//5 121//5 -f 122//3 124//3 123//3 -f 124//17 126//17 125//17 -f 126//15 128//15 127//15 -f 128//13 130//13 129//13 -f 130//11 132//11 131//11 -f 132//8 134//8 133//8 -f 134//6 136//6 135//6 -f 136//4 138//4 137//4 -f 138//18 140//18 139//18 -f 140//16 142//16 141//16 -f 142//14 144//14 143//14 -f 136//1 128//1 120//1 -f 146//9 116//9 115//9 -f 144//12 146//12 145//12 -f 129//35 137//35 121//35 -f 150//63 149//63 157//63 -f 152//64 151//64 159//64 -f 153//65 113//65 114//65 -f 148//66 147//66 155//66 -f 168//67 167//67 151//67 -f 161//68 162//68 114//68 -f 164//69 163//69 147//69 -f 166//70 165//70 149//70 -f 157//71 165//71 166//71 -f 159//72 167//72 168//72 -f 153//73 154//73 162//73 -f 155//74 163//74 164//74 -f 151//75 167//75 159//75 -f 113//76 153//76 161//76 -f 114//77 162//77 154//77 -f 148//78 156//78 164//78 -f 147//79 163//79 155//79 -f 150//80 158//80 166//80 -f 149//81 165//81 157//81 -f 152//82 160//82 168//82 -f 176//8 192//8 193//8 -f 65//35 169//35 171//35 -f 74//35 178//35 179//35 -f 67//35 171//35 172//35 -f 75//35 179//35 180//35 -f 68//35 172//35 173//35 -f 76//35 180//35 181//35 -f 69//35 173//35 174//35 -f 78//35 77//35 181//35 -f 70//35 174//35 175//35 -f 79//35 78//35 182//35 -f 72//35 71//35 175//35 -f 80//35 79//35 183//35 -f 72//35 176//35 177//35 -f 65//35 66//35 170//35 -f 80//35 184//35 170//35 -f 195//35 189//35 187//35 -f 170//9 186//9 185//9 -f 184//10 200//10 186//10 -f 177//11 193//11 194//11 -f 169//12 185//12 187//12 -f 178//13 194//13 195//13 -f 171//14 187//14 188//14 -f 180//15 179//15 195//15 -f 172//16 188//16 189//16 -f 180//17 196//17 197//17 -f 174//18 173//18 189//18 -f 181//3 197//3 198//3 -f 174//4 190//4 191//4 -f 182//5 198//5 199//5 -f 175//6 191//6 192//6 -f 183//7 199//7 200//7 -f 215//5 231//5 230//5 -f 7//1 8//1 208//1 -f 15//1 16//1 216//1 -f 9//1 209//1 208//1 -f 1//1 2//1 201//1 -f 1//1 202//1 216//1 -f 9//1 10//1 210//1 -f 3//1 203//1 201//1 -f 11//1 211//1 210//1 -f 4//1 204//1 203//1 -f 12//1 212//1 211//1 -f 4//1 5//1 205//1 -f 13//1 213//1 212//1 -f 6//1 206//1 205//1 -f 14//1 214//1 213//1 -f 7//1 207//1 206//1 -f 208//6 224//6 223//6 -f 216//7 232//7 231//7 -f 209//8 225//8 224//8 -f 201//9 217//9 218//9 -f 202//10 218//10 232//10 -f 210//11 226//11 225//11 -f 203//12 219//12 217//12 -f 211//13 227//13 226//13 -f 204//14 220//14 219//14 -f 212//15 228//15 227//15 -f 205//16 221//16 220//16 -f 213//17 229//17 228//17 -f 206//18 222//18 221//18 -f 214//3 230//3 229//3 -f 207//4 223//4 222//4 -f 231//1 232//1 248//1 -f 218//1 233//1 248//1 -f 218//1 217//1 234//1 -f 219//1 235//1 234//1 -f 220//1 236//1 235//1 -f 220//1 221//1 237//1 -f 222//1 238//1 237//1 -f 222//1 223//1 239//1 -f 224//1 240//1 239//1 -f 225//1 241//1 240//1 -f 225//1 226//1 242//1 -f 226//1 227//1 243//1 -f 227//1 228//1 244//1 -f 228//1 229//1 245//1 -f 230//1 246//1 245//1 -f 231//1 247//1 246//1 -f 242//9 258//9 257//9 -f 257//1 263//1 250//1 -f 235//13 251//13 249//13 -f 243//12 259//12 258//12 -f 236//15 252//15 251//15 -f 244//14 260//14 259//14 -f 237//17 253//17 252//17 -f 245//16 261//16 260//16 -f 238//3 254//3 253//3 -f 246//18 262//18 261//18 -f 239//5 255//5 254//5 -f 247//4 263//4 262//4 -f 240//7 256//7 255//7 -f 248//6 264//6 263//6 -f 241//10 257//10 256//10 -f 234//11 249//11 250//11 -f 233//8 250//8 264//8 -f 268//61 267//61 265//61 -f 272//60 271//60 267//60 -f 270//59 269//59 271//59 -f 266//62 265//62 269//62 -f 276//61 275//61 273//61 -f 272//1 268//1 266//1 -f 280//60 279//60 275//60 -f 278//59 277//59 279//59 -f 274//62 273//62 277//62 -f 280//1 276//1 274//1 -f 284//61 283//61 281//61 -f 288//60 287//60 283//60 -f 286//59 285//59 287//59 -f 282//62 281//62 285//62 -f 288//1 284//1 282//1 -f 292//61 291//61 289//61 -f 296//60 295//60 291//60 -f 294//59 293//59 295//59 -f 290//62 289//62 293//62 -f 296//1 292//1 290//1 -f 300//61 299//61 297//61 -f 304//60 303//60 299//60 -f 302//59 301//59 303//59 -f 298//62 297//62 301//62 -f 304//1 300//1 298//1 -f 14//1 15//1 214//1 -f 45//2 29//2 44//2 -f 14//3 13//3 30//3 -f 7//4 6//4 23//4 -f 15//5 14//5 31//5 -f 8//6 7//6 24//6 -f 16//7 15//7 32//7 -f 9//8 8//8 25//8 -f 2//9 1//9 17//9 -f 1//10 16//10 18//10 -f 10//11 9//11 26//11 -f 3//12 2//12 19//12 -f 11//13 10//13 27//13 -f 4//14 3//14 20//14 -f 12//15 11//15 28//15 -f 5//16 4//16 21//16 -f 13//17 12//17 29//17 -f 6//18 5//18 22//18 -f 35//12 33//12 51//12 -f 38//19 22//19 37//19 -f 46//20 30//20 45//20 -f 23//21 22//21 39//21 -f 31//22 30//22 47//22 -f 24//23 23//23 40//23 -f 32//24 31//24 48//24 -f 25//25 24//25 41//25 -f 17//26 18//26 33//26 -f 34//27 18//27 48//27 -f 26//28 25//28 42//28 -f 19//29 17//29 35//29 -f 27//30 26//30 43//30 -f 20//31 19//31 36//31 -f 28//32 27//32 44//32 -f 21//33 20//33 37//33 -f 56//34 55//34 72//34 -f 43//13 42//13 59//13 -f 36//14 35//14 52//14 -f 44//15 43//15 60//15 -f 37//16 36//16 53//16 -f 45//17 44//17 61//17 -f 38//18 37//18 54//18 -f 62//3 46//3 61//3 -f 39//4 38//4 55//4 -f 47//5 46//5 63//5 -f 40//6 39//6 56//6 -f 48//7 47//7 64//7 -f 41//8 40//8 57//8 -f 33//9 34//9 49//9 -f 34//10 48//10 50//10 -f 42//11 41//11 58//11 -f 74//35 73//35 178//35 -f 80//36 64//36 79//36 -f 57//37 56//37 73//37 -f 49//38 50//38 65//38 -f 50//39 64//39 66//39 -f 74//40 58//40 73//40 -f 51//41 49//41 67//41 -f 75//42 59//42 74//42 -f 52//43 51//43 68//43 -f 76//44 60//44 75//44 -f 53//45 52//45 69//45 -f 61//46 60//46 77//46 -f 54//47 53//47 70//47 -f 78//48 62//48 77//48 -f 55//49 54//49 71//49 -f 63//50 62//50 79//50 -f 85//51 93//51 84//51 -f 81//52 89//52 88//52 -f 83//53 91//53 82//53 -f 87//54 95//54 86//54 -f 99//55 100//55 107//55 -f 103//56 104//56 111//56 -f 97//57 98//57 105//57 -f 101//58 102//58 109//58 -f 88//17 96//17 104//17 -f 87//59 86//59 101//59 -f 107//3 93//3 99//3 -f 81//60 88//60 103//60 -f 111//18 89//18 103//18 -f 90//59 91//59 106//59 -f 82//10 90//10 98//10 -f 92//60 93//60 108//60 -f 86//8 94//8 102//8 -f 110//61 94//61 109//61 -f 105//11 91//11 97//11 -f 96//62 89//62 112//62 -f 83//61 82//61 97//61 -f 109//9 95//9 101//9 -f 84//16 92//16 100//16 -f 85//62 84//62 99//62 -f 115//10 116//10 117//10 -f 117//7 118//7 119//7 -f 119//5 120//5 121//5 -f 121//3 122//3 123//3 -f 123//17 124//17 125//17 -f 125//15 126//15 127//15 -f 127//13 128//13 129//13 -f 129//11 130//11 131//11 -f 131//8 132//8 133//8 -f 133//6 134//6 135//6 -f 135//4 136//4 137//4 -f 137//18 138//18 139//18 -f 139//16 140//16 141//16 -f 141//14 142//14 143//14 -f 120//1 118//1 116//1 -f 116//1 146//1 120//1 -f 144//1 142//1 140//1 -f 140//1 138//1 136//1 -f 136//1 134//1 128//1 -f 132//1 130//1 128//1 -f 128//1 126//1 124//1 -f 124//1 122//1 120//1 -f 120//1 146//1 144//1 -f 144//1 140//1 120//1 -f 134//1 132//1 128//1 -f 128//1 124//1 120//1 -f 120//1 140//1 136//1 -f 145//9 146//9 115//9 -f 143//12 144//12 145//12 -f 145//35 115//35 117//35 -f 117//35 119//35 121//35 -f 121//35 123//35 125//35 -f 125//35 127//35 121//35 -f 129//35 131//35 133//35 -f 133//35 135//35 137//35 -f 137//35 139//35 141//35 -f 141//35 143//35 145//35 -f 145//35 117//35 121//35 -f 121//35 127//35 129//35 -f 129//35 133//35 137//35 -f 137//35 141//35 145//35 -f 145//35 121//35 137//35 -f 158//63 150//63 157//63 -f 160//64 152//64 159//64 -f 154//65 153//65 114//65 -f 156//66 148//66 155//66 -f 152//67 168//67 151//67 -f 113//68 161//68 114//68 -f 148//69 164//69 147//69 -f 150//70 166//70 149//70 -f 158//71 157//71 166//71 -f 160//72 159//72 168//72 -f 161//73 153//73 162//73 -f 156//74 155//74 164//74 -f 177//8 176//8 193//8 -f 67//35 65//35 171//35 -f 75//35 74//35 179//35 -f 68//35 67//35 172//35 -f 76//35 75//35 180//35 -f 69//35 68//35 173//35 -f 77//35 76//35 181//35 -f 70//35 69//35 174//35 -f 182//35 78//35 181//35 -f 71//35 70//35 175//35 -f 183//35 79//35 182//35 -f 176//35 72//35 175//35 -f 184//35 80//35 183//35 -f 73//35 72//35 177//35 -f 169//35 65//35 170//35 -f 66//35 80//35 170//35 -f 187//35 185//35 186//35 -f 186//35 200//35 199//35 -f 199//35 198//35 195//35 -f 197//35 196//35 195//35 -f 195//35 194//35 193//35 -f 193//35 192//35 195//35 -f 191//35 190//35 189//35 -f 189//35 188//35 187//35 -f 187//35 186//35 195//35 -f 198//35 197//35 195//35 -f 195//35 192//35 191//35 -f 191//35 189//35 195//35 -f 186//35 199//35 195//35 -f 169//9 170//9 185//9 -f 170//10 184//10 186//10 -f 178//11 177//11 194//11 -f 171//12 169//12 187//12 -f 179//13 178//13 195//13 -f 172//14 171//14 188//14 -f 196//15 180//15 195//15 -f 173//16 172//16 189//16 -f 181//17 180//17 197//17 -f 190//18 174//18 189//18 -f 182//3 181//3 198//3 -f 175//4 174//4 191//4 -f 183//5 182//5 199//5 -f 176//6 175//6 192//6 -f 184//7 183//7 200//7 -f 214//5 215//5 230//5 -f 207//1 7//1 208//1 -f 215//1 15//1 216//1 -f 8//1 9//1 208//1 -f 202//1 1//1 201//1 -f 16//1 1//1 216//1 -f 209//1 9//1 210//1 -f 2//1 3//1 201//1 -f 10//1 11//1 210//1 -f 3//1 4//1 203//1 -f 11//1 12//1 211//1 -f 204//1 4//1 205//1 -f 12//1 13//1 212//1 -f 5//1 6//1 205//1 -f 13//1 14//1 213//1 -f 6//1 7//1 206//1 -f 207//6 208//6 223//6 -f 215//7 216//7 231//7 -f 208//8 209//8 224//8 -f 202//9 201//9 218//9 -f 216//10 202//10 232//10 -f 209//11 210//11 225//11 -f 201//12 203//12 217//12 -f 210//13 211//13 226//13 -f 203//14 204//14 219//14 -f 211//15 212//15 227//15 -f 204//16 205//16 220//16 -f 212//17 213//17 228//17 -f 205//18 206//18 221//18 -f 213//3 214//3 229//3 -f 206//4 207//4 222//4 -f 247//1 231//1 248//1 -f 232//1 218//1 248//1 -f 233//1 218//1 234//1 -f 217//1 219//1 234//1 -f 219//1 220//1 235//1 -f 236//1 220//1 237//1 -f 221//1 222//1 237//1 -f 238//1 222//1 239//1 -f 223//1 224//1 239//1 -f 224//1 225//1 240//1 -f 241//1 225//1 242//1 -f 242//1 226//1 243//1 -f 243//1 227//1 244//1 -f 244//1 228//1 245//1 -f 229//1 230//1 245//1 -f 230//1 231//1 246//1 -f 241//9 242//9 257//9 -f 250//1 249//1 251//1 -f 251//1 252//1 253//1 -f 253//1 254//1 257//1 -f 255//1 256//1 257//1 -f 257//1 258//1 259//1 -f 259//1 260//1 261//1 -f 261//1 262//1 259//1 -f 263//1 264//1 250//1 -f 250//1 251//1 257//1 -f 254//1 255//1 257//1 -f 257//1 259//1 262//1 -f 262//1 263//1 257//1 -f 251//1 253//1 257//1 -f 234//13 235//13 249//13 -f 242//12 243//12 258//12 -f 235//15 236//15 251//15 -f 243//14 244//14 259//14 -f 236//17 237//17 252//17 -f 244//16 245//16 260//16 -f 237//3 238//3 253//3 -f 245//18 246//18 261//18 -f 238//5 239//5 254//5 -f 246//4 247//4 262//4 -f 239//7 240//7 255//7 -f 247//6 248//6 263//6 -f 240//10 241//10 256//10 -f 233//11 234//11 250//11 -f 248//8 233//8 264//8 -f 266//61 268//61 265//61 -f 268//60 272//60 267//60 -f 272//59 270//59 271//59 -f 270//62 266//62 269//62 -f 274//61 276//61 273//61 -f 270//1 272//1 266//1 -f 276//60 280//60 275//60 -f 280//59 278//59 279//59 -f 278//62 274//62 277//62 -f 278//1 280//1 274//1 -f 282//61 284//61 281//61 -f 284//60 288//60 283//60 -f 288//59 286//59 287//59 -f 286//62 282//62 285//62 -f 286//1 288//1 282//1 -f 290//61 292//61 289//61 -f 292//60 296//60 291//60 -f 296//59 294//59 295//59 -f 294//62 290//62 293//62 -f 294//1 296//1 290//1 -f 298//61 300//61 297//61 -f 300//60 304//60 299//60 -f 304//59 302//59 303//59 -f 302//62 298//62 301//62 -f 302//1 304//1 298//1 +f 15/1/1 215/2/1 214/3/1 +f 29/4/2 28/5/2 44/6/2 +f 13/7/3 29/4/3 30/8/3 +f 6/9/4 22/10/4 23/11/4 +f 14/12/5 30/8/5 31/13/5 +f 7/14/6 23/11/6 24/15/6 +f 15/1/7 31/13/7 32/16/7 +f 8/17/8 24/15/8 25/18/8 +f 1/19/9 18/20/9 17/21/9 +f 16/22/10 32/16/10 18/23/10 +f 9/24/11 25/18/11 26/25/11 +f 2/26/12 17/21/12 19/27/12 +f 10/28/13 26/25/13 27/29/13 +f 3/30/14 19/27/14 20/31/14 +f 11/32/15 27/29/15 28/5/15 +f 4/33/16 20/31/16 21/34/16 +f 12/35/17 28/5/17 29/4/17 +f 5/36/18 21/34/18 22/10/18 +f 33/37/12 49/38/12 51/39/12 +f 22/10/19 21/34/19 37/40/19 +f 30/8/20 29/4/20 45/41/20 +f 22/10/21 38/42/21 39/43/21 +f 30/8/22 46/44/22 47/45/22 +f 23/11/23 39/46/23 40/47/23 +f 31/13/24 47/48/24 48/49/24 +f 24/15/25 40/50/25 41/51/25 +f 18/20/26 34/52/26 33/53/26 +f 18/23/27 32/16/27 48/54/27 +f 25/18/28 41/55/28 42/56/28 +f 17/21/29 33/57/29 35/58/29 +f 26/25/30 42/59/30 43/60/30 +f 19/27/31 35/61/31 36/62/31 +f 27/29/32 43/63/32 44/64/32 +f 20/31/33 36/65/33 37/66/33 +f 55/67/34 71/68/34 72/69/34 +f 42/70/13 58/71/13 59/72/13 +f 35/73/14 51/39/14 52/74/14 +f 43/75/15 59/72/15 60/76/15 +f 36/77/16 52/74/16 53/78/16 +f 44/79/17 60/76/17 61/80/17 +f 37/81/18 53/78/18 54/82/18 +f 46/83/3 45/84/3 61/80/3 +f 38/85/4 54/82/4 55/67/4 +f 46/83/5 62/86/5 63/87/5 +f 39/88/6 55/67/6 56/89/6 +f 47/90/7 63/87/7 64/91/7 +f 40/92/8 56/89/8 57/93/8 +f 34/94/9 50/95/9 49/38/9 +f 48/96/10 64/91/10 50/97/10 +f 41/98/11 57/93/11 58/71/11 +f 73/99/35 177/100/35 178/101/35 +f 64/91/36 63/87/36 79/102/36 +f 56/89/37 72/103/37 73/104/37 +f 50/95/38 66/105/38 65/106/38 +f 64/91/39 80/107/39 66/108/39 +f 58/71/40 57/93/40 73/99/40 +f 49/38/41 65/109/41 67/110/41 +f 59/72/42 58/71/42 74/111/42 +f 51/39/43 67/112/43 68/113/43 +f 60/76/44 59/72/44 75/114/44 +f 52/74/45 68/115/45 69/116/45 +f 60/76/46 76/117/46 77/118/46 +f 53/78/47 69/119/47 70/120/47 +f 62/86/48 61/80/48 77/121/48 +f 54/82/49 70/122/49 71/123/49 +f 62/86/50 78/124/50 79/125/50 +f 100/126/51 108/127/51 107/128/51 +f 104/129/52 112/130/52 111/131/52 +f 98/132/53 106/133/53 105/134/53 +f 102/135/54 110/136/54 109/137/54 +f 96/138/17 112/130/17 104/129/17 +f 86/139/55 102/135/55 101/140/55 +f 93/141/3 85/142/3 99/143/3 +f 88/144/56 104/129/56 103/145/56 +f 89/146/18 81/147/18 103/145/18 +f 91/148/55 105/134/55 106/133/55 +f 90/149/10 106/133/10 98/132/10 +f 93/150/56 107/128/56 108/127/56 +f 94/151/8 110/136/8 102/135/8 +f 94/152/57 95/153/57 109/137/57 +f 91/154/11 83/155/11 97/156/11 +f 89/157/58 111/131/58 112/130/58 +f 82/158/57 98/132/57 97/156/57 +f 95/159/9 87/160/9 101/140/9 +f 92/161/16 108/127/16 100/126/16 +f 84/162/58 100/126/58 99/143/58 +f 116/163/10 118/164/10 117/165/10 +f 118/164/7 120/166/7 119/167/7 +f 120/166/5 122/168/5 121/169/5 +f 122/168/3 124/170/3 123/171/3 +f 124/170/17 126/172/17 125/173/17 +f 126/172/15 128/174/15 127/175/15 +f 128/174/13 130/176/13 129/177/13 +f 130/176/11 132/178/11 131/179/11 +f 132/178/8 134/180/8 133/181/8 +f 134/180/6 136/182/6 135/183/6 +f 136/182/4 138/184/4 137/185/4 +f 138/184/18 140/186/18 139/187/18 +f 140/186/16 142/188/16 141/189/16 +f 142/188/14 144/190/14 143/191/14 +f 136/192/1 128/193/1 120/194/1 +f 146/195/9 116/196/9 115/197/9 +f 144/190/12 146/195/12 145/198/12 +f 129/199/35 137/200/35 121/201/35 +f 150/202/59 149/203/59 157/204/59 +f 152/205/60 151/206/60 159/207/60 +f 153/208/61 113/209/61 114/210/61 +f 148/211/62 147/212/62 155/213/62 +f 168/214/63 167/215/63 151/206/63 +f 161/216/64 162/217/64 114/210/64 +f 164/218/65 163/219/65 147/212/65 +f 166/220/66 165/221/66 149/203/66 +f 157/204/67 165/222/67 166/223/67 +f 159/207/68 167/224/68 168/225/68 +f 153/208/69 154/226/69 162/227/69 +f 155/213/70 163/228/70 164/229/70 +f 151/206/71 167/230/71 159/207/71 +f 113/209/72 153/208/72 161/231/72 +f 114/210/73 162/232/73 154/226/73 +f 148/211/74 156/233/74 164/234/74 +f 147/212/75 163/235/75 155/213/75 +f 150/202/76 158/236/76 166/237/76 +f 149/203/77 165/238/77 157/204/77 +f 152/205/78 160/239/78 168/240/78 +f 176/241/8 192/242/8 193/243/8 +f 65/109/35 169/244/35 171/245/35 +f 74/111/35 178/101/35 179/246/35 +f 67/112/35 171/245/35 172/247/35 +f 75/114/35 179/246/35 180/248/35 +f 68/115/35 172/247/35 173/249/35 +f 76/117/35 180/248/35 181/250/35 +f 69/119/35 173/249/35 174/251/35 +f 78/252/35 77/121/35 181/250/35 +f 70/122/35 174/251/35 175/253/35 +f 79/125/35 78/124/35 182/254/35 +f 72/69/35 71/68/35 175/253/35 +f 80/255/35 79/102/35 183/256/35 +f 72/103/35 176/241/35 177/100/35 +f 65/106/35 66/105/35 170/257/35 +f 80/107/35 184/258/35 170/259/35 +f 195/260/35 189/261/35 187/262/35 +f 170/257/9 186/263/9 185/264/9 +f 184/258/10 200/265/10 186/266/10 +f 177/100/11 193/243/11 194/267/11 +f 169/244/12 185/264/12 187/268/12 +f 178/101/13 194/267/13 195/269/13 +f 171/245/14 187/268/14 188/270/14 +f 180/248/15 179/246/15 195/269/15 +f 172/247/16 188/270/16 189/271/16 +f 180/248/17 196/272/17 197/273/17 +f 174/251/18 173/249/18 189/271/18 +f 181/250/3 197/273/3 198/274/3 +f 174/251/4 190/275/4 191/276/4 +f 182/254/5 198/274/5 199/277/5 +f 175/253/6 191/276/6 192/242/6 +f 183/256/7 199/277/7 200/265/7 +f 215/278/5 231/279/5 230/280/5 +f 7/14/1 8/17/1 208/281/1 +f 15/1/1 16/22/1 216/282/1 +f 9/24/1 209/283/1 208/284/1 +f 1/19/1 2/26/1 201/285/1 +f 1/286/1 202/287/1 216/288/1 +f 9/24/1 10/28/1 210/289/1 +f 3/30/1 203/290/1 201/291/1 +f 11/32/1 211/292/1 210/293/1 +f 4/33/1 204/294/1 203/295/1 +f 12/35/1 212/296/1 211/297/1 +f 4/33/1 5/36/1 205/298/1 +f 13/7/1 213/299/1 212/300/1 +f 6/9/1 206/301/1 205/302/1 +f 14/12/1 214/303/1 213/304/1 +f 7/14/1 207/305/1 206/306/1 +f 208/307/6 224/308/6 223/309/6 +f 216/310/7 232/311/7 231/279/7 +f 209/312/8 225/313/8 224/308/8 +f 201/314/9 217/315/9 218/316/9 +f 202/317/10 218/316/10 232/311/10 +f 210/318/11 226/319/11 225/313/11 +f 203/320/12 219/321/12 217/315/12 +f 211/322/13 227/323/13 226/319/13 +f 204/324/14 220/325/14 219/321/14 +f 212/326/15 228/327/15 227/323/15 +f 205/328/16 221/329/16 220/325/16 +f 213/330/17 229/331/17 228/327/17 +f 206/332/18 222/333/18 221/329/18 +f 214/334/3 230/280/3 229/331/3 +f 207/335/4 223/309/4 222/333/4 +f 231/279/1 232/311/1 248/336/1 +f 218/316/1 233/337/1 248/336/1 +f 218/316/1 217/315/1 234/338/1 +f 219/321/1 235/339/1 234/338/1 +f 220/325/1 236/340/1 235/339/1 +f 220/325/1 221/329/1 237/341/1 +f 222/333/1 238/342/1 237/341/1 +f 222/333/1 223/309/1 239/343/1 +f 224/308/1 240/344/1 239/343/1 +f 225/313/1 241/345/1 240/344/1 +f 225/313/1 226/319/1 242/346/1 +f 226/319/1 227/323/1 243/347/1 +f 227/323/1 228/327/1 244/348/1 +f 228/327/1 229/331/1 245/349/1 +f 230/280/1 246/350/1 245/349/1 +f 231/279/1 247/351/1 246/350/1 +f 242/346/9 258/352/9 257/353/9 +f 257/354/1 263/355/1 250/356/1 +f 235/339/13 251/357/13 249/358/13 +f 243/347/12 259/359/12 258/360/12 +f 236/340/15 252/361/15 251/362/15 +f 244/348/14 260/363/14 259/364/14 +f 237/341/17 253/365/17 252/366/17 +f 245/349/16 261/367/16 260/368/16 +f 238/342/3 254/369/3 253/370/3 +f 246/350/18 262/371/18 261/372/18 +f 239/343/5 255/373/5 254/374/5 +f 247/351/4 263/375/4 262/376/4 +f 240/344/7 256/377/7 255/378/7 +f 248/336/6 264/379/6 263/380/6 +f 241/345/10 257/381/10 256/382/10 +f 234/338/11 249/383/11 250/384/11 +f 233/337/8 250/385/8 264/386/8 +f 268/387/57 267/388/57 265/389/57 +f 272/390/56 271/391/56 267/388/56 +f 270/392/55 269/393/55 271/391/55 +f 266/394/58 265/389/58 269/395/58 +f 276/396/57 275/397/57 273/398/57 +f 272/399/1 268/387/1 266/394/1 +f 280/400/56 279/401/56 275/397/56 +f 278/402/55 277/403/55 279/401/55 +f 274/404/58 273/398/58 277/405/58 +f 280/406/1 276/396/1 274/404/1 +f 284/407/57 283/408/57 281/409/57 +f 288/410/56 287/411/56 283/408/56 +f 286/412/55 285/413/55 287/411/55 +f 282/414/58 281/409/58 285/415/58 +f 288/416/1 284/407/1 282/414/1 +f 292/417/57 291/418/57 289/419/57 +f 296/420/56 295/421/56 291/418/56 +f 294/422/55 293/423/55 295/421/55 +f 290/424/58 289/419/58 293/425/58 +f 296/426/1 292/417/1 290/424/1 +f 300/427/57 299/428/57 297/429/57 +f 304/430/56 303/431/56 299/428/56 +f 302/432/55 301/433/55 303/431/55 +f 298/434/58 297/429/58 301/435/58 +f 304/436/1 300/427/1 298/434/1 +f 14/12/1 15/1/1 214/3/1 +f 45/437/2 29/4/2 44/6/2 +f 14/12/3 13/7/3 30/8/3 +f 7/14/4 6/9/4 23/11/4 +f 15/1/5 14/12/5 31/13/5 +f 8/17/6 7/14/6 24/15/6 +f 16/22/7 15/1/7 32/16/7 +f 9/24/8 8/17/8 25/18/8 +f 2/26/9 1/19/9 17/21/9 +f 1/286/10 16/22/10 18/23/10 +f 10/28/11 9/24/11 26/25/11 +f 3/30/12 2/26/12 19/27/12 +f 11/32/13 10/28/13 27/29/13 +f 4/33/14 3/30/14 20/31/14 +f 12/35/15 11/32/15 28/5/15 +f 5/36/16 4/33/16 21/34/16 +f 13/7/17 12/35/17 29/4/17 +f 6/9/18 5/36/18 22/10/18 +f 35/73/12 33/37/12 51/39/12 +f 38/438/19 22/10/19 37/40/19 +f 46/439/20 30/8/20 45/41/20 +f 23/11/21 22/10/21 39/43/21 +f 31/13/22 30/8/22 47/45/22 +f 24/15/23 23/11/23 40/47/23 +f 32/16/24 31/13/24 48/49/24 +f 25/18/25 24/15/25 41/51/25 +f 17/21/26 18/20/26 33/53/26 +f 34/440/27 18/23/27 48/54/27 +f 26/25/28 25/18/28 42/56/28 +f 19/27/29 17/21/29 35/58/29 +f 27/29/30 26/25/30 43/60/30 +f 20/31/31 19/27/31 36/62/31 +f 28/5/32 27/29/32 44/64/32 +f 21/34/33 20/31/33 37/66/33 +f 56/89/34 55/67/34 72/69/34 +f 43/75/13 42/70/13 59/72/13 +f 36/77/14 35/73/14 52/74/14 +f 44/79/15 43/75/15 60/76/15 +f 37/81/16 36/77/16 53/78/16 +f 45/84/17 44/79/17 61/80/17 +f 38/85/18 37/81/18 54/82/18 +f 62/86/3 46/83/3 61/80/3 +f 39/88/4 38/85/4 55/67/4 +f 47/90/5 46/83/5 63/87/5 +f 40/92/6 39/88/6 56/89/6 +f 48/96/7 47/90/7 64/91/7 +f 41/98/8 40/92/8 57/93/8 +f 33/37/9 34/94/9 49/38/9 +f 34/441/10 48/96/10 50/97/10 +f 42/70/11 41/98/11 58/71/11 +f 74/442/35 73/99/35 178/101/35 +f 80/255/36 64/91/36 79/102/36 +f 57/93/37 56/89/37 73/104/37 +f 49/38/38 50/95/38 65/106/38 +f 50/97/39 64/91/39 66/108/39 +f 74/442/40 58/71/40 73/99/40 +f 51/39/41 49/38/41 67/110/41 +f 75/443/42 59/72/42 74/111/42 +f 52/74/43 51/39/43 68/113/43 +f 76/444/44 60/76/44 75/114/44 +f 53/78/45 52/74/45 69/116/45 +f 61/80/46 60/76/46 77/118/46 +f 54/82/47 53/78/47 70/120/47 +f 78/252/48 62/86/48 77/121/48 +f 55/67/49 54/82/49 71/123/49 +f 63/87/50 62/86/50 79/125/50 +f 99/143/51 100/126/51 107/128/51 +f 103/145/52 104/129/52 111/131/52 +f 97/156/53 98/132/53 105/134/53 +f 101/140/54 102/135/54 109/137/54 +f 88/445/17 96/138/17 104/129/17 +f 87/446/55 86/139/55 101/140/55 +f 107/128/3 93/141/3 99/143/3 +f 81/447/56 88/144/56 103/145/56 +f 111/131/18 89/146/18 103/145/18 +f 90/448/55 91/148/55 106/133/55 +f 82/449/10 90/149/10 98/132/10 +f 92/450/56 93/150/56 108/127/56 +f 86/451/8 94/151/8 102/135/8 +f 110/136/57 94/152/57 109/137/57 +f 105/134/11 91/154/11 97/156/11 +f 96/452/58 89/157/58 112/130/58 +f 83/453/57 82/158/57 97/156/57 +f 109/137/9 95/159/9 101/140/9 +f 84/454/16 92/161/16 100/126/16 +f 85/455/58 84/162/58 99/143/58 +f 115/456/10 116/163/10 117/165/10 +f 117/165/7 118/164/7 119/167/7 +f 119/167/5 120/166/5 121/169/5 +f 121/169/3 122/168/3 123/171/3 +f 123/171/17 124/170/17 125/173/17 +f 125/173/15 126/172/15 127/175/15 +f 127/175/13 128/174/13 129/177/13 +f 129/177/11 130/176/11 131/179/11 +f 131/179/8 132/178/8 133/181/8 +f 133/181/6 134/180/6 135/183/6 +f 135/183/4 136/182/4 137/185/4 +f 137/185/18 138/184/18 139/187/18 +f 139/187/16 140/186/16 141/189/16 +f 141/189/14 142/188/14 143/191/14 +f 120/194/1 118/457/1 116/458/1 +f 116/458/1 146/459/1 120/194/1 +f 144/460/1 142/461/1 140/462/1 +f 140/462/1 138/463/1 136/192/1 +f 136/192/1 134/464/1 128/193/1 +f 132/465/1 130/466/1 128/193/1 +f 128/193/1 126/467/1 124/468/1 +f 124/468/1 122/469/1 120/194/1 +f 120/194/1 146/459/1 144/460/1 +f 144/460/1 140/462/1 120/194/1 +f 134/464/1 132/465/1 128/193/1 +f 128/193/1 124/468/1 120/194/1 +f 120/194/1 140/462/1 136/192/1 +f 145/198/9 146/195/9 115/197/9 +f 143/191/12 144/190/12 145/198/12 +f 145/470/35 115/471/35 117/472/35 +f 117/472/35 119/473/35 121/201/35 +f 121/201/35 123/474/35 125/475/35 +f 125/475/35 127/476/35 121/201/35 +f 129/199/35 131/477/35 133/478/35 +f 133/478/35 135/479/35 137/200/35 +f 137/200/35 139/480/35 141/481/35 +f 141/481/35 143/482/35 145/470/35 +f 145/470/35 117/472/35 121/201/35 +f 121/201/35 127/476/35 129/199/35 +f 129/199/35 133/478/35 137/200/35 +f 137/200/35 141/481/35 145/470/35 +f 145/470/35 121/201/35 137/200/35 +f 158/236/59 150/202/59 157/204/59 +f 160/239/60 152/205/60 159/207/60 +f 154/226/61 153/208/61 114/210/61 +f 156/233/62 148/211/62 155/213/62 +f 152/205/63 168/214/63 151/206/63 +f 113/209/64 161/216/64 114/210/64 +f 148/211/65 164/218/65 147/212/65 +f 150/202/66 166/220/66 149/203/66 +f 158/236/67 157/204/67 166/223/67 +f 160/239/68 159/207/68 168/225/68 +f 161/483/69 153/208/69 162/227/69 +f 156/233/70 155/213/70 164/229/70 +f 177/100/8 176/241/8 193/243/8 +f 67/110/35 65/109/35 171/245/35 +f 75/443/35 74/111/35 179/246/35 +f 68/113/35 67/112/35 172/247/35 +f 76/444/35 75/114/35 180/248/35 +f 69/116/35 68/115/35 173/249/35 +f 77/118/35 76/117/35 181/250/35 +f 70/120/35 69/119/35 174/251/35 +f 182/254/35 78/252/35 181/250/35 +f 71/123/35 70/122/35 175/253/35 +f 183/256/35 79/125/35 182/254/35 +f 176/241/35 72/69/35 175/253/35 +f 184/258/35 80/255/35 183/256/35 +f 73/104/35 72/103/35 177/100/35 +f 169/244/35 65/106/35 170/257/35 +f 66/108/35 80/107/35 170/259/35 +f 187/262/35 185/484/35 186/485/35 +f 186/485/35 200/486/35 199/487/35 +f 199/487/35 198/488/35 195/260/35 +f 197/489/35 196/490/35 195/260/35 +f 195/260/35 194/491/35 193/492/35 +f 193/492/35 192/493/35 195/260/35 +f 191/494/35 190/495/35 189/261/35 +f 189/261/35 188/496/35 187/262/35 +f 187/262/35 186/485/35 195/260/35 +f 198/488/35 197/489/35 195/260/35 +f 195/260/35 192/493/35 191/494/35 +f 191/494/35 189/261/35 195/260/35 +f 186/485/35 199/487/35 195/260/35 +f 169/244/9 170/257/9 185/264/9 +f 170/259/10 184/258/10 186/266/10 +f 178/101/11 177/100/11 194/267/11 +f 171/245/12 169/244/12 187/268/12 +f 179/246/13 178/101/13 195/269/13 +f 172/247/14 171/245/14 188/270/14 +f 196/272/15 180/248/15 195/269/15 +f 173/249/16 172/247/16 189/271/16 +f 181/250/17 180/248/17 197/273/17 +f 190/275/18 174/251/18 189/271/18 +f 182/254/3 181/250/3 198/274/3 +f 175/253/4 174/251/4 191/276/4 +f 183/256/5 182/254/5 199/277/5 +f 176/241/6 175/253/6 192/242/6 +f 184/258/7 183/256/7 200/265/7 +f 214/497/5 215/278/5 230/280/5 +f 207/498/1 7/14/1 208/281/1 +f 215/499/1 15/1/1 216/282/1 +f 8/17/1 9/24/1 208/284/1 +f 202/500/1 1/19/1 201/285/1 +f 16/22/1 1/286/1 216/288/1 +f 209/501/1 9/24/1 210/289/1 +f 2/26/1 3/30/1 201/291/1 +f 10/28/1 11/32/1 210/293/1 +f 3/30/1 4/33/1 203/295/1 +f 11/32/1 12/35/1 211/297/1 +f 204/502/1 4/33/1 205/298/1 +f 12/35/1 13/7/1 212/300/1 +f 5/36/1 6/9/1 205/302/1 +f 13/7/1 14/12/1 213/304/1 +f 6/9/1 7/14/1 206/306/1 +f 207/503/6 208/307/6 223/309/6 +f 215/504/7 216/310/7 231/279/7 +f 208/505/8 209/312/8 224/308/8 +f 202/506/9 201/314/9 218/316/9 +f 216/507/10 202/317/10 232/311/10 +f 209/508/11 210/318/11 225/313/11 +f 201/509/12 203/320/12 217/315/12 +f 210/510/13 211/322/13 226/319/13 +f 203/511/14 204/324/14 219/321/14 +f 211/512/15 212/326/15 227/323/15 +f 204/513/16 205/328/16 220/325/16 +f 212/514/17 213/330/17 228/327/17 +f 205/515/18 206/332/18 221/329/18 +f 213/516/3 214/334/3 229/331/3 +f 206/517/4 207/335/4 222/333/4 +f 247/351/1 231/279/1 248/336/1 +f 232/311/1 218/316/1 248/336/1 +f 233/337/1 218/316/1 234/338/1 +f 217/315/1 219/321/1 234/338/1 +f 219/321/1 220/325/1 235/339/1 +f 236/340/1 220/325/1 237/341/1 +f 221/329/1 222/333/1 237/341/1 +f 238/342/1 222/333/1 239/343/1 +f 223/309/1 224/308/1 239/343/1 +f 224/308/1 225/313/1 240/344/1 +f 241/345/1 225/313/1 242/346/1 +f 242/346/1 226/319/1 243/347/1 +f 243/347/1 227/323/1 244/348/1 +f 244/348/1 228/327/1 245/349/1 +f 229/331/1 230/280/1 245/349/1 +f 230/280/1 231/279/1 246/350/1 +f 241/345/9 242/346/9 257/353/9 +f 250/356/1 249/518/1 251/519/1 +f 251/519/1 252/520/1 253/521/1 +f 253/521/1 254/522/1 257/354/1 +f 255/523/1 256/524/1 257/354/1 +f 257/354/1 258/525/1 259/526/1 +f 259/526/1 260/527/1 257/354/1 +f 261/528/1 262/529/1 263/355/1 +f 263/355/1 264/530/1 250/356/1 +f 250/356/1 251/519/1 257/354/1 +f 254/522/1 255/523/1 257/354/1 +f 257/354/1 260/527/1 261/528/1 +f 261/528/1 263/355/1 257/354/1 +f 251/519/1 253/521/1 257/354/1 +f 234/338/13 235/339/13 249/358/13 +f 242/346/12 243/347/12 258/360/12 +f 235/339/15 236/340/15 251/362/15 +f 243/347/14 244/348/14 259/364/14 +f 236/340/17 237/341/17 252/366/17 +f 244/348/16 245/349/16 260/368/16 +f 237/341/3 238/342/3 253/370/3 +f 245/349/18 246/350/18 261/372/18 +f 238/342/5 239/343/5 254/374/5 +f 246/350/4 247/351/4 262/376/4 +f 239/343/7 240/344/7 255/378/7 +f 247/351/6 248/336/6 263/380/6 +f 240/344/10 241/345/10 256/382/10 +f 233/337/11 234/338/11 250/384/11 +f 248/336/8 233/337/8 264/386/8 +f 266/394/57 268/387/57 265/389/57 +f 268/387/56 272/390/56 267/388/56 +f 272/390/55 270/392/55 271/391/55 +f 270/531/58 266/394/58 269/395/58 +f 274/404/57 276/396/57 273/398/57 +f 270/532/1 272/399/1 266/394/1 +f 276/396/56 280/400/56 275/397/56 +f 280/400/55 278/402/55 279/401/55 +f 278/533/58 274/404/58 277/405/58 +f 278/534/1 280/406/1 274/404/1 +f 282/414/57 284/407/57 281/409/57 +f 284/407/56 288/410/56 283/408/56 +f 288/410/55 286/412/55 287/411/55 +f 286/535/58 282/414/58 285/415/58 +f 286/536/1 288/416/1 282/414/1 +f 290/424/57 292/417/57 289/419/57 +f 292/417/56 296/420/56 291/418/56 +f 296/420/55 294/422/55 295/421/55 +f 294/537/58 290/424/58 293/425/58 +f 294/538/1 296/426/1 290/424/1 +f 298/434/57 300/427/57 297/429/57 +f 300/427/56 304/430/56 299/428/56 +f 304/430/55 302/432/55 303/431/55 +f 302/539/58 298/434/58 301/435/58 +f 302/540/1 304/436/1 298/434/1 diff --git a/assets/hbm/models/ams_limiter.obj b/assets/hbm/models/ams_limiter.obj index 8b0661550..e328f0724 100644 --- a/assets/hbm/models/ams_limiter.obj +++ b/assets/hbm/models/ams_limiter.obj @@ -1,6 +1,6 @@ # Blender v2.76 (sub 0) OBJ File: 'ams_limiter.blend' # www.blender.org -o Cube.001_Cube.000 +o Cube.001_Cube.002 v 0.500001 0.000000 -2.500000 v 0.250001 1.000000 -2.000000 v 0.500000 0.000000 2.500000 @@ -11,12 +11,12 @@ v -0.500000 0.000000 2.500000 v -0.250000 1.000000 2.500000 v 0.156251 0.343750 -2.500000 v 0.156251 0.656250 -2.500000 -v 0.156251 0.343750 -1.500000 -v 0.156251 0.656250 -1.500000 +v 0.156251 0.343750 -2.150000 +v 0.156251 0.656250 -2.150000 v -0.156249 0.343750 -2.500000 v -0.156249 0.656250 -2.500000 -v -0.156249 0.343750 -1.500000 -v -0.156249 0.656250 -1.500000 +v -0.156249 0.343750 -2.150000 +v -0.156249 0.656250 -2.150000 v -0.500000 0.343750 -0.156250 v -0.500000 0.656250 -0.156250 v 0.500000 0.343750 -0.156250 @@ -173,30 +173,605 @@ v -0.375000 1.000000 1.031250 v -0.375000 1.331456 1.168544 v -0.375000 1.468750 1.500000 v -0.375000 1.331456 1.831456 -v -0.249999 6.500000 -2.000000 -v -0.249999 1.000000 -1.875000 -v -0.249999 6.500000 -1.875000 -v -0.249999 5.437500 -2.187500 -v -0.249999 5.562500 -2.187500 -v -0.250000 5.437500 -0.937500 -v -0.250000 5.562500 -0.937500 -v -0.343749 5.593750 -2.031250 -v -0.343749 5.406250 -2.031250 -v -0.343749 5.593750 -1.843750 -v -0.343749 5.406250 -1.843750 -v -0.156249 5.406250 -2.031250 -v -0.156249 5.593750 -2.031250 -v -0.156249 5.406250 -1.843750 -v -0.156249 5.593750 -1.843750 +v 0.125000 5.550000 -1.000000 +v 0.125001 5.550000 -1.500000 +v 0.081699 5.525000 -1.000000 +v 0.081699 5.525000 -1.500000 +v 0.081699 5.475000 -1.000000 +v 0.081699 5.475000 -1.500000 +v 0.125000 5.450000 -1.000000 +v 0.125001 5.450000 -1.500000 +v 0.168302 5.475000 -1.000000 +v 0.168302 5.475000 -1.500000 +v 0.168302 5.525000 -1.000000 +v 0.168302 5.525000 -1.500000 +v -0.125000 5.550000 -1.000000 +v -0.124999 5.550000 -1.500000 +v -0.168301 5.525000 -1.000000 +v -0.168301 5.525000 -1.500000 +v -0.168301 5.475000 -1.000000 +v -0.168301 5.475000 -1.500000 +v -0.125000 5.450000 -1.000000 +v -0.124999 5.450000 -1.500000 +v -0.081698 5.475000 -1.000000 +v -0.081698 5.475000 -1.500000 +v -0.081698 5.525000 -1.000000 +v -0.081698 5.525000 -1.500000 +v 0.081699 5.493492 -1.608551 +v 0.125001 5.516984 -1.617101 +v 0.081699 5.446507 -1.591449 +v 0.125001 5.423015 -1.582899 +v 0.168302 5.446507 -1.591449 +v 0.168302 5.493492 -1.608551 +v -0.168301 5.493492 -1.608551 +v -0.124999 5.516984 -1.617101 +v -0.168301 5.446507 -1.591449 +v -0.124999 5.423015 -1.582899 +v -0.081698 5.446507 -1.591449 +v -0.081698 5.493492 -1.608551 +v 0.081699 5.404948 -1.710039 +v 0.125001 5.424099 -1.726108 +v 0.081699 5.366646 -1.677899 +v 0.125001 5.347495 -1.661829 +v 0.168302 5.366646 -1.677899 +v 0.168302 5.404948 -1.710039 +v -0.168301 5.404948 -1.710039 +v -0.124999 5.424099 -1.726108 +v -0.168301 5.366646 -1.677899 +v -0.124999 5.347495 -1.661829 +v -0.081698 5.366646 -1.677899 +v -0.081698 5.404948 -1.710039 +v 0.081699 5.291929 -1.776042 +v 0.125001 5.296270 -1.800662 +v 0.081699 5.283247 -1.726802 +v 0.125001 5.278905 -1.702182 +v 0.168302 5.283247 -1.726802 +v 0.168302 5.291929 -1.776042 +v -0.168301 5.291929 -1.776042 +v -0.124999 5.296270 -1.800662 +v -0.168301 5.283247 -1.726802 +v -0.124999 5.278905 -1.702182 +v -0.081698 5.283247 -1.726802 +v -0.081698 5.291929 -1.776042 +v 0.081699 5.139866 -1.802469 +v 0.125001 5.139866 -1.827469 +v 0.081699 5.139866 -1.752469 +v 0.125001 5.139866 -1.727469 +v 0.168302 5.139866 -1.752469 +v 0.168302 5.139866 -1.802469 +v -0.168301 5.139866 -1.802469 +v -0.124999 5.139866 -1.827469 +v -0.168301 5.139866 -1.752469 +v -0.124999 5.139866 -1.727469 +v -0.081698 5.139866 -1.752469 +v -0.081698 5.139866 -1.802469 +v 0.081690 0.999866 -1.802482 +v 0.124992 0.999866 -1.827482 +v 0.081690 0.999866 -1.752481 +v 0.124992 0.999866 -1.727482 +v 0.168293 0.999866 -1.752481 +v 0.168293 0.999866 -1.802482 +v -0.168310 0.999866 -1.802482 +v -0.125008 0.999866 -1.827482 +v -0.168310 0.999866 -1.752481 +v -0.125008 0.999866 -1.727482 +v -0.081707 0.999866 -1.752481 +v -0.081707 0.999866 -1.802482 +v -0.250000 6.875000 -0.437500 +v -0.250000 6.875000 -0.312500 +v -0.250000 5.875000 -0.437500 +v -0.250000 5.875000 -0.312500 +v 0.250000 6.375000 -0.437500 +v 0.250000 6.375000 -0.312500 +v 0.250000 5.875000 -0.437500 +v 0.250000 5.875000 -0.312500 +vt 0.516018 0.105402 +vt 0.605530 0.083024 +vt 0.605530 0.172537 +vt 0.113213 0.150158 +vt 0.013135 0.172537 +vt 0.013135 0.083024 +vt 0.709461 0.897353 +vt 0.709461 0.986865 +vt 0.261900 0.986865 +vt 0.516018 0.013135 +vt 0.113213 0.105402 +vt 0.516018 0.150158 +vt 0.516018 0.242426 +vt 0.691103 0.097053 +vt 0.691103 0.125026 +vt 0.659773 0.125026 +vt 0.659773 0.069080 +vt 0.659773 0.041108 +vt 0.691103 0.041108 +vt 0.659773 0.097053 +vt 0.631801 0.097053 +vt 0.631801 0.069080 +vt 0.691103 0.013135 +vt 0.691103 0.069080 +vt 0.041108 0.624951 +vt 0.041108 0.596979 +vt 0.130620 0.596979 +vt 0.041108 0.652924 +vt 0.013135 0.652924 +vt 0.013135 0.624951 +vt 0.130620 0.652924 +vt 0.130620 0.680896 +vt 0.041108 0.680896 +vt 0.130620 0.624951 +vt 0.158593 0.624951 +vt 0.158593 0.652924 +vt 0.041108 0.569006 +vt 0.130620 0.569006 +vt 0.043602 0.405716 +vt 0.043602 0.371461 +vt 0.312139 0.371461 +vt 0.043602 0.337206 +vt 0.312139 0.337207 +vt 0.043603 0.302951 +vt 0.312139 0.302952 +vt 0.043603 0.268696 +vt 0.312139 0.268697 +vt 0.043602 0.542735 +vt 0.043602 0.508480 +vt 0.312139 0.508481 +vt 0.043602 0.474225 +vt 0.312139 0.474226 +vt 0.013135 0.465662 +vt 0.013135 0.448534 +vt 0.312139 0.439971 +vt 0.043602 0.439971 +vt 0.322476 0.307234 +vt 0.717291 0.621272 +vt 0.708727 0.641946 +vt 0.684992 0.632115 +vt 0.322476 0.478508 +vt 0.322476 0.504199 +vt 0.322477 0.272979 +vt 0.322476 0.444253 +vt 0.322476 0.341489 +vt 0.322476 0.367180 +vt 0.322476 0.512762 +vt 0.322476 0.538453 +vt 0.312139 0.405716 +vt 0.322476 0.409998 +vt 0.322476 0.375743 +vt 0.322476 0.401434 +vt 0.684992 0.699249 +vt 0.651425 0.665682 +vt 0.640582 0.633383 +vt 0.661256 0.641946 +vt 0.652692 0.710092 +vt 0.661256 0.689417 +vt 0.729402 0.697981 +vt 0.708727 0.689417 +vt 0.718559 0.665682 +vt 0.676428 0.611440 +vt 0.630750 0.674246 +vt 0.693555 0.719924 +vt 0.739233 0.657118 +vt 0.116936 0.719278 +vt 0.146174 0.707167 +vt 0.129047 0.748516 +vt 0.013136 0.362897 +vt 0.013136 0.345770 +vt 0.013135 0.534171 +vt 0.013135 0.517044 +vt 0.013136 0.431407 +vt 0.013136 0.397152 +vt 0.013136 0.380024 +vt 0.013136 0.328642 +vt 0.013136 0.311515 +vt 0.013135 0.499917 +vt 0.013136 0.294387 +vt 0.521369 0.509715 +vt 0.476613 0.509715 +vt 0.476613 0.268696 +vt 0.393503 0.301940 +vt 0.393503 0.542959 +vt 0.348747 0.542959 +vt 0.521369 0.268696 +vt 0.604479 0.301940 +vt 0.846852 0.521875 +vt 0.783557 0.585170 +vt 0.783557 0.331991 +vt 0.738801 0.585170 +vt 0.738801 0.331991 +vt 0.630750 0.268696 +vt 0.675506 0.268696 +vt 0.675506 0.521875 +vt 0.470636 0.695844 +vt 0.470632 0.707033 +vt 0.438518 0.707022 +vt 0.561630 0.682954 +vt 0.556273 0.695874 +vt 0.524159 0.695863 +vt 0.518842 0.593427 +vt 0.561661 0.593442 +vt 0.384999 0.695815 +vt 0.384995 0.707004 +vt 0.352881 0.706993 +vt 0.347537 0.682880 +vt 0.390356 0.682895 +vt 0.604479 0.593457 +vt 0.427818 0.695830 +vt 0.427814 0.707019 +vt 0.395700 0.707008 +vt 0.342181 0.695800 +vt 0.310067 0.695789 +vt 0.261900 0.682851 +vt 0.261931 0.593339 +vt 0.304750 0.593353 +vt 0.513455 0.695859 +vt 0.513451 0.707048 +vt 0.481337 0.707037 +vt 0.433174 0.682910 +vt 0.475993 0.682925 +vt 0.347568 0.593368 +vt 0.654509 0.228826 +vt 0.631801 0.174004 +vt 0.686623 0.151296 +vt 0.304719 0.682866 +vt 0.299362 0.695785 +vt 0.390387 0.593383 +vt 0.267248 0.695774 +vt 0.299358 0.706974 +vt 0.433205 0.593398 +vt 0.524199 0.580507 +vt 0.476024 0.593412 +vt 0.566978 0.695878 +vt 0.599092 0.695889 +vt 0.599088 0.707078 +vt 0.604448 0.682969 +vt 0.518811 0.682939 +vt 0.556269 0.707063 +vt 0.342177 0.706989 +vt 0.310063 0.706978 +vt 0.352925 0.580448 +vt 0.352929 0.569259 +vt 0.385043 0.569270 +vt 0.267288 0.580419 +vt 0.299402 0.580430 +vt 0.438562 0.580478 +vt 0.470676 0.580489 +vt 0.310106 0.580434 +vt 0.481381 0.580493 +vt 0.513494 0.580504 +vt 0.385039 0.580459 +vt 0.567018 0.580522 +vt 0.395743 0.580463 +vt 0.427857 0.580474 +vt 0.067957 0.784697 +vt 0.013135 0.729875 +vt 0.035843 0.707167 +vt 0.267292 0.569230 +vt 0.299406 0.569241 +vt 0.524203 0.569318 +vt 0.556317 0.569329 +vt 0.481384 0.569304 +vt 0.513498 0.569315 +vt 0.395747 0.569274 +vt 0.427861 0.569285 +vt 0.310110 0.569245 +vt 0.342224 0.569256 +vt 0.567021 0.569333 +vt 0.599135 0.569344 +vt 0.438566 0.569289 +vt 0.470680 0.569300 +vt 0.438527 0.859893 +vt 0.470641 0.859893 +vt 0.470641 0.871082 +vt 0.561630 0.846971 +vt 0.556278 0.859893 +vt 0.524164 0.859893 +vt 0.518811 0.757459 +vt 0.561630 0.757459 +vt 0.352890 0.859893 +vt 0.385003 0.859893 +vt 0.385003 0.871082 +vt 0.347537 0.846971 +vt 0.390356 0.846971 +vt 0.604448 0.757459 +vt 0.604448 0.846971 +vt 0.395708 0.859893 +vt 0.427822 0.859893 +vt 0.427822 0.871082 +vt 0.304719 0.846971 +vt 0.342185 0.859893 +vt 0.261900 0.846971 +vt 0.261900 0.757459 +vt 0.304719 0.757459 +vt 0.481345 0.859893 +vt 0.513459 0.859893 +vt 0.513459 0.871082 +vt 0.433174 0.846971 +vt 0.475993 0.846971 +vt 0.347537 0.757459 +vt 0.758309 0.228826 +vt 0.735601 0.174004 +vt 0.790423 0.151296 +vt 0.299366 0.859893 +vt 0.267253 0.859893 +vt 0.390356 0.757459 +vt 0.299366 0.871082 +vt 0.267253 0.871082 +vt 0.433174 0.757459 +vt 0.524164 0.744537 +vt 0.556278 0.744537 +vt 0.475993 0.757459 +vt 0.518811 0.846971 +vt 0.599096 0.859893 +vt 0.599096 0.871082 +vt 0.566982 0.871082 +vt 0.566982 0.859893 +vt 0.556278 0.871082 +vt 0.524164 0.871082 +vt 0.342185 0.871082 +vt 0.310071 0.871082 +vt 0.352890 0.744537 +vt 0.352890 0.733348 +vt 0.385003 0.733348 +vt 0.267253 0.744537 +vt 0.299366 0.744537 +vt 0.438527 0.744537 +vt 0.470641 0.744537 +vt 0.310071 0.744537 +vt 0.342185 0.744537 +vt 0.481345 0.744537 +vt 0.566982 0.744537 +vt 0.599096 0.744537 +vt 0.395708 0.744537 +vt 0.772195 0.090665 +vt 0.717373 0.035843 +vt 0.740081 0.013135 +vt 0.267253 0.733348 +vt 0.299366 0.733348 +vt 0.524164 0.733348 +vt 0.556278 0.733348 +vt 0.513459 0.744537 +vt 0.481345 0.733348 +vt 0.395708 0.733348 +vt 0.427822 0.733348 +vt 0.310071 0.733348 +vt 0.342185 0.733348 +vt 0.566982 0.733348 +vt 0.599096 0.733348 +vt 0.438527 0.733348 +vt 0.683393 0.776958 +vt 0.683397 0.772483 +vt 0.728153 0.772514 +vt 0.683400 0.768007 +vt 0.728156 0.768038 +vt 0.683403 0.763532 +vt 0.728159 0.763562 +vt 0.683384 0.790385 +vt 0.683387 0.785910 +vt 0.728143 0.785941 +vt 0.067126 0.838324 +vt 0.057306 0.839516 +vt 0.056666 0.834944 +vt 0.683390 0.781434 +vt 0.728149 0.776989 +vt 0.728146 0.781465 +vt 0.067317 0.834080 +vt 0.066793 0.829709 +vt 0.111004 0.829580 +vt 0.066780 0.825287 +vt 0.110991 0.825159 +vt 0.066768 0.820866 +vt 0.110979 0.820738 +vt 0.066750 0.847211 +vt 0.066794 0.842732 +vt 0.110975 0.842887 +vt 0.679218 0.789685 +vt 0.671459 0.788850 +vt 0.671862 0.784393 +vt 0.067202 0.838328 +vt 0.111004 0.834165 +vt 0.110989 0.838576 +vt 0.051678 0.847609 +vt 0.041772 0.846616 +vt 0.042374 0.842100 +vt 0.674160 0.762194 +vt 0.673319 0.766590 +vt 0.663549 0.762649 +vt 0.672605 0.775473 +vt 0.682812 0.763577 +vt 0.682763 0.768052 +vt 0.674299 0.766685 +vt 0.058174 0.843923 +vt 0.673379 0.771065 +vt 0.058930 0.848395 +vt 0.064349 0.820957 +vt 0.065236 0.825426 +vt 0.056517 0.825834 +vt 0.056515 0.830390 +vt 0.682187 0.781268 +vt 0.672159 0.779927 +vt 0.680381 0.785363 +vt 0.038883 0.840757 +vt 0.036783 0.844800 +vt 0.029879 0.842581 +vt 0.662835 0.762464 +vt 0.655296 0.758216 +vt 0.658138 0.754759 +vt 0.043747 0.833091 +vt 0.665255 0.786642 +vt 0.655933 0.783690 +vt 0.657422 0.779469 +vt 0.053036 0.843260 +vt 0.043082 0.837599 +vt 0.660559 0.771086 +vt 0.055520 0.825944 +vt 0.044376 0.828578 +vt 0.667438 0.782735 +vt 0.659011 0.775285 +vt 0.055241 0.839272 +vt 0.662075 0.766875 +vt 0.055439 0.821388 +vt 0.044962 0.824060 +vt 0.670362 0.779347 +vt 0.654719 0.757648 +vt 0.644624 0.749397 +vt 0.647751 0.746194 +vt 0.649032 0.764560 +vt 0.646170 0.768001 +vt 0.635538 0.759179 +vt 0.030897 0.828999 +vt 0.033010 0.824962 +vt 0.654338 0.777474 +vt 0.651504 0.780938 +vt 0.645314 0.777412 +vt 0.041651 0.837137 +vt 0.030494 0.838066 +vt 0.651878 0.761106 +vt 0.035812 0.821368 +vt 0.657728 0.774552 +vt 0.646816 0.773195 +vt 0.030287 0.833514 +vt 0.044212 0.824025 +vt 0.037921 0.817330 +vt 0.647535 0.768778 +vt 0.900024 0.577110 +vt 0.900024 0.268841 +vt 0.905404 0.268870 +vt 0.883884 0.577024 +vt 0.883883 0.268754 +vt 0.889263 0.268783 +vt 0.026627 0.837050 +vt 0.024485 0.841071 +vt 0.013135 0.834985 +vt 0.018102 0.822262 +vt 0.020558 0.818424 +vt 0.643304 0.771438 +vt 0.640433 0.774872 +vt 0.630750 0.766732 +vt 0.028765 0.833026 +vt 0.014921 0.830793 +vt 0.638090 0.755503 +vt 0.641225 0.752309 +vt 0.023335 0.814812 +vt 0.633312 0.763062 +vt 0.016327 0.826458 +vt 0.035119 0.820923 +vt 0.025781 0.810967 +vt 0.765504 0.700952 +vt 0.765504 0.611440 +vt 0.776693 0.611440 +vt 0.184864 0.877276 +vt 0.184863 0.569006 +vt 0.190244 0.569035 +vt 0.201005 0.877362 +vt 0.201004 0.569093 +vt 0.206384 0.569122 +vt 0.873123 0.576966 +vt 0.873122 0.268696 +vt 0.878502 0.268725 +vt 0.190244 0.877304 +vt 0.195624 0.569064 +vt 0.889264 0.577052 +vt 0.894643 0.268812 +vt 0.206385 0.877391 +vt 0.211765 0.569151 +vt 0.878503 0.576995 +vt 0.195625 0.877333 +vt 0.894644 0.577081 +vt 0.211766 0.877420 +vt 0.217145 0.569180 +vt 0.765504 0.771979 +vt 0.765504 0.727223 +vt 0.776693 0.727223 +vt 0.261900 0.897353 +vt 0.068457 0.013135 +vt 0.068457 0.242426 +vt 0.659773 0.013135 +vt 0.312139 0.542735 +vt 0.322476 0.332925 +vt 0.693555 0.611440 +vt 0.322476 0.298670 +vt 0.322476 0.469944 +vt 0.322476 0.435689 +vt 0.630750 0.657118 +vt 0.676428 0.719924 +vt 0.739233 0.674246 +vt 0.652692 0.621272 +vt 0.640582 0.697981 +vt 0.717291 0.710092 +vt 0.729402 0.633383 +vt 0.158285 0.736405 +vt 0.146174 0.748516 +vt 0.116936 0.736405 +vt 0.129047 0.707167 +vt 0.158285 0.719278 +vt 0.013136 0.414279 +vt 0.013135 0.482789 +vt 0.013136 0.277260 +vt 0.348747 0.301940 +vt 0.604479 0.542959 +vt 0.846852 0.268696 +vt 0.630750 0.521875 +vt 0.438522 0.695833 +vt 0.352885 0.695804 +vt 0.395704 0.695819 +vt 0.481341 0.695848 +vt 0.709330 0.174004 +vt 0.709330 0.206118 +vt 0.686623 0.228826 +vt 0.631801 0.206118 +vt 0.654509 0.151296 +vt 0.267244 0.706963 +vt 0.556313 0.580518 +vt 0.566974 0.707067 +vt 0.524155 0.707052 +vt 0.342220 0.580445 +vt 0.599131 0.580533 +vt 0.067957 0.707167 +vt 0.090665 0.729875 +vt 0.090665 0.761989 +vt 0.035843 0.784697 +vt 0.013135 0.761989 +vt 0.438527 0.871082 +vt 0.352890 0.871082 +vt 0.395708 0.871082 +vt 0.310071 0.859893 +vt 0.481345 0.871082 +vt 0.813131 0.174004 +vt 0.813131 0.206118 +vt 0.790423 0.228826 +vt 0.735601 0.206118 +vt 0.758309 0.151296 +vt 0.385003 0.744537 +vt 0.427822 0.744537 +vt 0.772195 0.013135 +vt 0.794903 0.035843 +vt 0.794903 0.067957 +vt 0.740081 0.090665 +vt 0.717373 0.067957 +vt 0.513459 0.733348 +vt 0.470641 0.733348 +vt 0.728140 0.790416 +vt 0.110965 0.847308 +vt 0.665123 0.758459 +vt 0.675116 0.762285 +vt 0.056411 0.821279 +vt 0.664346 0.758251 +vt 0.045654 0.819556 +vt 0.657556 0.754186 +vt 0.044837 0.819511 +vt 0.905405 0.577139 +vt 0.037222 0.816881 +vt 0.776693 0.700952 +vt 0.217146 0.877449 +vt 0.776693 0.771979 vn 0.000000 0.000000 1.000000 vn 0.000000 0.447200 -0.894400 vn 0.000000 -1.000000 0.000000 -vn -1.000000 0.000000 -0.000000 vn -0.970100 0.242500 -0.000000 vn 0.970100 0.242500 0.000000 vn 1.000000 0.000000 0.000000 +vn -1.000000 0.000000 -0.000000 vn 0.000000 0.000000 -1.000000 -vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 -0.000000 vn -0.382700 0.923900 -0.000000 vn -0.923900 0.382700 -0.000000 vn -0.923900 -0.382700 -0.000000 @@ -225,334 +800,502 @@ vn 0.000000 0.382700 -0.923900 vn 0.000000 0.923900 0.382700 vn 0.000000 0.923900 -0.382700 vn 0.000000 0.382700 0.923900 +vn -0.500000 0.866000 0.000000 +vn -0.500000 -0.866000 0.000000 +vn 0.500000 -0.866000 -0.000000 +vn 0.499200 0.832200 -0.241500 +vn 0.500000 0.866000 -0.000000 +vn 0.499800 -0.823600 0.268100 +vn 0.499200 -0.626100 0.599000 +vn -0.470000 -0.648400 0.598900 +vn -0.485700 0.841300 -0.237200 +vn -0.482700 -0.836100 0.260500 +vn 0.478000 -0.445400 0.757100 +vn -0.476000 -0.444900 0.758700 +vn -0.475800 0.669500 -0.570400 +vn 0.499900 0.652600 -0.569400 +vn -0.494100 -0.153200 0.855800 +vn 0.500000 0.148300 -0.853200 +vn -0.476300 0.443000 -0.759600 +vn 0.477500 0.443100 -0.758700 +vn -0.500000 -0.000000 0.866000 +vn 0.500000 0.000000 -0.866000 +vn 0.500000 -0.155000 0.852000 +vn -0.494600 0.146800 -0.856600 +vn 0.500000 -0.000000 0.866000 +vn -0.500000 0.000000 -0.866000 +vn 0.485700 0.841300 -0.237200 +vn 0.482700 -0.836100 0.260500 +vn 0.470000 -0.648400 0.598900 +vn -0.499200 -0.626100 0.599000 +vn -0.499200 0.832200 -0.241500 +vn -0.499800 -0.823600 0.268100 +vn 0.476000 -0.444900 0.758700 +vn -0.478000 -0.445400 0.757100 +vn -0.499900 0.652600 -0.569400 +vn 0.475800 0.669500 -0.570400 +vn -0.500000 -0.155000 0.852100 +vn 0.494600 0.146800 -0.856600 +vn -0.477500 0.443100 -0.758700 +vn 0.476300 0.443000 -0.759600 +vn 0.494100 -0.153200 0.855800 +vn -0.500000 0.148300 -0.853200 s off -f 8//1 7//1 3//1 -f 2//2 1//2 5//2 -f 3//3 7//3 5//3 -f 173//4 6//4 174//4 -f 8//5 174//5 7//5 -f 2//6 4//6 3//6 -f 12//7 11//7 9//7 -f 16//1 15//1 11//1 -f 14//4 13//4 15//4 -f 10//8 9//8 13//8 -f 11//3 15//3 13//3 -f 16//9 12//9 10//9 -f 20//8 19//8 17//8 -f 24//7 23//7 19//7 -f 22//1 21//1 23//1 -f 18//4 17//4 21//4 -f 19//3 23//3 21//3 -f 24//9 20//9 18//9 -f 26//10 28//10 27//10 -f 28//11 30//11 29//11 -f 30//12 32//12 31//12 -f 32//13 34//13 33//13 -f 34//14 36//14 35//14 -f 36//15 38//15 37//15 -f 38//16 63//16 64//16 -f 39//17 40//17 26//17 -f 38//18 40//18 39//18 -f 29//1 31//1 44//1 -f 41//17 49//17 56//17 -f 37//1 47//1 46//1 -f 31//1 33//1 45//1 -f 37//1 39//1 48//1 -f 29//1 43//1 42//1 -f 35//1 46//1 45//1 -f 39//1 25//1 41//1 -f 27//1 42//1 41//1 -f 52//1 54//1 56//1 -f 47//15 55//15 54//15 -f 45//13 53//13 52//13 -f 43//11 51//11 50//11 -f 48//18 56//18 55//18 -f 46//14 54//14 53//14 -f 44//12 52//12 51//12 -f 42//10 50//10 49//10 -f 63//8 61//8 58//8 -f 28//19 57//19 59//19 -f 34//20 61//20 62//20 -f 26//21 40//21 64//21 -f 26//22 58//22 57//22 -f 30//23 59//23 60//23 -f 38//24 36//24 62//24 -f 34//25 32//25 60//25 -f 72//26 71//26 67//26 -f 65//27 69//27 70//27 -f 71//7 69//7 65//7 -f 72//4 68//4 66//4 -f 66//4 68//4 76//4 -f 67//28 75//28 76//28 -f 74//29 73//29 65//29 -f 65//7 73//7 75//7 -f 100//30 101//30 103//30 -f 81//7 77//7 78//7 -f 80//31 82//31 81//31 -f 98//31 104//31 105//31 -f 87//7 89//7 98//7 -f 81//32 82//32 84//32 -f 99//32 103//32 104//32 -f 87//7 97//7 96//7 -f 83//30 84//30 86//30 -f 78//33 102//33 101//33 -f 91//7 93//7 100//7 -f 86//33 88//33 87//33 -f 106//7 104//7 101//7 -f 83//7 85//7 96//7 -f 88//34 90//34 89//34 -f 89//7 91//7 99//7 -f 95//35 96//35 106//35 -f 90//36 92//36 91//36 -f 82//4 80//4 110//4 -f 93//37 94//37 80//37 -f 92//35 94//35 93//35 -f 77//36 95//36 107//36 -f 83//7 95//7 77//7 -f 93//7 79//7 78//7 -f 78//34 77//34 108//34 -f 97//37 105//37 106//37 -f 113//31 121//31 122//31 -f 84//4 111//4 112//4 -f 92//4 115//4 116//4 -f 88//4 86//4 112//4 -f 94//4 116//4 110//4 -f 88//4 113//4 114//4 -f 84//4 82//4 109//4 -f 90//4 114//4 115//4 -f 123//4 120//4 119//4 -f 111//35 119//35 120//35 -f 110//34 118//34 117//34 -f 116//33 124//33 118//33 -f 114//32 122//32 123//32 -f 112//37 120//37 121//37 -f 109//36 117//36 119//36 -f 115//30 123//30 124//30 -f 147//30 148//30 149//30 -f 129//7 125//7 126//7 -f 128//31 130//31 129//31 -f 145//31 146//31 152//31 -f 135//7 137//7 146//7 -f 130//32 132//32 131//32 -f 146//32 147//32 151//32 -f 133//7 135//7 145//7 -f 131//30 132//30 134//30 -f 148//33 126//33 150//33 -f 139//7 141//7 148//7 -f 133//33 134//33 136//33 -f 154//7 152//7 149//7 -f 133//7 144//7 143//7 -f 136//34 138//34 137//34 -f 139//7 147//7 146//7 -f 144//35 154//35 155//35 -f 138//36 140//36 139//36 -f 128//4 158//4 157//4 -f 142//37 128//37 127//37 -f 140//35 142//35 141//35 -f 143//36 155//36 156//36 -f 131//7 143//7 125//7 -f 127//7 126//7 148//7 -f 125//34 156//34 150//34 -f 145//37 153//37 154//37 -f 161//31 169//31 170//31 -f 132//4 159//4 160//4 -f 140//4 163//4 164//4 -f 134//4 160//4 161//4 -f 128//4 142//4 164//4 -f 138//4 136//4 161//4 -f 130//4 157//4 159//4 -f 140//4 138//4 162//4 -f 171//4 168//4 167//4 -f 159//35 167//35 168//35 -f 158//34 166//34 165//34 -f 158//33 164//33 172//33 -f 162//32 170//32 171//32 -f 160//37 168//37 169//37 -f 157//36 165//36 167//36 -f 164//30 163//30 171//30 -f 2//9 174//9 4//9 -f 178//4 179//4 177//4 -f 181//4 183//4 182//4 -f 187//7 186//7 184//7 -f 181//3 184//3 186//3 -f 180//8 185//8 184//8 -f 180//9 182//9 187//9 -f 183//1 186//1 187//1 -f 4//1 8//1 3//1 -f 6//2 2//2 5//2 -f 1//3 3//3 5//3 -f 175//4 173//4 174//4 -f 5//5 7//5 174//5 -f 174//5 6//5 5//5 -f 1//6 2//6 3//6 -f 10//7 12//7 9//7 -f 12//1 16//1 11//1 -f 16//4 14//4 15//4 -f 14//8 10//8 13//8 -f 9//3 11//3 13//3 -f 14//9 16//9 10//9 -f 18//8 20//8 17//8 -f 20//7 24//7 19//7 -f 24//1 22//1 23//1 -f 22//4 18//4 21//4 -f 17//3 19//3 21//3 -f 22//9 24//9 18//9 -f 25//10 26//10 27//10 -f 27//11 28//11 29//11 -f 29//12 30//12 31//12 -f 31//13 32//13 33//13 -f 33//14 34//14 35//14 -f 35//15 36//15 37//15 -f 40//16 38//16 64//16 -f 25//17 39//17 26//17 -f 37//18 38//18 39//18 -f 43//1 29//1 44//1 -f 48//17 41//17 56//17 -f 35//1 37//1 46//1 -f 44//1 31//1 45//1 -f 47//1 37//1 48//1 -f 27//1 29//1 42//1 -f 33//1 35//1 45//1 -f 48//1 39//1 41//1 -f 25//1 27//1 41//1 -f 56//1 49//1 50//1 -f 50//1 51//1 52//1 -f 52//1 53//1 54//1 -f 54//1 55//1 56//1 -f 56//1 50//1 52//1 -f 46//15 47//15 54//15 -f 44//13 45//13 52//13 -f 42//11 43//11 50//11 -f 47//18 48//18 55//18 -f 45//14 46//14 53//14 -f 43//12 44//12 51//12 -f 41//10 42//10 49//10 -f 59//8 57//8 58//8 -f 58//8 64//8 63//8 -f 63//8 62//8 61//8 -f 61//8 60//8 59//8 -f 59//8 58//8 61//8 -f 30//19 28//19 59//19 -f 36//20 34//20 62//20 -f 58//21 26//21 64//21 -f 28//22 26//22 57//22 -f 32//23 30//23 60//23 -f 63//24 38//24 62//24 -f 61//25 34//25 60//25 -f 68//26 72//26 67//26 -f 66//27 65//27 70//27 -f 67//7 71//7 65//7 -f 70//4 72//4 66//4 -f 74//4 66//4 76//4 -f 68//28 67//28 76//28 -f 66//29 74//29 65//29 -f 67//7 65//7 75//7 -f 99//30 100//30 103//30 -f 79//7 81//7 78//7 -f 79//31 80//31 81//31 -f 97//31 98//31 105//31 -f 97//7 87//7 98//7 -f 83//32 81//32 84//32 -f 98//32 99//32 104//32 -f 85//7 87//7 96//7 -f 85//30 83//30 86//30 -f 100//33 78//33 101//33 -f 99//7 91//7 100//7 -f 85//33 86//33 87//33 -f 101//7 102//7 108//7 -f 108//7 107//7 106//7 -f 106//7 105//7 104//7 -f 104//7 103//7 101//7 -f 101//7 108//7 106//7 -f 95//7 83//7 96//7 -f 87//34 88//34 89//34 -f 98//7 89//7 99//7 -f 107//35 95//35 106//35 -f 89//36 90//36 91//36 -f 109//4 82//4 110//4 -f 79//37 93//37 80//37 -f 91//35 92//35 93//35 -f 108//36 77//36 107//36 -f 81//7 83//7 77//7 -f 100//7 93//7 78//7 -f 102//34 78//34 108//34 -f 96//37 97//37 106//37 -f 114//31 113//31 122//31 -f 86//4 84//4 112//4 -f 94//4 92//4 116//4 -f 113//4 88//4 112//4 -f 80//4 94//4 110//4 -f 90//4 88//4 114//4 -f 111//4 84//4 109//4 -f 92//4 90//4 115//4 -f 119//4 117//4 118//4 -f 118//4 124//4 119//4 -f 123//4 122//4 121//4 -f 121//4 120//4 123//4 -f 119//4 124//4 123//4 -f 112//35 111//35 120//35 -f 109//34 110//34 117//34 -f 110//33 116//33 118//33 -f 115//32 114//32 123//32 -f 113//37 112//37 121//37 -f 111//36 109//36 119//36 -f 116//30 115//30 124//30 -f 151//30 147//30 149//30 -f 127//7 129//7 126//7 -f 127//31 128//31 129//31 -f 153//31 145//31 152//31 -f 145//7 135//7 146//7 -f 129//32 130//32 131//32 -f 152//32 146//32 151//32 -f 144//7 133//7 145//7 -f 133//30 131//30 134//30 -f 149//33 148//33 150//33 -f 147//7 139//7 148//7 -f 135//33 133//33 136//33 -f 149//7 150//7 156//7 -f 156//7 155//7 154//7 -f 154//7 153//7 152//7 -f 152//7 151//7 149//7 -f 149//7 156//7 154//7 -f 131//7 133//7 143//7 -f 135//34 136//34 137//34 -f 137//7 139//7 146//7 -f 143//35 144//35 155//35 -f 137//36 138//36 139//36 -f 130//4 128//4 157//4 -f 141//37 142//37 127//37 -f 139//35 140//35 141//35 -f 125//36 143//36 156//36 -f 129//7 131//7 125//7 -f 141//7 127//7 148//7 -f 126//34 125//34 150//34 -f 144//37 145//37 154//37 -f 162//31 161//31 170//31 -f 134//4 132//4 160//4 -f 142//4 140//4 164//4 -f 136//4 134//4 161//4 -f 158//4 128//4 164//4 -f 162//4 138//4 161//4 -f 132//4 130//4 159//4 -f 163//4 140//4 162//4 -f 167//4 165//4 166//4 -f 166//4 172//4 167//4 -f 171//4 170//4 169//4 -f 169//4 168//4 171//4 -f 167//4 172//4 171//4 -f 160//35 159//35 168//35 -f 157//34 158//34 165//34 -f 166//33 158//33 172//33 -f 163//32 162//32 171//32 -f 161//37 160//37 169//37 -f 159//36 157//36 167//36 -f 172//30 164//30 171//30 -f 8//9 4//9 174//9 -f 2//9 6//9 174//9 -f 176//4 178//4 177//4 -f 180//4 181//4 182//4 -f 185//7 187//7 184//7 -f 183//3 181//3 186//3 -f 181//8 180//8 184//8 -f 185//9 180//9 187//9 -f 182//1 183//1 187//1 +f 8/1/1 7/2/1 3/3/1 +f 2/4/2 1/5/2 5/6/2 +f 3/7/3 7/8/3 5/9/3 +f 7/10/4 8/1/4 6/11/4 +f 2/4/5 4/12/5 3/13/5 +f 12/14/6 11/15/6 9/16/6 +f 14/17/7 13/18/7 15/19/7 +f 10/20/8 9/21/8 13/22/8 +f 11/23/3 15/19/3 13/18/3 +f 14/17/9 16/24/9 12/14/9 +f 20/25/8 19/26/8 17/27/8 +f 24/28/6 23/29/6 19/30/6 +f 22/31/1 21/32/1 23/33/1 +f 18/34/7 17/35/7 21/36/7 +f 19/26/3 23/37/3 21/38/3 +f 24/28/9 20/25/9 18/34/9 +f 26/39/10 28/40/10 27/41/10 +f 28/40/11 30/42/11 29/43/11 +f 30/42/12 32/44/12 31/45/12 +f 32/44/13 34/46/13 33/47/13 +f 34/48/14 36/49/14 35/50/14 +f 36/49/15 38/51/15 37/52/15 +f 38/51/16 63/53/16 64/54/16 +f 39/55/17 40/56/17 26/39/17 +f 38/51/18 40/56/18 39/55/18 +f 29/43/1 31/45/1 44/57/1 +f 41/58/17 49/59/17 56/60/17 +f 37/52/1 47/61/1 46/62/1 +f 31/45/1 33/47/1 45/63/1 +f 37/52/1 39/55/1 48/64/1 +f 29/43/1 43/65/1 42/66/1 +f 35/50/1 46/67/1 45/68/1 +f 39/55/1 25/69/1 41/70/1 +f 27/41/1 42/71/1 41/72/1 +f 52/73/1 54/74/1 56/60/1 +f 47/75/15 55/76/15 54/74/15 +f 45/77/13 53/78/13 52/73/13 +f 43/79/11 51/80/11 50/81/11 +f 48/82/18 56/60/18 55/76/18 +f 46/83/14 54/74/14 53/78/14 +f 44/84/12 52/73/12 51/80/12 +f 42/85/10 50/81/10 49/59/10 +f 63/86/8 61/87/8 58/88/8 +f 28/40/19 57/89/19 59/90/19 +f 34/48/20 61/91/20 62/92/20 +f 26/39/21 40/56/21 64/93/21 +f 26/39/22 58/94/22 57/95/22 +f 30/42/23 59/96/23 60/97/23 +f 38/51/24 36/49/24 62/98/24 +f 34/46/25 32/44/25 60/99/25 +f 72/100/26 71/101/26 67/102/26 +f 65/103/27 69/104/27 70/105/27 +f 71/101/6 69/104/6 65/103/6 +f 72/100/7 68/106/7 66/107/7 +f 66/108/7 68/109/7 76/110/7 +f 67/111/28 75/112/28 76/110/28 +f 74/113/29 73/114/29 65/115/29 +f 65/115/6 73/114/6 75/112/6 +f 100/116/30 101/117/30 103/118/30 +f 81/119/6 77/120/6 78/121/6 +f 80/122/31 82/123/31 81/119/31 +f 98/124/31 104/125/31 105/126/31 +f 87/127/6 89/128/6 98/124/6 +f 81/119/32 82/123/32 84/129/32 +f 99/130/32 103/131/32 104/132/32 +f 87/127/6 97/133/6 96/134/6 +f 83/135/30 84/136/30 86/137/30 +f 78/138/33 102/139/33 101/140/33 +f 91/141/6 93/142/6 100/116/6 +f 86/137/33 88/143/33 87/127/33 +f 106/144/6 104/145/6 101/146/6 +f 83/135/6 85/147/6 96/148/6 +f 88/143/34 90/149/34 89/128/34 +f 89/128/6 91/141/6 99/130/6 +f 95/150/35 96/148/35 106/151/35 +f 90/149/36 92/152/36 91/141/36 +f 82/123/7 80/122/7 110/153/7 +f 93/142/37 94/154/37 80/122/37 +f 92/152/35 94/154/35 93/142/35 +f 77/155/36 95/156/36 107/157/36 +f 83/158/6 95/156/6 77/155/6 +f 93/142/6 79/159/6 78/138/6 +f 78/121/34 77/120/34 108/160/34 +f 97/133/37 105/161/37 106/162/37 +f 113/163/31 121/164/31 122/165/31 +f 84/136/7 111/166/7 112/167/7 +f 92/152/7 115/168/7 116/169/7 +f 88/143/7 86/137/7 112/170/7 +f 94/154/7 116/171/7 110/172/7 +f 88/143/7 113/163/7 114/173/7 +f 84/129/7 82/123/7 109/174/7 +f 90/149/7 114/175/7 115/176/7 +f 123/177/7 120/178/7 119/179/7 +f 111/166/35 119/180/35 120/181/35 +f 110/153/34 118/182/34 117/183/34 +f 116/171/33 124/184/33 118/185/33 +f 114/175/32 122/186/32 123/187/32 +f 112/170/37 120/188/37 121/189/37 +f 109/174/36 117/190/36 119/191/36 +f 115/168/30 123/192/30 124/193/30 +f 147/194/30 148/195/30 149/196/30 +f 129/197/6 125/198/6 126/199/6 +f 128/200/31 130/201/31 129/197/31 +f 145/202/31 146/203/31 152/204/31 +f 135/205/6 137/206/6 146/203/6 +f 130/201/32 132/207/32 131/208/32 +f 146/209/32 147/210/32 151/211/32 +f 133/212/6 135/205/6 145/213/6 +f 131/214/30 132/215/30 134/216/30 +f 148/217/33 126/218/33 150/219/33 +f 139/220/6 141/221/6 148/195/6 +f 133/212/33 134/216/33 136/222/33 +f 154/223/6 152/224/6 149/225/6 +f 133/212/6 144/226/6 143/227/6 +f 136/222/34 138/228/34 137/206/34 +f 139/220/6 147/210/6 146/209/6 +f 144/226/35 154/229/35 155/230/35 +f 138/228/36 140/231/36 139/220/36 +f 128/200/7 158/232/7 157/233/7 +f 142/234/37 128/200/37 127/235/37 +f 140/231/35 142/234/35 141/221/35 +f 143/236/36 155/237/36 156/238/36 +f 131/208/6 143/236/6 125/239/6 +f 127/235/6 126/218/6 148/217/6 +f 125/198/34 156/240/34 150/241/34 +f 145/213/37 153/242/37 154/243/37 +f 161/244/31 169/245/31 170/246/31 +f 132/215/7 159/247/7 160/248/7 +f 140/231/7 163/249/7 164/250/7 +f 134/216/7 160/251/7 161/252/7 +f 128/200/7 142/234/7 164/253/7 +f 138/228/7 136/222/7 161/244/7 +f 130/201/7 157/254/7 159/255/7 +f 140/231/7 138/228/7 162/256/7 +f 171/257/7 168/258/7 167/259/7 +f 159/247/35 167/260/35 168/261/35 +f 158/232/34 166/262/34 165/263/34 +f 158/264/33 164/253/33 172/265/33 +f 162/256/32 170/266/32 171/267/32 +f 160/251/37 168/268/37 169/269/37 +f 157/254/36 165/270/36 167/271/36 +f 164/250/30 163/249/30 171/272/30 +f 2/4/9 6/11/9 8/1/9 +f 174/273/38 176/274/38 175/275/38 +f 176/274/7 178/276/7 177/277/7 +f 178/276/39 180/278/39 179/279/39 +f 180/280/40 182/281/40 181/282/40 +f 196/283/41 208/284/41 204/285/41 +f 184/286/42 174/273/42 173/287/42 +f 182/281/6 184/286/6 183/288/6 +f 186/289/38 188/290/38 187/291/38 +f 188/290/7 190/292/7 189/293/7 +f 190/292/39 192/294/39 191/295/39 +f 192/296/40 194/297/40 193/298/40 +f 180/299/43 200/300/43 201/301/43 +f 196/302/42 186/289/42 185/303/42 +f 194/297/6 196/302/6 195/304/6 +f 206/305/44 218/306/44 219/307/44 +f 200/308/45 199/309/45 211/310/45 +f 176/274/46 174/273/46 198/311/46 +f 180/312/47 178/313/47 199/314/47 +f 194/297/6 207/315/6 208/284/6 +f 178/313/7 176/274/7 197/316/7 +f 192/296/43 206/317/43 207/315/43 +f 188/290/46 186/289/46 204/285/46 +f 192/318/47 190/319/47 205/320/47 +f 190/319/7 188/290/7 203/321/7 +f 184/322/41 202/323/41 198/311/41 +f 182/324/6 201/301/6 202/323/6 +f 219/325/48 218/326/48 230/327/48 +f 211/328/49 223/329/49 224/330/49 +f 203/321/50 204/285/50 216/331/50 +f 200/332/44 212/333/44 213/334/44 +f 207/335/6 219/307/6 220/336/6 +f 197/316/50 198/311/50 210/337/50 +f 205/338/7 203/321/7 215/339/7 +f 201/340/6 213/334/6 214/341/6 +f 208/342/51 220/336/51 216/331/51 +f 199/309/7 197/316/7 209/343/7 +f 206/344/45 205/338/45 217/345/45 +f 202/346/51 214/341/51 210/337/51 +f 223/347/52 235/348/52 236/349/52 +f 222/350/53 226/351/53 238/352/53 +f 216/331/54 228/353/54 227/354/54 +f 213/355/48 212/356/48 224/357/48 +f 220/358/6 219/325/6 231/359/6 +f 210/337/54 222/350/54 221/360/54 +f 215/339/7 227/354/7 229/361/7 +f 214/362/6 213/355/6 225/363/6 +f 216/331/55 220/358/55 232/364/55 +f 209/343/7 221/360/7 223/329/7 +f 217/365/49 229/361/49 230/366/49 +f 210/337/55 214/362/55 226/367/55 +f 235/368/56 247/369/56 248/370/56 +f 238/371/57 250/372/57 246/373/57 +f 231/374/58 230/375/58 242/376/58 +f 228/353/59 240/377/59 239/378/59 +f 225/379/58 224/380/58 236/381/58 +f 232/382/6 231/374/6 243/383/6 +f 222/350/59 234/384/59 233/385/59 +f 227/354/7 239/378/7 241/386/7 +f 226/351/6 225/379/6 237/387/6 +f 228/353/53 232/382/53 244/388/53 +f 221/360/7 233/385/7 235/348/7 +f 229/389/52 241/386/52 242/390/52 +f 257/391/7 259/392/7 260/393/7 +f 242/394/60 254/395/60 255/396/60 +f 240/397/61 252/398/61 251/399/61 +f 236/400/60 248/401/60 249/402/60 +f 243/403/6 255/396/6 256/404/6 +f 234/405/61 246/373/61 245/406/61 +f 239/407/7 251/399/7 253/408/7 +f 237/409/6 249/402/6 250/372/6 +f 240/397/57 244/410/57 256/404/57 +f 233/411/7 245/406/7 247/369/7 +f 241/412/56 253/408/56 254/413/56 +f 261/414/7 263/415/7 264/416/7 +f 4/12/1 8/1/1 3/3/1 +f 6/11/2 2/4/2 5/6/2 +f 1/417/3 3/7/3 5/9/3 +f 5/418/4 7/10/4 6/11/4 +f 1/419/5 2/4/5 3/13/5 +f 10/20/6 12/14/6 9/16/6 +f 16/24/7 14/17/7 15/19/7 +f 14/17/8 10/20/8 13/22/8 +f 9/420/3 11/23/3 13/18/3 +f 10/20/9 14/17/9 12/14/9 +f 18/34/8 20/25/8 17/27/8 +f 20/25/6 24/28/6 19/30/6 +f 24/28/1 22/31/1 23/33/1 +f 22/31/7 18/34/7 21/36/7 +f 17/27/3 19/26/3 21/38/3 +f 22/31/9 24/28/9 18/34/9 +f 25/69/10 26/39/10 27/41/10 +f 27/41/11 28/40/11 29/43/11 +f 29/43/12 30/42/12 31/45/12 +f 31/45/13 32/44/13 33/47/13 +f 33/421/14 34/48/14 35/50/14 +f 35/50/15 36/49/15 37/52/15 +f 40/56/16 38/51/16 64/54/16 +f 25/69/17 39/55/17 26/39/17 +f 37/52/18 38/51/18 39/55/18 +f 43/422/1 29/43/1 44/57/1 +f 48/423/17 41/58/17 56/60/17 +f 35/50/1 37/52/1 46/62/1 +f 44/424/1 31/45/1 45/63/1 +f 47/425/1 37/52/1 48/64/1 +f 27/41/1 29/43/1 42/66/1 +f 33/421/1 35/50/1 45/68/1 +f 48/426/1 39/55/1 41/70/1 +f 25/69/1 27/41/1 41/72/1 +f 56/60/1 49/59/1 50/81/1 +f 50/81/1 51/80/1 52/73/1 +f 52/73/1 53/78/1 54/74/1 +f 54/74/1 55/76/1 56/60/1 +f 56/60/1 50/81/1 52/73/1 +f 46/427/15 47/75/15 54/74/15 +f 44/428/13 45/77/13 52/73/13 +f 42/429/11 43/79/11 50/81/11 +f 47/430/18 48/82/18 55/76/18 +f 45/431/14 46/83/14 53/78/14 +f 43/432/12 44/84/12 51/80/12 +f 41/433/10 42/85/10 49/59/10 +f 59/434/8 57/435/8 58/88/8 +f 58/88/8 64/436/8 63/86/8 +f 63/86/8 62/437/8 61/87/8 +f 61/87/8 60/438/8 59/434/8 +f 59/434/8 58/88/8 61/87/8 +f 30/42/19 28/40/19 59/90/19 +f 36/49/20 34/48/20 62/92/20 +f 58/439/21 26/39/21 64/93/21 +f 28/40/22 26/39/22 57/95/22 +f 32/44/23 30/42/23 60/97/23 +f 63/440/24 38/51/24 62/98/24 +f 61/441/25 34/46/25 60/99/25 +f 68/106/26 72/100/26 67/102/26 +f 66/442/27 65/103/27 70/105/27 +f 67/102/6 71/101/6 65/103/6 +f 70/443/7 72/100/7 66/107/7 +f 74/444/7 66/108/7 76/110/7 +f 68/109/28 67/111/28 76/110/28 +f 66/445/29 74/113/29 65/115/29 +f 67/111/6 65/115/6 75/112/6 +f 99/446/30 100/116/30 103/118/30 +f 79/159/6 81/119/6 78/121/6 +f 79/159/31 80/122/31 81/119/31 +f 97/447/31 98/124/31 105/126/31 +f 97/447/6 87/127/6 98/124/6 +f 83/158/32 81/119/32 84/129/32 +f 98/448/32 99/130/32 104/132/32 +f 85/147/6 87/127/6 96/134/6 +f 85/147/30 83/135/30 86/137/30 +f 100/449/33 78/138/33 101/140/33 +f 99/446/6 91/141/6 100/116/6 +f 85/147/33 86/137/33 87/127/33 +f 101/146/6 102/450/6 108/451/6 +f 108/451/6 107/452/6 106/144/6 +f 106/144/6 105/453/6 104/145/6 +f 104/145/6 103/454/6 101/146/6 +f 101/146/6 108/451/6 106/144/6 +f 95/150/6 83/135/6 96/148/6 +f 87/127/34 88/143/34 89/128/34 +f 98/448/6 89/128/6 99/130/6 +f 107/455/35 95/150/35 106/151/35 +f 89/128/36 90/149/36 91/141/36 +f 109/456/7 82/123/7 110/153/7 +f 79/159/37 93/142/37 80/122/37 +f 91/141/35 92/152/35 93/142/35 +f 108/457/36 77/155/36 107/157/36 +f 81/119/6 83/158/6 77/155/6 +f 100/449/6 93/142/6 78/138/6 +f 102/458/34 78/121/34 108/160/34 +f 96/134/37 97/133/37 106/162/37 +f 114/173/31 113/163/31 122/165/31 +f 86/137/7 84/136/7 112/167/7 +f 94/154/7 92/152/7 116/169/7 +f 113/459/7 88/143/7 112/170/7 +f 80/122/7 94/154/7 110/172/7 +f 90/149/7 88/143/7 114/173/7 +f 111/460/7 84/129/7 109/174/7 +f 92/152/7 90/149/7 115/176/7 +f 119/179/7 117/461/7 118/462/7 +f 118/462/7 124/463/7 119/179/7 +f 123/177/7 122/464/7 121/465/7 +f 121/465/7 120/178/7 123/177/7 +f 119/179/7 124/463/7 123/177/7 +f 112/167/35 111/166/35 120/181/35 +f 109/456/34 110/153/34 117/183/34 +f 110/172/33 116/171/33 118/185/33 +f 115/176/32 114/175/32 123/187/32 +f 113/459/37 112/170/37 121/189/37 +f 111/460/36 109/174/36 119/191/36 +f 116/169/30 115/168/30 124/193/30 +f 151/466/30 147/194/30 149/196/30 +f 127/235/6 129/197/6 126/199/6 +f 127/235/31 128/200/31 129/197/31 +f 153/467/31 145/202/31 152/204/31 +f 145/202/6 135/205/6 146/203/6 +f 129/197/32 130/201/32 131/208/32 +f 152/468/32 146/209/32 151/211/32 +f 144/469/6 133/212/6 145/213/6 +f 133/212/30 131/214/30 134/216/30 +f 149/470/33 148/217/33 150/219/33 +f 147/194/6 139/220/6 148/195/6 +f 135/205/33 133/212/33 136/222/33 +f 149/225/6 150/471/6 156/472/6 +f 156/472/6 155/473/6 154/223/6 +f 154/223/6 153/474/6 152/224/6 +f 152/224/6 151/475/6 149/225/6 +f 149/225/6 156/472/6 154/223/6 +f 131/214/6 133/212/6 143/227/6 +f 135/205/34 136/222/34 137/206/34 +f 137/206/6 139/220/6 146/209/6 +f 143/227/35 144/226/35 155/230/35 +f 137/206/36 138/228/36 139/220/36 +f 130/201/7 128/200/7 157/233/7 +f 141/221/37 142/234/37 127/235/37 +f 139/220/35 140/231/35 141/221/35 +f 125/239/36 143/236/36 156/238/36 +f 129/197/6 131/208/6 125/239/6 +f 141/221/6 127/235/6 148/217/6 +f 126/199/34 125/198/34 150/241/34 +f 144/469/37 145/213/37 154/243/37 +f 162/476/31 161/244/31 170/246/31 +f 134/216/7 132/215/7 160/248/7 +f 142/234/7 140/231/7 164/250/7 +f 136/222/7 134/216/7 161/252/7 +f 158/264/7 128/200/7 164/253/7 +f 162/476/7 138/228/7 161/244/7 +f 132/207/7 130/201/7 159/255/7 +f 163/477/7 140/231/7 162/256/7 +f 167/259/7 165/478/7 166/479/7 +f 166/479/7 172/480/7 167/259/7 +f 171/257/7 170/481/7 169/482/7 +f 169/482/7 168/258/7 171/257/7 +f 167/259/7 172/480/7 171/257/7 +f 160/248/35 159/247/35 168/261/35 +f 157/233/34 158/232/34 165/263/34 +f 166/483/33 158/264/33 172/265/33 +f 163/477/32 162/256/32 171/267/32 +f 161/252/37 160/251/37 169/269/37 +f 159/255/36 157/254/36 167/271/36 +f 172/484/30 164/250/30 171/272/30 +f 4/12/9 2/4/9 8/1/9 +f 173/287/38 174/273/38 175/275/38 +f 175/275/7 176/274/7 177/277/7 +f 177/277/39 178/276/39 179/279/39 +f 179/485/40 180/280/40 181/282/40 +f 186/289/62 196/283/62 204/285/62 +f 183/288/42 184/286/42 173/287/42 +f 181/282/6 182/281/6 183/288/6 +f 185/303/38 186/289/38 187/291/38 +f 187/291/7 188/290/7 189/293/7 +f 189/293/39 190/292/39 191/295/39 +f 191/486/40 192/296/40 193/298/40 +f 182/324/63 180/299/63 201/301/63 +f 195/304/42 196/302/42 185/303/42 +f 193/298/6 194/297/6 195/304/6 +f 207/335/64 206/305/64 219/307/64 +f 212/487/65 200/308/65 211/310/65 +f 197/316/66 176/274/66 198/311/66 +f 200/488/67 180/312/67 199/314/67 +f 196/283/6 194/297/6 208/284/6 +f 199/314/7 178/313/7 197/316/7 +f 194/297/63 192/296/63 207/315/63 +f 203/321/66 188/290/66 204/285/66 +f 206/489/67 192/318/67 205/320/67 +f 205/320/7 190/319/7 203/321/7 +f 174/273/62 184/322/62 198/311/62 +f 184/322/6 182/324/6 202/323/6 +f 231/359/68 219/325/68 230/327/68 +f 212/490/69 211/328/69 224/330/69 +f 215/339/70 203/321/70 216/331/70 +f 201/340/64 200/332/64 213/334/64 +f 208/342/6 207/335/6 220/336/6 +f 209/343/70 197/316/70 210/337/70 +f 217/345/7 205/338/7 215/339/7 +f 202/346/6 201/340/6 214/341/6 +f 204/285/71 208/342/71 216/331/71 +f 211/310/7 199/309/7 209/343/7 +f 218/491/65 206/344/65 217/345/65 +f 198/311/71 202/346/71 210/337/71 +f 224/492/72 223/347/72 236/349/72 +f 234/384/73 222/350/73 238/352/73 +f 215/339/74 216/331/74 227/354/74 +f 225/363/68 213/355/68 224/357/68 +f 232/364/6 220/358/6 231/359/6 +f 209/343/74 210/337/74 221/360/74 +f 217/365/7 215/339/7 229/361/7 +f 226/367/6 214/362/6 225/363/6 +f 228/353/75 216/331/75 232/364/75 +f 211/328/7 209/343/7 223/329/7 +f 218/493/69 217/365/69 230/366/69 +f 222/350/75 210/337/75 226/367/75 +f 236/494/56 235/368/56 248/370/56 +f 234/405/57 238/371/57 246/373/57 +f 243/383/76 231/374/76 242/376/76 +f 227/354/77 228/353/77 239/378/77 +f 237/387/76 225/379/76 236/381/76 +f 244/388/6 232/382/6 243/383/6 +f 221/360/77 222/350/77 233/385/77 +f 229/389/7 227/354/7 241/386/7 +f 238/352/6 226/351/6 237/387/6 +f 240/377/73 228/353/73 244/388/73 +f 223/347/7 221/360/7 235/348/7 +f 230/495/72 229/389/72 242/390/72 +f 258/496/7 257/391/7 260/393/7 +f 243/403/60 242/394/60 255/396/60 +f 239/407/61 240/397/61 251/399/61 +f 237/409/60 236/400/60 249/402/60 +f 244/410/6 243/403/6 256/404/6 +f 233/411/61 234/405/61 245/406/61 +f 241/412/7 239/407/7 253/408/7 +f 238/371/6 237/409/6 250/372/6 +f 252/398/57 240/397/57 256/404/57 +f 235/368/7 233/411/7 247/369/7 +f 242/497/56 241/412/56 254/413/56 +f 262/498/7 261/414/7 264/416/7 diff --git a/assets/hbm/textures/blocks/ams_base.png b/assets/hbm/textures/blocks/ams_base.png new file mode 100644 index 000000000..c0d7101f0 Binary files /dev/null and b/assets/hbm/textures/blocks/ams_base.png differ diff --git a/assets/hbm/textures/blocks/ams_emitter.png b/assets/hbm/textures/blocks/ams_emitter.png new file mode 100644 index 000000000..799768700 Binary files /dev/null and b/assets/hbm/textures/blocks/ams_emitter.png differ diff --git a/assets/hbm/textures/blocks/ams_limiter.png b/assets/hbm/textures/blocks/ams_limiter.png new file mode 100644 index 000000000..f5f4fe407 Binary files /dev/null and b/assets/hbm/textures/blocks/ams_limiter.png differ diff --git a/assets/hbm/textures/blocks/ore_tikite.png b/assets/hbm/textures/blocks/ore_tikite.png new file mode 100644 index 000000000..adead24dc Binary files /dev/null and b/assets/hbm/textures/blocks/ore_tikite.png differ diff --git a/assets/hbm/textures/gui/fluids1.png b/assets/hbm/textures/gui/fluids1.png new file mode 100755 index 000000000..1b56d122e Binary files /dev/null and b/assets/hbm/textures/gui/fluids1.png differ diff --git a/assets/hbm/textures/gui/fluids2.png b/assets/hbm/textures/gui/fluids2.png index 1b56d122e..c0da3c29f 100755 Binary files a/assets/hbm/textures/gui/fluids2.png and b/assets/hbm/textures/gui/fluids2.png differ diff --git a/assets/hbm/textures/gui/gui_ams_base.png b/assets/hbm/textures/gui/gui_ams_base.png new file mode 100644 index 000000000..760dfbec4 Binary files /dev/null and b/assets/hbm/textures/gui/gui_ams_base.png differ diff --git a/assets/hbm/textures/gui/gui_ams_emitter.png b/assets/hbm/textures/gui/gui_ams_emitter.png new file mode 100644 index 000000000..870b9ae30 Binary files /dev/null and b/assets/hbm/textures/gui/gui_ams_emitter.png differ diff --git a/assets/hbm/textures/gui/gui_ams_limiter.png b/assets/hbm/textures/gui/gui_ams_limiter.png new file mode 100644 index 000000000..316d938f8 Binary files /dev/null and b/assets/hbm/textures/gui/gui_ams_limiter.png differ diff --git a/assets/hbm/textures/gui/metal_dark.png b/assets/hbm/textures/gui/metal_dark.png new file mode 100644 index 000000000..923464f20 Binary files /dev/null and b/assets/hbm/textures/gui/metal_dark.png differ diff --git a/assets/hbm/textures/gui/metal_light.png b/assets/hbm/textures/gui/metal_light.png new file mode 100644 index 000000000..bd37d828b Binary files /dev/null and b/assets/hbm/textures/gui/metal_light.png differ diff --git a/assets/hbm/textures/items/plate_polymer.png b/assets/hbm/textures/items/plate_polymer.png new file mode 100644 index 000000000..0d77c8f28 Binary files /dev/null and b/assets/hbm/textures/items/plate_polymer.png differ diff --git a/assets/hbm/textures/items/shimmer_sledge_hd_original.png b/assets/hbm/textures/items/shimmer_sledge_original_hd.png similarity index 100% rename from assets/hbm/textures/items/shimmer_sledge_hd_original.png rename to assets/hbm/textures/items/shimmer_sledge_original_hd.png diff --git a/assets/hbm/textures/models/ams_base.png b/assets/hbm/textures/models/ams_base.png new file mode 100644 index 000000000..35f5a0720 Binary files /dev/null and b/assets/hbm/textures/models/ams_base.png differ diff --git a/assets/hbm/textures/models/ams_emitter.png b/assets/hbm/textures/models/ams_emitter.png new file mode 100644 index 000000000..eeb2583d5 Binary files /dev/null and b/assets/hbm/textures/models/ams_emitter.png differ diff --git a/assets/hbm/textures/models/ams_limiter.png b/assets/hbm/textures/models/ams_limiter.png new file mode 100644 index 000000000..986f5e094 Binary files /dev/null and b/assets/hbm/textures/models/ams_limiter.png differ diff --git a/com/hbm/blocks/ModBlocks.java b/com/hbm/blocks/ModBlocks.java index 8d26bc065..a7bae9c51 100644 --- a/com/hbm/blocks/ModBlocks.java +++ b/com/hbm/blocks/ModBlocks.java @@ -74,6 +74,8 @@ public class ModBlocks { public static Block ore_oil; public static Block ore_oil_empty; + public static Block ore_tikite; + public static Block block_uranium; public static Block block_titanium; public static Block block_sulfur; @@ -310,8 +312,11 @@ public class ModBlocks { public static final int guiID_fwatz_multiblock = 33; public static Block ams_base; + public static final int guiID_ams_base = 54; public static Block ams_emitter; + public static final int guiID_ams_emitter = 55; public static Block ams_limiter; + public static final int guiID_ams_limiter = 56; public static Block machine_converter_he_rf; public static final int guiID_converter_he_rf = 28; @@ -488,6 +493,8 @@ public class ModBlocks { ore_oil = new BlockOre(Material.rock).setBlockName("ore_oil").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_oil"); ore_oil_empty = new BlockGeneric(Material.rock).setBlockName("ore_oil_empty").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_oil_empty"); + ore_tikite = new BlockGeneric(Material.rock).setBlockName("ore_tikite").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_tikite"); + block_uranium = new BlockGeneric(Material.iron).setBlockName("block_uranium").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_uranium"); block_titanium = new BlockGeneric(Material.iron).setBlockName("block_titanium").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_titanium"); block_sulfur = new BlockGeneric(Material.iron).setBlockName("block_sulfur").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_sulfur"); @@ -828,6 +835,9 @@ public class ModBlocks { GameRegistry.registerBlock(ore_nether_fire, ore_nether_fire.getUnlocalizedName()); GameRegistry.registerBlock(ore_nether_schrabidium, ItemSchrabidiumBlock.class, ore_nether_schrabidium.getUnlocalizedName()); + //End Ores + GameRegistry.registerBlock(ore_tikite, ore_tikite.getUnlocalizedName()); + //Blocks GameRegistry.registerBlock(block_uranium, block_uranium.getUnlocalizedName()); GameRegistry.registerBlock(block_titanium, block_titanium.getUnlocalizedName()); diff --git a/com/hbm/blocks/machine/BlockAMSLimiter.java b/com/hbm/blocks/machine/BlockAMSLimiter.java index 7c9b99626..ed6e61745 100644 --- a/com/hbm/blocks/machine/BlockAMSLimiter.java +++ b/com/hbm/blocks/machine/BlockAMSLimiter.java @@ -2,12 +2,16 @@ package com.hbm.blocks.machine; import com.hbm.blocks.ModBlocks; import com.hbm.handler.MultiblockHandler; +import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityAMSLimiter; +import com.hbm.tileentity.machine.TileEntityConverterHeRf; import com.hbm.tileentity.machine.TileEntityDummy; +import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; @@ -38,6 +42,24 @@ public class BlockAMSLimiter extends BlockContainer { public boolean renderAsNormalBlock() { return false; } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { + if(world.isRemote) + { + return true; + } else if(!player.isSneaking()) + { + TileEntityAMSLimiter entity = (TileEntityAMSLimiter) world.getTileEntity(x, y, z); + if(entity != null) + { + FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_ams_limiter, world, x, y, z); + } + return true; + } else { + return false; + } + } @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack itemStack) { diff --git a/com/hbm/handler/FluidTypeHandler.java b/com/hbm/handler/FluidTypeHandler.java index 2a83e0918..0793d9f21 100644 --- a/com/hbm/handler/FluidTypeHandler.java +++ b/com/hbm/handler/FluidTypeHandler.java @@ -3,67 +3,76 @@ package com.hbm.handler; public class FluidTypeHandler { public enum FluidType { - NONE (0x888888, 8947848, 0, 1, "hbmfluid.none"), + NONE (0x888888, 8947848, 0, 1, 1, "hbmfluid.none"), - WATER (0x3333FF, 3355647, 1, 1, "hbmfluid.water"), - STEAM (0xe5e5e5, 15066597, 9, 1, "hbmfluid.steam"), - COOLANT (0xd8fcff, 14220543, 2, 1, "hbmfluid.coolant"), + WATER (0x3333FF, 3355647, 1, 1, 1, "hbmfluid.water"), + STEAM (0xe5e5e5, 15066597, 9, 1, 1, "hbmfluid.steam"), + COOLANT (0xd8fcff, 14220543, 2, 1, 1, "hbmfluid.coolant"), - LAVA (0xFF3300, 16724736, 3, 1, "hbmfluid.lava"), + LAVA (0xFF3300, 16724736, 3, 1, 1, "hbmfluid.lava"), - DEUTERIUM (0x0000FF, 255, 4, 1, "hbmfluid.deuterium"), - TRITIUM (0x000099, 153, 5, 1, "hbmfluid.tritium"), + DEUTERIUM (0x0000FF, 255, 4, 1, 1, "hbmfluid.deuterium"), + TRITIUM (0x000099, 153, 5, 1, 1, "hbmfluid.tritium"), - OIL (0x020202, 131586, 6, 1, "hbmfluid.oil"), - HOTOIL (0x300900, 3148032, 8, 1, "hbmfluid.hotoil"), + OIL (0x020202, 131586, 6, 1, 1, "hbmfluid.oil"), + HOTOIL (0x300900, 3148032, 8, 1, 1, "hbmfluid.hotoil"), - HEAVYOIL (0x141312, 1315602, 2, 2, "hbmfluid.heavyoil"), - BITUMEN (0x1f2426, 2040870, 3, 2, "hbmfluid.bitumen"), - SMEAR (0x190f01, 1642241, 7, 1, "hbmfluid.smear"), - HEATINGOIL (0x211806, 2168838, 4, 2, "hbmfluid.heatingoil"), + HEAVYOIL (0x141312, 1315602, 2, 2, 1, "hbmfluid.heavyoil"), + BITUMEN (0x1f2426, 2040870, 3, 2, 1, "hbmfluid.bitumen"), + SMEAR (0x190f01, 1642241, 7, 1, 1, "hbmfluid.smear"), + HEATINGOIL (0x211806, 2168838, 4, 2, 1, "hbmfluid.heatingoil"), - RECLAIMED (0x332b22, 3353378, 8, 1, "hbmfluid.reclaimed"), - PETROIL (0x44413d, 4473149, 9, 1, "hbmfluid.petroil"), + RECLAIMED (0x332b22, 3353378, 8, 1, 1, "hbmfluid.reclaimed"), + PETROIL (0x44413d, 4473149, 9, 1, 1, "hbmfluid.petroil"), - LUBRICANT (0x606060, 6316128, 10, 1, "hbmfluid.lubricant"), + LUBRICANT (0x606060, 6316128, 10, 1, 1, "hbmfluid.lubricant"), - NAPHTHA (0x595744, 5855044, 5, 2, "hbmfluid.naphtha"), - DIESEL (0xf2eed5, 15920853, 11, 1, "hbmfluid.diesel"), + NAPHTHA (0x595744, 5855044, 5, 2, 1, "hbmfluid.naphtha"), + DIESEL (0xf2eed5, 15920853, 11, 1, 1, "hbmfluid.diesel"), - LIGHTOIL (0x8c7451, 9204817, 6, 2, "hbmfluid.lightoil"), - KEROSENE (0xffa5d2, 16754130, 12, 1, "hbmfluid.kerosene"), + LIGHTOIL (0x8c7451, 9204817, 6, 2, 1, "hbmfluid.lightoil"), + KEROSENE (0xffa5d2, 16754130, 12, 1, 1, "hbmfluid.kerosene"), - GAS (0xfffeed, 16776941, 13, 1, "hbmfluid.gas"), - PETROLEUM (0x7cb7c9, 8173513, 7, 2, "hbmfluid.petroleum"), + GAS (0xfffeed, 16776941, 13, 1, 1, "hbmfluid.gas"), + PETROLEUM (0x7cb7c9, 8173513, 7, 2, 1, "hbmfluid.petroleum"), - BIOGAS (0xbfd37c, 12571516, 12, 2, "hbmfluid.biogas"), - BIOFUEL (0xeef274, 15659636, 13, 2, "hbmfluid.biofuel"), + BIOGAS (0xbfd37c, 12571516, 12, 2, 1, "hbmfluid.biogas"), + BIOFUEL (0xeef274, 15659636, 13, 2, 1, "hbmfluid.biofuel"), - NITAN (0x8018ad, 8394925, 15, 2, "hbmfluid.nitan"), + NITAN (0x8018ad, 8394925, 15, 2, 1, "hbmfluid.nitan"), - UF6 (0xD1CEBE, 13749950, 14, 1, "hbmfluid.uf6"), - PUF6 (0x4C4C4C, 5000268, 15, 1, "hbmfluid.puf6"), - SAS3 (0x4ffffc, 5242876, 14, 2, "hbmfluid.sas3"), + UF6 (0xD1CEBE, 13749950, 14, 1, 1, "hbmfluid.uf6"), + PUF6 (0x4C4C4C, 5000268, 15, 1, 1, "hbmfluid.puf6"), + SAS3 (0x4ffffc, 5242876, 14, 2, 1, "hbmfluid.sas3"), - AMAT (0x010101, 65793, 0, 2, "hbmfluid.amat"), - ASCHRAB (0xb50000, 11862016, 1, 2, "hbmfluid.aschrab"), + AMAT (0x010101, 65793, 0, 2, 1, "hbmfluid.amat"), + ASCHRAB (0xb50000, 11862016, 1, 2, 1, "hbmfluid.aschrab"), - ACID (0xfff7aa, 16775082, 10, 2, "hbmfluid.acid"), - WATZ (0x86653E, 8807742, 11, 2, "hbmfluid.watz"); + ACID (0xfff7aa, 16775082, 10, 2, 1, "hbmfluid.acid"), + WATZ (0x86653E, 8807742, 11, 2, 1, "hbmfluid.watz"), + CRYOGEL (0x32ffff, 3342335, 0, 1, 2, "hbmfluid.cryogel"); + //Approximate HEX Color of the fluid, used for pipe rendering private int color; + //Converted MS Access color code, used for item rendering private int msa; + //X position of the fluid on the sheet, the "row" private int textureX; + //Y position of the fluid on the sheet, the "column" private int textureY; + //ID of the texture sheet the fluid is on + private int sheetID; + //Unlocalized string ID of the fluid private String name; - private FluidType(int color, int msa, int x, int y, String name) { + private FluidType(int color, int msa, int x, int y, int sheet, String name) { this.color = color; this.msa = msa; this.textureX = x; this.textureY = y; this.name = name; + this.sheetID = sheet; } public int getColor() { @@ -78,6 +87,9 @@ public class FluidTypeHandler { public int textureY() { return this.textureY; } + public int getSheetID() { + return this.sheetID; + } public String getUnlocalizedName() { return this.name; } @@ -89,6 +101,15 @@ public class FluidTypeHandler { return FluidType.NONE; } + public static FluidType getEnumFromName(String s) { + + for(int i = 0; i < FluidType.values().length; i++) + if(FluidType.values()[i].getName().equals(s)) + return FluidType.values()[i]; + + return FluidType.NONE; + } + public String getName() { return this.toString(); } diff --git a/com/hbm/handler/GUIHandler.java b/com/hbm/handler/GUIHandler.java index 6345e8a3c..9c9cedfa3 100644 --- a/com/hbm/handler/GUIHandler.java +++ b/com/hbm/handler/GUIHandler.java @@ -16,6 +16,7 @@ import com.hbm.tileentity.bomb.TileEntityNukeMike; import com.hbm.tileentity.bomb.TileEntityNukePrototype; import com.hbm.tileentity.bomb.TileEntityNukeTsar; import com.hbm.tileentity.bomb.TileEntityTestNuke; +import com.hbm.tileentity.machine.TileEntityAMSLimiter; import com.hbm.tileentity.machine.TileEntityConverterHeRf; import com.hbm.tileentity.machine.TileEntityConverterRfHe; import com.hbm.tileentity.machine.TileEntityCoreAdvanced; @@ -488,6 +489,14 @@ public class GUIHandler implements IGuiHandler { return new ContainerMachinePress(player.inventory, (TileEntityMachinePress) entity); } } + + case ModBlocks.guiID_ams_limiter: + { + if(entity instanceof TileEntityAMSLimiter) + { + return new ContainerAMSLimiter(player.inventory, (TileEntityAMSLimiter) entity); + } + } } return null; } @@ -916,6 +925,14 @@ public class GUIHandler implements IGuiHandler { return new GUIMachinePress(player.inventory, (TileEntityMachinePress) entity); } } + + case ModBlocks.guiID_ams_limiter: + { + if(entity instanceof TileEntityAMSLimiter) + { + return new GUIAMSLimiter(player.inventory, (TileEntityAMSLimiter) entity); + } + } } } else { //CLIENTONLY GUIS diff --git a/com/hbm/inventory/FluidTank.java b/com/hbm/inventory/FluidTank.java index f5a63ef0e..037126fa5 100644 --- a/com/hbm/inventory/FluidTank.java +++ b/com/hbm/inventory/FluidTank.java @@ -22,7 +22,6 @@ public class FluidTank { int fluid; int maxFluid; public int index; - public static ResourceLocation fluidTextures = new ResourceLocation(RefStrings.MODID + ":textures/gui/fluids2.png"); public static int x = 16; public static int y = 100; @@ -76,6 +75,11 @@ public class FluidTank { return; } + if(slots[in].getItem() == ModItems.inf_water && this.type.name().equals(FluidType.WATER.name())) { + this.fluid = this.maxFluid; + return; + } + if(FluidContainerRegistry.getFluidContent(slots[in], type) <= 0) return; } else { @@ -162,17 +166,24 @@ public class FluidTank { if(x <= mouseX && x + width > mouseX && y < mouseY && y + height >= mouseY) gui.drawFluidInfo(new String[] { I18n.format(this.type.getUnlocalizedName()), fluid + "/" + maxFluid + "mB" }, mouseX, mouseY); } + + public ResourceLocation getSheet() { + return new ResourceLocation(RefStrings.MODID + ":textures/gui/fluids" + this.type.getSheetID() + ".png"); + } //Called by TE to save fillstate public void writeToNBT(NBTTagCompound nbt, String s) { nbt.setInteger(s, fluid); - nbt.setInteger(s + "_type", Arrays.asList(FluidType.values()).indexOf(type)); + //nbt.setInteger(s + "_type", Arrays.asList(FluidType.values()).indexOf(type)); + nbt.setString(s + "_type", type.getName()); } //Called by TE to load fillstate public void readFromNBT(NBTTagCompound nbt, String s) { fluid = nbt.getInteger(s); type = FluidType.getEnum(nbt.getInteger(s + "_type")); + if(type.name().equals(FluidType.NONE.name())) + type = FluidType.getEnumFromName(nbt.getString(s + "_type")); } } diff --git a/com/hbm/inventory/container/ContainerAMSLimiter.java b/com/hbm/inventory/container/ContainerAMSLimiter.java new file mode 100644 index 000000000..0d42cbc8e --- /dev/null +++ b/com/hbm/inventory/container/ContainerAMSLimiter.java @@ -0,0 +1,142 @@ +package com.hbm.inventory.container; + +import com.hbm.inventory.SlotMachineOutput; +import com.hbm.tileentity.machine.TileEntityAMSLimiter; +import com.hbm.tileentity.machine.TileEntityMachinePress; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +public class ContainerAMSLimiter extends Container { + +private TileEntityAMSLimiter amsLmiter; + + private int heat; + private int efficiency; + private int warning; + private int mode; + + public ContainerAMSLimiter(InventoryPlayer invPlayer, TileEntityAMSLimiter tedf) { + + amsLmiter = tedf; + + //Fluid In + this.addSlotToContainer(new Slot(tedf, 0, 44, 17)); + //Fluid Out + this.addSlotToContainer(new Slot(tedf, 1, 44, 53)); + //Focus + this.addSlotToContainer(new Slot(tedf, 2, 80, 53)); + //Battery + this.addSlotToContainer(new Slot(tedf, 3, 116, 53)); + + for(int i = 0; i < 3; i++) + { + for(int j = 0; j < 9; j++) + { + this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); + } + } + + for(int i = 0; i < 9; i++) + { + this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 142)); + } + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2) + { + ItemStack var3 = null; + Slot var4 = (Slot) this.inventorySlots.get(par2); + + if (var4 != null && var4.getHasStack()) + { + ItemStack var5 = var4.getStack(); + var3 = var5.copy(); + + if (par2 <= 3) { + if (!this.mergeItemStack(var5, 4, this.inventorySlots.size(), true)) + { + return null; + } + } + else + return null; + + if (var5.stackSize == 0) + { + var4.putStack((ItemStack) null); + } + else + { + var4.onSlotChanged(); + } + } + + return var3; + } + + @Override + public boolean canInteractWith(EntityPlayer player) { + return amsLmiter.isUseableByPlayer(player); + } + + @Override + public void detectAndSendChanges() { + super.detectAndSendChanges(); + + for(int i = 0; i < this.crafters.size(); i++) + { + ICrafting par1 = (ICrafting)this.crafters.get(i); + + if(this.heat != this.amsLmiter.heat) + { + par1.sendProgressBarUpdate(this, 0, this.amsLmiter.heat); + } + + if(this.efficiency != this.amsLmiter.efficiency) + { + par1.sendProgressBarUpdate(this, 1, this.amsLmiter.efficiency); + } + + if(this.warning != this.amsLmiter.warning) + { + par1.sendProgressBarUpdate(this, 2, this.amsLmiter.warning); + } + + if(this.mode != this.amsLmiter.mode) + { + par1.sendProgressBarUpdate(this, 3, this.amsLmiter.mode); + } + } + + this.heat = this.amsLmiter.heat; + this.efficiency = this.amsLmiter.efficiency; + this.warning = this.amsLmiter.warning; + this.mode = this.amsLmiter.mode; + } + + @Override + public void updateProgressBar(int i, int j) { + if(i == 0) + { + amsLmiter.heat = j; + } + if(i == 1) + { + amsLmiter.efficiency = j; + } + if(i == 2) + { + amsLmiter.warning = j; + } + if(i == 3) + { + amsLmiter.mode = j; + } + } +} diff --git a/com/hbm/inventory/gui/GUIAMSLimiter.java b/com/hbm/inventory/gui/GUIAMSLimiter.java new file mode 100644 index 000000000..dbab5a181 --- /dev/null +++ b/com/hbm/inventory/gui/GUIAMSLimiter.java @@ -0,0 +1,60 @@ +package com.hbm.inventory.gui; + +import org.lwjgl.opengl.GL11; + +import com.hbm.inventory.FluidTank; +import com.hbm.inventory.container.ContainerAMSLimiter; +import com.hbm.inventory.container.ContainerMachinePress; +import com.hbm.lib.RefStrings; +import com.hbm.tileentity.machine.TileEntityAMSLimiter; +import com.hbm.tileentity.machine.TileEntityMachinePress; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.resources.I18n; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.ResourceLocation; + +public class GUIAMSLimiter extends GuiInfoContainer { + + private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/gui_ams_limiter.png"); + private TileEntityAMSLimiter limiter; + + public GUIAMSLimiter(InventoryPlayer invPlayer, TileEntityAMSLimiter tedf) { + super(new ContainerAMSLimiter(invPlayer, tedf)); + limiter = tedf; + + this.xSize = 176; + this.ySize = 166; + } + + @Override + public void drawScreen(int mouseX, int mouseY, float f) { + super.drawScreen(mouseX, mouseY, f); + + limiter.tank.renderTankInfo(this, mouseX, mouseY, guiLeft + 26, guiTop + 69 - 52, 16, 52); + this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 134, guiTop + 69 - 52, 16, 52, limiter.power, limiter.maxPower); + } + + @Override + protected void drawGuiContainerForegroundLayer( int i, int j) { + String name = this.limiter.hasCustomInventoryName() ? this.limiter.getInventoryName() : I18n.format(this.limiter.getInventoryName()); + + this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); + this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + Minecraft.getMinecraft().getTextureManager().bindTexture(texture); + drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); + + int i = (int) limiter.getPowerScaled(52); + drawTexturedModalRect(guiLeft + 134, guiTop + 69 - i, 192, 52 - i, 16, i); + + Minecraft.getMinecraft().getTextureManager().bindTexture(limiter.tank.getSheet()); + + limiter.tank.renderTank(this, guiLeft + 26, guiTop + 69, limiter.tank.getTankType().textureX() * FluidTank.x, limiter.tank.getTankType().textureY() * FluidTank.y, 16, 52); + } +} diff --git a/com/hbm/inventory/gui/GUIFWatzCore.java b/com/hbm/inventory/gui/GUIFWatzCore.java index ace43e47e..26c0ec974 100644 --- a/com/hbm/inventory/gui/GUIFWatzCore.java +++ b/com/hbm/inventory/gui/GUIFWatzCore.java @@ -59,10 +59,13 @@ public class GUIFWatzCore extends GuiInfoContainer { int m = diFurnace.getSingularityType(); drawTexturedModalRect(guiLeft + 98, guiTop + 109, 240, 4 * m, 16, 4); - Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures); - + Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[0].getSheet()); diFurnace.tanks[0].renderTank(this, guiLeft + 8, guiTop + 88, diFurnace.tanks[0].getTankType().textureX() * FluidTank.x, diFurnace.tanks[0].getTankType().textureY() * FluidTank.y, 16, 70); + + Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[1].getSheet()); diFurnace.tanks[1].renderTank(this, guiLeft + 134, guiTop + 88, diFurnace.tanks[1].getTankType().textureX() * FluidTank.x, diFurnace.tanks[1].getTankType().textureY() * FluidTank.y, 16, 70); + + Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[2].getSheet()); diFurnace.tanks[2].renderTank(this, guiLeft + 152, guiTop + 88, diFurnace.tanks[2].getTankType().textureX() * FluidTank.x, diFurnace.tanks[2].getTankType().textureY() * FluidTank.y, 16, 70); } } diff --git a/com/hbm/inventory/gui/GUIFusionMultiblock.java b/com/hbm/inventory/gui/GUIFusionMultiblock.java index 24acef870..eb7b0eeea 100644 --- a/com/hbm/inventory/gui/GUIFusionMultiblock.java +++ b/com/hbm/inventory/gui/GUIFusionMultiblock.java @@ -56,10 +56,13 @@ public class GUIFusionMultiblock extends GuiInfoContainer { if(diFurnace.isRunning()) drawTexturedModalRect(guiLeft + 80, guiTop + 18, 240, 0, 16, 16); - Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures); - + Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[0].getSheet()); diFurnace.tanks[0].renderTank(this, guiLeft + 8, guiTop + 88, diFurnace.tanks[0].getTankType().textureX() * FluidTank.x, diFurnace.tanks[0].getTankType().textureY() * FluidTank.y, 16, 70); + + Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[1].getSheet()); diFurnace.tanks[1].renderTank(this, guiLeft + 134, guiTop + 88, diFurnace.tanks[1].getTankType().textureX() * FluidTank.x, diFurnace.tanks[1].getTankType().textureY() * FluidTank.y, 16, 70); + + Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[2].getSheet()); diFurnace.tanks[2].renderTank(this, guiLeft + 152, guiTop + 88, diFurnace.tanks[2].getTankType().textureX() * FluidTank.x, diFurnace.tanks[2].getTankType().textureY() * FluidTank.y, 16, 70); } } diff --git a/com/hbm/inventory/gui/GUIMachineCMBFactory.java b/com/hbm/inventory/gui/GUIMachineCMBFactory.java index 77c0acf3a..439b0266b 100644 --- a/com/hbm/inventory/gui/GUIMachineCMBFactory.java +++ b/com/hbm/inventory/gui/GUIMachineCMBFactory.java @@ -55,9 +55,8 @@ public class GUIMachineCMBFactory extends GuiInfoContainer { int j1 = diFurnace.getProgressScaled(24); drawTexturedModalRect(guiLeft + 101 + 9, guiTop + 34, 208, 0, j1 + 1, 16); - - Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures); - + + Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tank.getSheet()); diFurnace.tank.renderTank(this, guiLeft + 26, guiTop + 69, diFurnace.tank.getTankType().textureX() * FluidTank.x, diFurnace.tank.getTankType().textureY() * FluidTank.y, 16, 52); } } diff --git a/com/hbm/inventory/gui/GUIMachineChemplant.java b/com/hbm/inventory/gui/GUIMachineChemplant.java index 219736d3a..1a15d1411 100644 --- a/com/hbm/inventory/gui/GUIMachineChemplant.java +++ b/com/hbm/inventory/gui/GUIMachineChemplant.java @@ -58,12 +58,17 @@ public class GUIMachineChemplant extends GuiInfoContainer { int j = chemplant.getProgressScaled(90); drawTexturedModalRect(guiLeft + 43, guiTop + 89, 0, 222, j, 18); - - Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures); - + + Minecraft.getMinecraft().getTextureManager().bindTexture(chemplant.tanks[0].getSheet()); chemplant.tanks[0].renderTank(this, guiLeft + 8, guiTop + 52, chemplant.tanks[0].getTankType().textureX() * FluidTank.x, chemplant.tanks[0].getTankType().textureY() * FluidTank.y, 16, 34); + + Minecraft.getMinecraft().getTextureManager().bindTexture(chemplant.tanks[1].getSheet()); chemplant.tanks[1].renderTank(this, guiLeft + 26, guiTop + 52, chemplant.tanks[1].getTankType().textureX() * FluidTank.x, chemplant.tanks[1].getTankType().textureY() * FluidTank.y, 16, 34); + + Minecraft.getMinecraft().getTextureManager().bindTexture(chemplant.tanks[2].getSheet()); chemplant.tanks[2].renderTank(this, guiLeft + 134, guiTop + 52, chemplant.tanks[2].getTankType().textureX() * FluidTank.x, chemplant.tanks[2].getTankType().textureY() * FluidTank.y, 16, 34); + + Minecraft.getMinecraft().getTextureManager().bindTexture(chemplant.tanks[3].getSheet()); chemplant.tanks[3].renderTank(this, guiLeft + 152, guiTop + 52, chemplant.tanks[3].getTankType().textureX() * FluidTank.x, chemplant.tanks[3].getTankType().textureY() * FluidTank.y, 16, 34); } } diff --git a/com/hbm/inventory/gui/GUIMachineCoal.java b/com/hbm/inventory/gui/GUIMachineCoal.java index 913e0af54..bc072974d 100644 --- a/com/hbm/inventory/gui/GUIMachineCoal.java +++ b/com/hbm/inventory/gui/GUIMachineCoal.java @@ -57,9 +57,8 @@ public class GUIMachineCoal extends GuiInfoContainer { { drawTexturedModalRect(guiLeft + 79, guiTop + 34, 208, 0, 18, 18); } - - Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures); - + + Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tank.getSheet()); diFurnace.tank.renderTank(this, guiLeft + 8, guiTop + 69, diFurnace.tank.getTankType().textureX() * FluidTank.x, diFurnace.tank.getTankType().textureY() * FluidTank.y, 16, 52); } } diff --git a/com/hbm/inventory/gui/GUIMachineDiesel.java b/com/hbm/inventory/gui/GUIMachineDiesel.java index 0123e91f8..a930dfd81 100644 --- a/com/hbm/inventory/gui/GUIMachineDiesel.java +++ b/com/hbm/inventory/gui/GUIMachineDiesel.java @@ -57,9 +57,8 @@ public class GUIMachineDiesel extends GuiInfoContainer { { drawTexturedModalRect(guiLeft + 43 + 18 * 4, guiTop + 34, 208, 0, 18, 18); } - - Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures); - + + Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tank.getSheet()); diFurnace.tank.renderTank(this, guiLeft + 80, guiTop + 69, diFurnace.tank.getTankType().textureX() * FluidTank.x, diFurnace.tank.getTankType().textureY() * FluidTank.y, 16, 52); } } diff --git a/com/hbm/inventory/gui/GUIMachineFluidTank.java b/com/hbm/inventory/gui/GUIMachineFluidTank.java index 0a6200d30..3bdf9cd16 100644 --- a/com/hbm/inventory/gui/GUIMachineFluidTank.java +++ b/com/hbm/inventory/gui/GUIMachineFluidTank.java @@ -51,9 +51,8 @@ public class GUIMachineFluidTank extends GuiInfoContainer { if(tank.dna()) drawTexturedModalRect(guiLeft + 152, guiTop + 53, 176, 0, 16, 16); - - Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures); - + + Minecraft.getMinecraft().getTextureManager().bindTexture(tank.tank.getSheet()); tank.tank.renderTank(this, guiLeft + 71, guiTop + 69, tank.tank.getTankType().textureX() * FluidTank.x, tank.tank.getTankType().textureY() * FluidTank.y, 16, 52); tank.tank.renderTank(this, guiLeft + 71 + 16, guiTop + 69, tank.tank.getTankType().textureX() * FluidTank.x, tank.tank.getTankType().textureY() * FluidTank.y, 16, 52); tank.tank.renderTank(this, guiLeft + 71 + 32, guiTop + 69, tank.tank.getTankType().textureX() * FluidTank.x, tank.tank.getTankType().textureY() * FluidTank.y, 2, 52); diff --git a/com/hbm/inventory/gui/GUIMachineGasFlare.java b/com/hbm/inventory/gui/GUIMachineGasFlare.java index 9bcbdc3de..537b0533e 100644 --- a/com/hbm/inventory/gui/GUIMachineGasFlare.java +++ b/com/hbm/inventory/gui/GUIMachineGasFlare.java @@ -50,9 +50,8 @@ public class GUIMachineGasFlare extends GuiInfoContainer { int j = (int)flare.getPowerScaled(52); drawTexturedModalRect(guiLeft + 8, guiTop + 69 - j, 176, 52 - j, 16, j); - - Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures); - + + Minecraft.getMinecraft().getTextureManager().bindTexture(flare.tank.getSheet()); flare.tank.renderTank(this, guiLeft + 80, guiTop + 69, flare.tank.getTankType().textureX() * FluidTank.x, flare.tank.getTankType().textureY() * FluidTank.y, 16, 52); flare.tank.renderTank(this, guiLeft + 80 + 16, guiTop + 69, flare.tank.getTankType().textureX() * FluidTank.x, flare.tank.getTankType().textureY() * FluidTank.y, 16, 52); flare.tank.renderTank(this, guiLeft + 80 + 32, guiTop + 69, flare.tank.getTankType().textureX() * FluidTank.x, flare.tank.getTankType().textureY() * FluidTank.y, 2, 52); diff --git a/com/hbm/inventory/gui/GUIMachineGenerator.java b/com/hbm/inventory/gui/GUIMachineGenerator.java index ce2e97821..e3b8eb534 100644 --- a/com/hbm/inventory/gui/GUIMachineGenerator.java +++ b/com/hbm/inventory/gui/GUIMachineGenerator.java @@ -59,9 +59,10 @@ public class GUIMachineGenerator extends GuiInfoContainer { drawTexturedModalRect(guiLeft + 98, guiTop + 88 - i, 208, 52 - i, 16, i); } - Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures); - + Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[0].getSheet()); diFurnace.tanks[0].renderTank(this, guiLeft + 8, guiTop + 88, diFurnace.tanks[0].getTankType().textureX() * FluidTank.x, diFurnace.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52); + + Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[0].getSheet()); diFurnace.tanks[1].renderTank(this, guiLeft + 26, guiTop + 88, diFurnace.tanks[1].getTankType().textureX() * FluidTank.x, diFurnace.tanks[1].getTankType().textureY() * FluidTank.y, 16, 52); } } diff --git a/com/hbm/inventory/gui/GUIMachineInserter.java b/com/hbm/inventory/gui/GUIMachineInserter.java index 7a3e67913..79aa39132 100644 --- a/com/hbm/inventory/gui/GUIMachineInserter.java +++ b/com/hbm/inventory/gui/GUIMachineInserter.java @@ -50,10 +50,13 @@ public class GUIMachineInserter extends GuiInfoContainer { Minecraft.getMinecraft().getTextureManager().bindTexture(texture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures); - + Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[0].getSheet()); diFurnace.tanks[0].renderTank(this, guiLeft + 44, guiTop + 69, diFurnace.tanks[0].getTankType().textureX() * FluidTank.x, diFurnace.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52); + + Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[1].getSheet()); diFurnace.tanks[1].renderTank(this, guiLeft + 98, guiTop + 69, diFurnace.tanks[1].getTankType().textureX() * FluidTank.x, diFurnace.tanks[1].getTankType().textureY() * FluidTank.y, 16, 52); + + Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[2].getSheet()); diFurnace.tanks[2].renderTank(this, guiLeft + 152, guiTop + 69, diFurnace.tanks[2].getTankType().textureX() * FluidTank.x, diFurnace.tanks[2].getTankType().textureY() * FluidTank.y, 16, 52); } } diff --git a/com/hbm/inventory/gui/GUIMachineOilWell.java b/com/hbm/inventory/gui/GUIMachineOilWell.java index 3ea92142a..fa1f020db 100644 --- a/com/hbm/inventory/gui/GUIMachineOilWell.java +++ b/com/hbm/inventory/gui/GUIMachineOilWell.java @@ -64,11 +64,12 @@ public class GUIMachineOilWell extends GuiInfoContainer { if(l == 2) drawTexturedModalRect(guiLeft + 44, guiTop + 90, 224, 52, 16, 16); - Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures); - + Minecraft.getMinecraft().getTextureManager().bindTexture(derrick.tanks[0].getSheet()); derrick.tanks[0].renderTank(this, guiLeft + 80, guiTop + 70, derrick.tanks[0].getTankType().textureX() * FluidTank.x, derrick.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52); derrick.tanks[0].renderTank(this, guiLeft + 96, guiTop + 70, derrick.tanks[0].getTankType().textureX() * FluidTank.x, derrick.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52); derrick.tanks[0].renderTank(this, guiLeft + 112, guiTop + 70, derrick.tanks[0].getTankType().textureX() * FluidTank.x, derrick.tanks[0].getTankType().textureY() * FluidTank.y, 2, 52); + + Minecraft.getMinecraft().getTextureManager().bindTexture(derrick.tanks[1].getSheet()); derrick.tanks[1].renderTank(this, guiLeft + 80, guiTop + 124, derrick.tanks[1].getTankType().textureX() * FluidTank.x, derrick.tanks[1].getTankType().textureY() * FluidTank.y, 16, 52); derrick.tanks[1].renderTank(this, guiLeft + 96, guiTop + 124, derrick.tanks[1].getTankType().textureX() * FluidTank.x, derrick.tanks[1].getTankType().textureY() * FluidTank.y, 16, 52); derrick.tanks[1].renderTank(this, guiLeft + 112, guiTop + 124, derrick.tanks[1].getTankType().textureX() * FluidTank.x, derrick.tanks[1].getTankType().textureY() * FluidTank.y, 2, 52); diff --git a/com/hbm/inventory/gui/GUIMachinePuF6Tank.java b/com/hbm/inventory/gui/GUIMachinePuF6Tank.java index 03fda75b0..172005720 100644 --- a/com/hbm/inventory/gui/GUIMachinePuF6Tank.java +++ b/com/hbm/inventory/gui/GUIMachinePuF6Tank.java @@ -47,7 +47,7 @@ public class GUIMachinePuF6Tank extends GuiInfoContainer { Minecraft.getMinecraft().getTextureManager().bindTexture(texture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures); + Minecraft.getMinecraft().getTextureManager().bindTexture(tank.tank.getSheet()); tank.tank.renderTank(this, guiLeft + 80, guiTop + 69, tank.tank.getTankType().textureX() * FluidTank.x, tank.tank.getTankType().textureY() * FluidTank.y, 16, 52); } } diff --git a/com/hbm/inventory/gui/GUIMachinePumpjack.java b/com/hbm/inventory/gui/GUIMachinePumpjack.java index 3bab81daf..7a973052b 100644 --- a/com/hbm/inventory/gui/GUIMachinePumpjack.java +++ b/com/hbm/inventory/gui/GUIMachinePumpjack.java @@ -66,11 +66,12 @@ public class GUIMachinePumpjack extends GuiInfoContainer { if(l == 2) drawTexturedModalRect(guiLeft + 44, guiTop + 90, 224, 52, 16, 16); - Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures); - + Minecraft.getMinecraft().getTextureManager().bindTexture(derrick.tanks[0].getSheet()); derrick.tanks[0].renderTank(this, guiLeft + 80, guiTop + 70, derrick.tanks[0].getTankType().textureX() * FluidTank.x, derrick.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52); derrick.tanks[0].renderTank(this, guiLeft + 96, guiTop + 70, derrick.tanks[0].getTankType().textureX() * FluidTank.x, derrick.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52); derrick.tanks[0].renderTank(this, guiLeft + 112, guiTop + 70, derrick.tanks[0].getTankType().textureX() * FluidTank.x, derrick.tanks[0].getTankType().textureY() * FluidTank.y, 2, 52); + + Minecraft.getMinecraft().getTextureManager().bindTexture(derrick.tanks[1].getSheet()); derrick.tanks[1].renderTank(this, guiLeft + 80, guiTop + 124, derrick.tanks[1].getTankType().textureX() * FluidTank.x, derrick.tanks[1].getTankType().textureY() * FluidTank.y, 16, 52); derrick.tanks[1].renderTank(this, guiLeft + 96, guiTop + 124, derrick.tanks[1].getTankType().textureX() * FluidTank.x, derrick.tanks[1].getTankType().textureY() * FluidTank.y, 16, 52); derrick.tanks[1].renderTank(this, guiLeft + 112, guiTop + 124, derrick.tanks[1].getTankType().textureX() * FluidTank.x, derrick.tanks[1].getTankType().textureY() * FluidTank.y, 2, 52); diff --git a/com/hbm/inventory/gui/GUIMachineRefinery.java b/com/hbm/inventory/gui/GUIMachineRefinery.java index 22ffb4f93..3bf244216 100644 --- a/com/hbm/inventory/gui/GUIMachineRefinery.java +++ b/com/hbm/inventory/gui/GUIMachineRefinery.java @@ -54,14 +54,22 @@ public class GUIMachineRefinery extends GuiInfoContainer { int j = (int)refinery.getPowerScaled(52); drawTexturedModalRect(guiLeft + 8, guiTop + 70 - j, 176, 52 - j, 16, j); - - Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures); + + Minecraft.getMinecraft().getTextureManager().bindTexture(refinery.tanks[0].getSheet()); refinery.tanks[0].renderTank(this, guiLeft + 26, guiTop + 70, refinery.tanks[0].getTankType().textureX() * FluidTank.x, refinery.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52); refinery.tanks[0].renderTank(this, guiLeft + 26 + 16, guiTop + 70, refinery.tanks[0].getTankType().textureX() * FluidTank.x, refinery.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52); refinery.tanks[0].renderTank(this, guiLeft + 26 + 32, guiTop + 70, refinery.tanks[0].getTankType().textureX() * FluidTank.x, refinery.tanks[0].getTankType().textureY() * FluidTank.y, 2, 52); + + Minecraft.getMinecraft().getTextureManager().bindTexture(refinery.tanks[1].getSheet()); refinery.tanks[1].renderTank(this, guiLeft + 80, guiTop + 70, refinery.tanks[1].getTankType().textureX() * FluidTank.x, refinery.tanks[1].getTankType().textureY() * FluidTank.y, 16, 52); + + Minecraft.getMinecraft().getTextureManager().bindTexture(refinery.tanks[2].getSheet()); refinery.tanks[2].renderTank(this, guiLeft + 98, guiTop + 70, refinery.tanks[2].getTankType().textureX() * FluidTank.x, refinery.tanks[2].getTankType().textureY() * FluidTank.y, 16, 52); + + Minecraft.getMinecraft().getTextureManager().bindTexture(refinery.tanks[3].getSheet()); refinery.tanks[3].renderTank(this, guiLeft + 116, guiTop + 70, refinery.tanks[3].getTankType().textureX() * FluidTank.x, refinery.tanks[3].getTankType().textureY() * FluidTank.y, 16, 52); + + Minecraft.getMinecraft().getTextureManager().bindTexture(refinery.tanks[4].getSheet()); refinery.tanks[4].renderTank(this, guiLeft + 134, guiTop + 70, refinery.tanks[4].getTankType().textureX() * FluidTank.x, refinery.tanks[4].getTankType().textureY() * FluidTank.y, 16, 52); } } diff --git a/com/hbm/inventory/gui/GUIMachineTurbofan.java b/com/hbm/inventory/gui/GUIMachineTurbofan.java index bd0e5669a..c55cf8789 100644 --- a/com/hbm/inventory/gui/GUIMachineTurbofan.java +++ b/com/hbm/inventory/gui/GUIMachineTurbofan.java @@ -58,9 +58,8 @@ public class GUIMachineTurbofan extends GuiInfoContainer { int i = diFurnace.afterburner; drawTexturedModalRect(guiLeft + 107, guiTop + 53, 176, (i - 1) * 16, 16, 16); } - - Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures); - + + Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tank.getSheet()); diFurnace.tank.renderTank(this, guiLeft + 53, guiTop + 69, diFurnace.tank.getTankType().textureX() * FluidTank.x, diFurnace.tank.getTankType().textureY() * FluidTank.y, 16, 52); diFurnace.tank.renderTank(this, guiLeft + 53 + 16, guiTop + 69, diFurnace.tank.getTankType().textureX() * FluidTank.x, diFurnace.tank.getTankType().textureY() * FluidTank.y, 16, 52); diFurnace.tank.renderTank(this, guiLeft + 53 + 32, guiTop + 69, diFurnace.tank.getTankType().textureX() * FluidTank.x, diFurnace.tank.getTankType().textureY() * FluidTank.y, 2, 52); diff --git a/com/hbm/inventory/gui/GUIMachineUF6Tank.java b/com/hbm/inventory/gui/GUIMachineUF6Tank.java index e9aa8c15e..20adc69c3 100644 --- a/com/hbm/inventory/gui/GUIMachineUF6Tank.java +++ b/com/hbm/inventory/gui/GUIMachineUF6Tank.java @@ -46,7 +46,7 @@ public class GUIMachineUF6Tank extends GuiInfoContainer { Minecraft.getMinecraft().getTextureManager().bindTexture(texture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures); + Minecraft.getMinecraft().getTextureManager().bindTexture(tank.tank.getSheet()); tank.tank.renderTank(this, guiLeft + 80, guiTop + 69, tank.tank.getTankType().textureX() * FluidTank.x, tank.tank.getTankType().textureY() * FluidTank.y, 16, 52); } } diff --git a/com/hbm/inventory/gui/GUIReactorMultiblock.java b/com/hbm/inventory/gui/GUIReactorMultiblock.java index 6e1eec6a9..4e5038822 100644 --- a/com/hbm/inventory/gui/GUIReactorMultiblock.java +++ b/com/hbm/inventory/gui/GUIReactorMultiblock.java @@ -55,9 +55,10 @@ public class GUIReactorMultiblock extends GuiInfoContainer { int l = diFurnace.getHeatScaled(142); drawTexturedModalRect(guiLeft + 26, guiTop + 108, 0, 222, l, 16); - Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures); - + Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[0].getSheet()); diFurnace.tanks[0].renderTank(this, guiLeft + 8, guiTop + 70, diFurnace.tanks[0].getTankType().textureX() * FluidTank.x, diFurnace.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52); + + Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[1].getSheet()); diFurnace.tanks[1].renderTank(this, guiLeft + 26, guiTop + 70, diFurnace.tanks[1].getTankType().textureX() * FluidTank.x, diFurnace.tanks[1].getTankType().textureY() * FluidTank.y, 16, 52); } } diff --git a/com/hbm/inventory/gui/GUIWatzCore.java b/com/hbm/inventory/gui/GUIWatzCore.java index 1214eb457..85f01dd1f 100644 --- a/com/hbm/inventory/gui/GUIWatzCore.java +++ b/com/hbm/inventory/gui/GUIWatzCore.java @@ -57,9 +57,8 @@ public class GUIWatzCore extends GuiInfoContainer { int l = (int)diFurnace.getPowerScaled(70); drawTexturedModalRect(guiLeft + 152, guiTop + 106 - 18 - l, 192, 70 - l, 16, l); - - Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures); - + + Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tank.getSheet()); diFurnace.tank.renderTank(this, guiLeft + 134, guiTop + 106 - 18, diFurnace.tank.getTankType().textureX() * FluidTank.x, diFurnace.tank.getTankType().textureY() * FluidTank.y, 16, 70); } } diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 27a1be694..c242a9fec 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -391,13 +391,6 @@ public class ModItems { public static Item black_hole; public static Item crystal_xen; public static Item inf_water; - public static Item inf_coolant; - public static Item inf_deuterium; - public static Item inf_tritium; - public static Item inf_sulfur; - public static Item inf_diesel; - public static Item inf_antimatter; - public static Item inf_antischrabidium; public static Item canister_empty; public static Item canister_smear; @@ -1375,13 +1368,6 @@ public class ModItems { pellet_antimatter = new ItemDrop().setUnlocalizedName("pellet_antimatter").setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.cell_empty).setTextureName(RefStrings.MODID + ":pellet_antimatter"); crystal_xen = new ItemDrop().setUnlocalizedName("crystal_xen").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":crystal_xen"); inf_water = new Item().setUnlocalizedName("inf_water").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":inf_water"); - inf_coolant = new Item().setUnlocalizedName("inf_coolant").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":inf_coolant"); - inf_deuterium = new Item().setUnlocalizedName("inf_deuterium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":inf_deuterium"); - inf_tritium = new Item().setUnlocalizedName("inf_tritium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":inf_tritium"); - inf_sulfur = new Item().setUnlocalizedName("inf_sulfur").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":inf_sulfur"); - inf_diesel = new Item().setUnlocalizedName("inf_diesel").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":inf_diesel"); - inf_antimatter = new Item().setUnlocalizedName("inf_antimatter").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":inf_antimatter"); - inf_antischrabidium = new Item().setUnlocalizedName("inf_antischrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":inf_antischrabidium"); stamp_stone_flat = new ItemBlades(5).setUnlocalizedName("stamp_stone_flat").setMaxStackSize(1).setCreativeTab(MainRegistry.tabMachine).setTextureName(RefStrings.MODID + ":stamp_stone_flat"); stamp_stone_plate = new ItemBlades(5).setUnlocalizedName("stamp_stone_plate").setMaxStackSize(1).setCreativeTab(MainRegistry.tabMachine).setTextureName(RefStrings.MODID + ":stamp_stone_plate"); @@ -2449,13 +2435,6 @@ public class ModItems { //Infinite Tanks GameRegistry.registerItem(inf_water, inf_water.getUnlocalizedName()); - GameRegistry.registerItem(inf_coolant, inf_coolant.getUnlocalizedName()); - GameRegistry.registerItem(inf_deuterium, inf_deuterium.getUnlocalizedName()); - GameRegistry.registerItem(inf_tritium, inf_tritium.getUnlocalizedName()); - GameRegistry.registerItem(inf_sulfur, inf_sulfur.getUnlocalizedName()); - GameRegistry.registerItem(inf_diesel, inf_diesel.getUnlocalizedName()); - GameRegistry.registerItem(inf_antimatter, inf_antimatter.getUnlocalizedName()); - GameRegistry.registerItem(inf_antischrabidium, inf_antischrabidium.getUnlocalizedName()); //Large Tanks GameRegistry.registerItem(tank_waste, tank_waste.getUnlocalizedName()); diff --git a/com/hbm/items/food/ItemEnergy.java b/com/hbm/items/food/ItemEnergy.java index 546ac2cdf..b9280496e 100644 --- a/com/hbm/items/food/ItemEnergy.java +++ b/com/hbm/items/food/ItemEnergy.java @@ -2,6 +2,7 @@ package com.hbm.items.food; import java.util.List; +import com.hbm.explosion.ExplosionLarge; import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; @@ -59,7 +60,7 @@ public class ItemEnergy extends Item { } if(this == ModItems.chocolate_milk) { - p_77654_2_.createExplosion(null, p_77654_3_.posX, p_77654_3_.posY, p_77654_3_.posZ, 50, true); + ExplosionLarge.explode(p_77654_2_, p_77654_3_.posX, p_77654_3_.posY, p_77654_3_.posZ, 50, true, false, false); } if(this == ModItems.bottle_nuka) { @@ -181,11 +182,12 @@ public class ItemEnergy extends Item { @Override public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { - if(!(this == ModItems.can_creature || this == ModItems.can_mrsugar || this == ModItems.can_overcharge || this == ModItems.can_redbomb || this == ModItems.can_smart)) + if(!(this == ModItems.can_creature || this == ModItems.can_mrsugar || this == ModItems.can_overcharge || this == ModItems.can_redbomb || this == ModItems.can_smart || this == ModItems.chocolate_milk)) if(!p_77659_3_.inventory.hasItem(ModItems.bottle_opener)) return p_77659_1_; p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_)); + return p_77659_1_; } diff --git a/com/hbm/lib/HbmWorldGen.java b/com/hbm/lib/HbmWorldGen.java index 946acdb6a..eb428852c 100644 --- a/com/hbm/lib/HbmWorldGen.java +++ b/com/hbm/lib/HbmWorldGen.java @@ -38,6 +38,8 @@ public class HbmWorldGen implements IWorldGenerator { generateNether(world, rand, chunkX * 16, chunkZ * 16); case 0: generateSurface(world, rand, chunkX * 16, chunkZ * 16); + case 1: + generateEnd(world, rand, chunkX * 16, chunkZ * 16); } } @@ -461,4 +463,16 @@ public class HbmWorldGen implements IWorldGenerator { } } + private void generateEnd(World world, Random rand, int i, int j) { + + for (int k = 0; k < 8; k++) + { + int randPosX = i + rand.nextInt(16); + int randPosY = rand.nextInt(127); + int randPosZ = j + rand.nextInt(16); + + (new WorldGenMinable(ModBlocks.ore_tikite, 6, Blocks.end_stone)).generate(world, rand, randPosX, randPosY, randPosZ); + } + } + } diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index f09673fc6..c69f33fa4 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -1050,6 +1050,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.pellet_antimatter, 1), new Object[] { "###", "###", "###", '#', ModItems.cell_antimatter }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.fluid_tank_empty, 8), new Object[] { "121", "1 1", "121", '1', "plateAluminum", '2', "plateIron" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.fluid_barrel_empty, 2), new Object[] { "121", "1 1", "121", '1', "plateSteel", '2', "plateAluminum" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.inf_water, 1), new Object[] { "222", "1 1", "222", '1', Items.water_bucket, '2', "plateAluminum" })); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.powder_desh_mix, 1), new Object[] { ModItems.powder_actinium_tiny, ModItems.powder_actinium_tiny, ModItems.powder_lanthanium_tiny, ModItems.powder_lanthanium_tiny, ModItems.powder_cerium_tiny, ModItems.powder_cobalt_tiny, ModItems.powder_lithium_tiny, ModItems.powder_neodymium_tiny, ModItems.powder_niobium_tiny }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.powder_desh_mix, 9), new Object[] { ModItems.powder_actinium, ModItems.powder_actinium, ModItems.powder_lanthanium, ModItems.powder_lanthanium, ModItems.powder_cerium, ModItems.powder_cobalt, ModItems.powder_lithium, ModItems.powder_neodymium, ModItems.powder_niobium }); diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index 9dc9e7d0a..c9fff1c12 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -174,6 +174,9 @@ import com.hbm.tileentity.deco.TileEntityRotationTester; import com.hbm.tileentity.deco.TileEntityTestContainer; import com.hbm.tileentity.deco.TileEntityTestRender; import com.hbm.tileentity.deco.TileEntityYellowBarrel; +import com.hbm.tileentity.machine.TileEntityAMSBase; +import com.hbm.tileentity.machine.TileEntityAMSEmitter; +import com.hbm.tileentity.machine.TileEntityAMSLimiter; import com.hbm.tileentity.machine.TileEntityConverterHeRf; import com.hbm.tileentity.machine.TileEntityConverterRfHe; import com.hbm.tileentity.machine.TileEntityCoreAdvanced; @@ -517,6 +520,9 @@ public class MainRegistry GameRegistry.registerTileEntity(TileEntityCrateIron.class, "tileentity_crate_iron"); GameRegistry.registerTileEntity(TileEntityCrateSteel.class, "tileentity_crate_steel"); GameRegistry.registerTileEntity(TileEntityMachinePress.class, "tileentity_press"); + GameRegistry.registerTileEntity(TileEntityAMSBase.class, "tileentity_ams_base"); + GameRegistry.registerTileEntity(TileEntityAMSEmitter.class, "tileentity_ams_emitter"); + GameRegistry.registerTileEntity(TileEntityAMSLimiter.class, "tileentity_ams_limiter"); EntityRegistry.registerModEntity(EntityRocket.class, "entity_rocket", 0, this, 250, 1, true); EntityRegistry.registerModEntity(EntityNukeExplosion.class, "entity_nuke_explosion", 1, this, 250, 1, true); diff --git a/com/hbm/main/ResourceManager.java b/com/hbm/main/ResourceManager.java index d6d0da204..ca2c638ea 100644 --- a/com/hbm/main/ResourceManager.java +++ b/com/hbm/main/ResourceManager.java @@ -67,6 +67,11 @@ public class ResourceManager { //Press public static final ResourceLocation press_body_tex = new ResourceLocation(RefStrings.MODID, "textures/models/press_body.png"); public static final ResourceLocation press_head_tex = new ResourceLocation(RefStrings.MODID, "textures/models/press_head.png"); + + //Anti Mass Spectrometer + public static final ResourceLocation ams_base_tex = new ResourceLocation(RefStrings.MODID, "textures/models/ams_base.png"); + public static final ResourceLocation ams_emitter_tex = new ResourceLocation(RefStrings.MODID, "textures/models/ams_emitter.png"); + public static final ResourceLocation ams_limiter_tex = new ResourceLocation(RefStrings.MODID, "textures/models/ams_limiter.png"); ////Obj Items diff --git a/com/hbm/render/entity/RenderSmallNukeAlt.java b/com/hbm/render/entity/RenderSmallNukeAlt.java index be49604b7..8f495c2b7 100644 --- a/com/hbm/render/entity/RenderSmallNukeAlt.java +++ b/com/hbm/render/entity/RenderSmallNukeAlt.java @@ -42,7 +42,7 @@ public class RenderSmallNukeAlt extends Render { @Override public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { - if(((EntityNukeCloudSmall)p_76986_1_).getDataWatcher().getWatchableObjectShort(17) > 100) + if(((EntityNukeCloudSmall)p_76986_1_).age > 100) { this.renderMush((EntityNukeCloudSmall)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_); this.renderCloud((EntityNukeCloudSmall)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_); @@ -58,7 +58,7 @@ public class RenderSmallNukeAlt extends Render { GL11.glTranslatef((float)p_76986_2_, (float)p_76986_4_, (float)p_76986_6_); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_CULL_FACE); - if(p_76986_1_.getDataWatcher().getWatchableObjectShort(17) < 150) + if(p_76986_1_.age < 150) { //GL11.glTranslatef(0.0F, -60F + ((p_76986_1_.age - 100) * 60 / 50), 0.0F); GL11.glTranslatef(0.0F, p_76986_1_.height, 0.0F); @@ -81,7 +81,7 @@ public class RenderSmallNukeAlt extends Render { { scale += 0.02; }*/ - GL11.glScalef(p_76986_1_.getDataWatcher().getWatchableObjectShort(18), 1.0F, p_76986_1_.getDataWatcher().getWatchableObjectShort(18)); + GL11.glScalef(p_76986_1_.scale, 1.0F, p_76986_1_.scale); GL11.glScalef(50F, 25.0F, 50F); bindTexture(ringBigTexture); @@ -97,7 +97,7 @@ public class RenderSmallNukeAlt extends Render { GL11.glDisable(GL11.GL_CULL_FACE); GL11.glTranslatef(0.0F, 18F, 0.0F); //ring += 0.1F; - GL11.glScalef(p_76986_1_.getDataWatcher().getWatchableObjectShort(19) * 10, 30F, p_76986_1_.getDataWatcher().getWatchableObjectShort(19) * 10); + GL11.glScalef(p_76986_1_.ring * 10, 30F, p_76986_1_.ring * 10); bindTexture(ringTexture); ringModel.renderAll(); @@ -108,13 +108,13 @@ public class RenderSmallNukeAlt extends Render { Tessellator tessellator = Tessellator.instance; RenderHelper.disableStandardItemLighting(); - float f1 = (p_76986_1_.getDataWatcher().getWatchableObjectShort(17) + 2.0F) / 200.0F; + float f1 = (p_76986_1_.age + 2.0F) / 200.0F; float f2 = 0.0F; int count = 250; - if(p_76986_1_.getDataWatcher().getWatchableObjectShort(17) < 250) + if(p_76986_1_.age < 250) { - count = p_76986_1_.getDataWatcher().getWatchableObjectShort(17) * 3; + count = p_76986_1_.age * 3; } if (f1 > 0.8F) diff --git a/com/hbm/render/tileentity/RenderAMSBase.java b/com/hbm/render/tileentity/RenderAMSBase.java index f7783f08f..b67df8808 100644 --- a/com/hbm/render/tileentity/RenderAMSBase.java +++ b/com/hbm/render/tileentity/RenderAMSBase.java @@ -20,7 +20,7 @@ public class RenderAMSBase extends TileEntitySpecialRenderer { GL11.glDisable(GL11.GL_CULL_FACE); GL11.glRotatef(180, 0F, 1F, 0F); - bindTexture(ResourceManager.turbofan_blades_tex); + bindTexture(ResourceManager.ams_base_tex); ResourceManager.ams_base.renderAll(); diff --git a/com/hbm/render/tileentity/RenderAMSEmitter.java b/com/hbm/render/tileentity/RenderAMSEmitter.java index 1cd86fa36..859ba2bf2 100644 --- a/com/hbm/render/tileentity/RenderAMSEmitter.java +++ b/com/hbm/render/tileentity/RenderAMSEmitter.java @@ -24,7 +24,7 @@ public class RenderAMSEmitter extends TileEntitySpecialRenderer { GL11.glDisable(GL11.GL_CULL_FACE); GL11.glRotatef(180, 0F, 1F, 0F); - bindTexture(ResourceManager.turbofan_blades_tex); + bindTexture(ResourceManager.ams_emitter_tex); ResourceManager.ams_emitter.renderAll(); diff --git a/com/hbm/render/tileentity/RenderAMSLimiter.java b/com/hbm/render/tileentity/RenderAMSLimiter.java index 5b4a436fc..a01cb4bbe 100644 --- a/com/hbm/render/tileentity/RenderAMSLimiter.java +++ b/com/hbm/render/tileentity/RenderAMSLimiter.java @@ -32,7 +32,7 @@ public class RenderAMSLimiter extends TileEntitySpecialRenderer { GL11.glRotatef(0, 0F, 1F, 0F); break; } - bindTexture(ResourceManager.turbofan_blades_tex); + bindTexture(ResourceManager.ams_limiter_tex); ResourceManager.ams_limiter.renderAll(); diff --git a/com/hbm/tileentity/machine/TileEntityAMSLimiter.java b/com/hbm/tileentity/machine/TileEntityAMSLimiter.java index 33111148a..d51fbdc88 100644 --- a/com/hbm/tileentity/machine/TileEntityAMSLimiter.java +++ b/com/hbm/tileentity/machine/TileEntityAMSLimiter.java @@ -1,11 +1,275 @@ package com.hbm.tileentity.machine; +import java.util.ArrayList; +import java.util.List; + +import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.interfaces.IConsumer; +import com.hbm.interfaces.IFluidAcceptor; +import com.hbm.interfaces.IFluidContainer; +import com.hbm.interfaces.IFluidSource; +import com.hbm.inventory.FluidTank; +import com.hbm.items.ModItems; +import com.hbm.items.special.ItemBattery; +import com.hbm.lib.Library; +import com.hbm.packet.AuxElectricityPacket; +import com.hbm.packet.PacketDispatcher; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -public class TileEntityAMSLimiter extends TileEntity { +public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory, IConsumer, IFluidContainer, IFluidAcceptor { + + private ItemStack slots[]; + + public long power = 0; + public static final long maxPower = 1000000; + public int efficiency = 0; + public static final long maxEfficiency = 100; + public int heat = 0; + public static final long maxHeat = 2500; + public int age = 0; + public int warning = 0; + public int mode = 0; + public FluidTank tank; + + private static final int[] slots_top = new int[] { 0 }; + private static final int[] slots_bottom = new int[] { 0 }; + private static final int[] slots_side = new int[] { 0 }; + + private String customName; + + public TileEntityAMSLimiter() { + slots = new ItemStack[4]; + tank = new FluidTank(FluidType.COOLANT, 64000, 0); + } + + @Override + public int getSizeInventory() { + return slots.length; + } + + @Override + public ItemStack getStackInSlot(int i) { + return slots[i]; + } + + @Override + public ItemStack getStackInSlotOnClosing(int i) { + if(slots[i] != null) + { + ItemStack itemStack = slots[i]; + slots[i] = null; + return itemStack; + } else { + return null; + } + } + + @Override + public void setInventorySlotContents(int i, ItemStack itemStack) { + slots[i] = itemStack; + if(itemStack != null && itemStack.stackSize > getInventoryStackLimit()) + { + itemStack.stackSize = getInventoryStackLimit(); + } + } + + @Override + public String getInventoryName() { + return this.hasCustomInventoryName() ? this.customName : "container.amsLimiter"; + } + + @Override + public boolean hasCustomInventoryName() { + return this.customName != null && this.customName.length() > 0; + } + + public void setCustomName(String name) { + this.customName = name; + } + + @Override + public int getInventoryStackLimit() { + return 64; + } + + @Override + public boolean isUseableByPlayer(EntityPlayer player) { + if(worldObj.getTileEntity(xCoord, yCoord, zCoord) != this) + { + return false; + }else{ + return player.getDistanceSq(xCoord + 0.5D, yCoord + 0.5D, zCoord + 0.5D) <=128; + } + } + + @Override + public void openInventory() {} + @Override + public void closeInventory() {} + + @Override + public boolean isItemValidForSlot(int i, ItemStack stack) { + + return false; + } + + @Override + public ItemStack decrStackSize(int i, int j) { + if(slots[i] != null) + { + if(slots[i].stackSize <= j) + { + ItemStack itemStack = slots[i]; + slots[i] = null; + return itemStack; + } + ItemStack itemStack1 = slots[i].splitStack(j); + if (slots[i].stackSize == 0) + { + slots[i] = null; + } + + return itemStack1; + } else { + return null; + } + } + + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); + NBTTagList list = nbt.getTagList("items", 10); + + power = nbt.getLong("power"); + tank.readFromNBT(nbt, "coolant"); + efficiency = nbt.getInteger("efficiency"); + heat = nbt.getInteger("heat"); + slots = new ItemStack[getSizeInventory()]; + + for(int i = 0; i < list.tagCount(); i++) + { + NBTTagCompound nbt1 = list.getCompoundTagAt(i); + byte b0 = nbt1.getByte("slot"); + if(b0 >= 0 && b0 < slots.length) + { + slots[b0] = ItemStack.loadItemStackFromNBT(nbt1); + } + } + } + + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); + nbt.setLong("power", power); + tank.writeToNBT(nbt, "coolant"); + nbt.setInteger("power", efficiency); + nbt.setInteger("power", heat); + NBTTagList list = new NBTTagList(); + + for(int i = 0; i < slots.length; i++) + { + if(slots[i] != null) + { + NBTTagCompound nbt1 = new NBTTagCompound(); + nbt1.setByte("slot", (byte)i); + slots[i].writeToNBT(nbt1); + list.appendTag(nbt1); + } + } + nbt.setTag("items", list); + } + + @Override + public int[] getAccessibleSlotsFromSide(int p_94128_1_) + { + return p_94128_1_ == 0 ? slots_bottom : (p_94128_1_ == 1 ? slots_top : slots_side); + } + + @Override + public boolean canInsertItem(int i, ItemStack itemStack, int j) { + return this.isItemValidForSlot(i, itemStack); + } + + @Override + public boolean canExtractItem(int i, ItemStack itemStack, int j) { + return false; + } + + @Override + public void updateEntity() { + + if (!worldObj.isRemote) { + + tank.setType(0, 1, slots); + tank.updateTank(xCoord, yCoord, zCoord); + + power = Library.chargeTEFromItems(slots, 3, power, maxPower); + + PacketDispatcher.wrapper.sendToAll(new AuxElectricityPacket(xCoord, yCoord, zCoord, power)); + } + } + + public long getPowerScaled(long i) { + return (power * i) / maxPower; + } + + @Override + public void setPower(long i) { + power = i; + + } + + @Override + public long getPower() { + return power; + + } + + @Override + public long getMaxPower() { + return maxPower; + } + + @Override + public void setAFluidFill(int i, FluidType type) { + if(type.name().equals(tank.getTankType().name())) + tank.setFill(i); + } + + @Override + public int getAFluidFill(FluidType type) { + if(type.name().equals(tank.getTankType().name())) + return tank.getFill(); + else + return 0; + } + + @Override + public int getMaxAFluidFill(FluidType type) { + if(type.name().equals(tank.getTankType().name())) + return tank.getMaxFill(); + else + return 0; + } + + @Override + public void setFillstate(int fill, int index) { + tank.setFill(fill); + } + + @Override + public void setType(FluidType type, int index) { + tank.setTankType(type); + } @Override public AxisAlignedBB getRenderBoundingBox() { diff --git a/com/hbm/tileentity/machine/TileEntityFWatzCore.java b/com/hbm/tileentity/machine/TileEntityFWatzCore.java index 1b2fce23c..3a535c2c3 100644 --- a/com/hbm/tileentity/machine/TileEntityFWatzCore.java +++ b/com/hbm/tileentity/machine/TileEntityFWatzCore.java @@ -299,38 +299,38 @@ public class TileEntityFWatzCore extends TileEntity implements ISidedInventory, boolean isWorking = false; - if(i == 1 && tanks[1].getFill() - 750 >= 0 && tanks[2].getFill() - 750 >= 0) { + if(i == 1 && tanks[1].getFill() - 75 >= 0 && tanks[2].getFill() - 75 >= 0) { tanks[0].setFill(tanks[0].getFill() - 150); - tanks[1].setFill(tanks[1].getFill() - 750); - tanks[2].setFill(tanks[2].getFill() - 750); + tanks[1].setFill(tanks[1].getFill() - 75); + tanks[2].setFill(tanks[2].getFill() - 75); power += 500000; isWorking = true; } - if(i == 2 && tanks[1].getFill() - 750 >= 0 && tanks[2].getFill() - 350 >= 0) { + if(i == 2 && tanks[1].getFill() - 75 >= 0 && tanks[2].getFill() - 35 >= 0) { tanks[0].setFill(tanks[0].getFill() - 75); - tanks[1].setFill(tanks[1].getFill() - 350); - tanks[2].setFill(tanks[2].getFill() - 300); + tanks[1].setFill(tanks[1].getFill() - 35); + tanks[2].setFill(tanks[2].getFill() - 30); power += 250000; isWorking = true; } - if(i == 3 && tanks[1].getFill() - 750 >= 0 && tanks[2].getFill() - 1400 >= 0) { + if(i == 3 && tanks[1].getFill() - 75 >= 0 && tanks[2].getFill() - 140 >= 0) { tanks[0].setFill(tanks[0].getFill() - 300); - tanks[1].setFill(tanks[1].getFill() - 750); - tanks[2].setFill(tanks[2].getFill() - 1400); + tanks[1].setFill(tanks[1].getFill() - 75); + tanks[2].setFill(tanks[2].getFill() - 140); power += 1000000; isWorking = true; } - if(i == 4 && tanks[1].getFill() - 1000 >= 0 && tanks[2].getFill() - 1000 >= 0) { + if(i == 4 && tanks[1].getFill() - 100 >= 0 && tanks[2].getFill() - 100 >= 0) { tanks[0].setFill(tanks[0].getFill() - 100); - tanks[1].setFill(tanks[1].getFill() - 1000); - tanks[2].setFill(tanks[2].getFill() - 1000); + tanks[1].setFill(tanks[1].getFill() - 100); + tanks[2].setFill(tanks[2].getFill() - 100); power += 1000000; isWorking = true; } - if(i == 5 && tanks[1].getFill() - 150 >= 0 && tanks[2].getFill() - 150 >= 0) { + if(i == 5 && tanks[1].getFill() - 15 >= 0 && tanks[2].getFill() - 15 >= 0) { tanks[0].setFill(tanks[0].getFill() - 150); - tanks[1].setFill(tanks[1].getFill() - 150); - tanks[2].setFill(tanks[2].getFill() - 150); + tanks[1].setFill(tanks[1].getFill() - 15); + tanks[2].setFill(tanks[2].getFill() - 15); power += 10000000; isWorking = true; } @@ -360,7 +360,7 @@ public class TileEntityFWatzCore extends TileEntity implements ISidedInventory, if(this.isRunning() && (tanks[1].getFill() <= 0 || tanks[2].getFill() <= 0 || !hasFuse() || getSingularityType() == 0) || cooldown || !this.isStructureValid(worldObj)) this.emptyPlasma(); - if(!this.isRunning() && tanks[1].getFill() >= 1000 && tanks[2].getFill() >= 1000 && hasFuse() && getSingularityType() > 0 && !cooldown && this.isStructureValid(worldObj)) + if(!this.isRunning() && tanks[1].getFill() >= 100 && tanks[2].getFill() >= 100 && hasFuse() && getSingularityType() > 0 && !cooldown && this.isStructureValid(worldObj)) this.fillPlasma(); PacketDispatcher.wrapper.sendToAll(new AuxElectricityPacket(xCoord, yCoord, zCoord, power)); diff --git a/com/hbm/tileentity/machine/TileEntityMachineDeuterium.java b/com/hbm/tileentity/machine/TileEntityMachineDeuterium.java index 325fe9191..df099b20c 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineDeuterium.java +++ b/com/hbm/tileentity/machine/TileEntityMachineDeuterium.java @@ -283,9 +283,6 @@ public class TileEntityMachineDeuterium extends TileEntity implements ISidedInve slots[2] = null; } } - if (slots[2] != null && slots[2].getItem() == ModItems.inf_sulfur) { - sulfur = maxFill; - } if (slots[1] != null && slots[1].getItem() == Items.water_bucket && water + 250 <= maxFill) { water += 250; diff --git a/com/hbm/tileentity/machine/TileEntityMachineDiesel.java b/com/hbm/tileentity/machine/TileEntityMachineDiesel.java index 05b934b29..7cf1fb4a7 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineDiesel.java +++ b/com/hbm/tileentity/machine/TileEntityMachineDiesel.java @@ -32,7 +32,7 @@ public class TileEntityMachineDiesel extends TileEntity implements ISidedInvento public long power; public int soundCycle = 0; public static final long maxPower = 50000; - public int powerCap = 15000; + public long powerCap = 50000; public int age = 0; public List list = new ArrayList(); public FluidTank tank; @@ -152,7 +152,7 @@ public class TileEntityMachineDiesel extends TileEntity implements ISidedInvento NBTTagList list = nbt.getTagList("items", 10); this.power = nbt.getLong("powerTime"); - this.powerCap = nbt.getInteger("powerCap"); + this.powerCap = nbt.getLong("powerCap"); tank.readFromNBT(nbt, "fuel"); slots = new ItemStack[getSizeInventory()]; @@ -169,7 +169,7 @@ public class TileEntityMachineDiesel extends TileEntity implements ISidedInvento public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); nbt.setLong("powerTime", power); - nbt.setInteger("powerCap", powerCap); + nbt.setLong("powerCap", powerCap); tank.writeToNBT(nbt, "fuel"); NBTTagList list = new NBTTagList(); @@ -225,9 +225,15 @@ public class TileEntityMachineDiesel extends TileEntity implements ISidedInvento tank.setType(3, 4, slots); tank.loadTank(0, 1, slots); tank.updateTank(xCoord, yCoord, zCoord); + + FluidType type = tank.getTankType(); + if(type.name().equals(FluidType.NITAN.name())) + powerCap = maxPower * 10; + else + powerCap = maxPower; // Battery Item - power = Library.chargeItemsFromTE(slots, 2, power, maxPower); + power = Library.chargeItemsFromTE(slots, 2, power, powerCap); generate(); @@ -248,7 +254,7 @@ public class TileEntityMachineDiesel extends TileEntity implements ISidedInvento if(type.name().equals(FluidType.BIOFUEL.name())) return 400; if(type.name().equals(FluidType.NITAN.name())) - return 2500; + return 5000; return 0; } diff --git a/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java b/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java index 451afc1b3..879084491 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java +++ b/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java @@ -387,8 +387,11 @@ public class TileEntityMachineIGenerator extends TileEntity implements ISidedInv } } - if (slots[13] != null && slots[13].getItem() == ModItems.inf_diesel) + if (slots[13] != null && slots[13].getItem() == ModItems.fluid_barrel_infinite) { this.fuel = TileEntityMachineIGenerator.maxFuel; + this.lubricant = TileEntityMachineIGenerator.maxLubricant; + this.water = TileEntityMachineIGenerator.maxWater; + } } public void doLubeTask() {