From 61c5d932b04e478741e1fe0f906d691932ec48e5 Mon Sep 17 00:00:00 2001 From: Bob Date: Thu, 25 Feb 2021 00:24:22 +0100 Subject: [PATCH] screm --- src/main/java/assets/hbm/lang/en_US.lang | 4 +- .../hbm/models/turrets/turret_chekhov.obj | 1368 +++++++++-------- .../textures/gui/weapon/gui_turret_base.png | Bin 0 -> 3735 bytes .../java/com/hbm/blocks/bomb/TurretCIWS.java | 2 +- .../com/hbm/blocks/bomb/TurretCheapo.java | 2 +- .../com/hbm/blocks/bomb/TurretChekhov.java | 2 +- .../com/hbm/blocks/bomb/TurretFlamer.java | 2 +- .../java/com/hbm/blocks/bomb/TurretHeavy.java | 2 +- .../java/com/hbm/blocks/bomb/TurretLight.java | 2 +- .../com/hbm/blocks/bomb/TurretRocket.java | 2 +- .../com/hbm/blocks/bomb/TurretSpitfire.java | 2 +- .../java/com/hbm/blocks/bomb/TurretTau.java | 2 +- .../hbm/blocks/machine/MachineForceField.java | 81 +- .../hbm/explosion/ExplosionNukeGeneric.java | 2 +- .../com/hbm/items/machine/ItemTurretChip.java | 2 +- .../com/hbm/items/tool/ItemTurretControl.java | 4 +- .../com/hbm/items/weapon/ItemTurretAmmo.java | 2 +- src/main/java/com/hbm/main/ClientProxy.java | 6 +- src/main/java/com/hbm/main/MainRegistry.java | 1 + .../java/com/hbm/packet/AuxGaugePacket.java | 4 +- .../java/com/hbm/packet/TETurretPacket.java | 3 +- .../render/tileentity/RenderCIWSTurret.java | 4 +- .../render/tileentity/RenderCheapoTurret.java | 4 +- .../render/tileentity/RenderFlamerTurret.java | 2 +- .../render/tileentity/RenderHeavyTurret.java | 3 +- .../render/tileentity/RenderLightTurret.java | 2 +- .../render/tileentity/RenderRocketTurret.java | 2 +- .../tileentity/RenderSpitfireTurret.java | 2 +- .../render/tileentity/RenderTauTurret.java | 2 +- .../bomb/TileEntityTurretChekhov.java | 7 - .../TileEntityTurretBase.java | 2 +- .../turret/TileEntityTurretBaseNT.java | 212 +++ .../TileEntityTurretCIWS.java | 2 +- .../TileEntityTurretCheapo.java | 2 +- .../turret/TileEntityTurretChekhov.java | 30 + .../TileEntityTurretFlamer.java | 2 +- .../TileEntityTurretHeavy.java | 2 +- .../TileEntityTurretLight.java | 2 +- .../TileEntityTurretRocket.java | 2 +- .../TileEntityTurretSpitfire.java | 2 +- .../{bomb => turret}/TileEntityTurretTau.java | 2 +- 41 files changed, 1043 insertions(+), 740 deletions(-) create mode 100644 src/main/java/assets/hbm/textures/gui/weapon/gui_turret_base.png delete mode 100644 src/main/java/com/hbm/tileentity/bomb/TileEntityTurretChekhov.java rename src/main/java/com/hbm/tileentity/{bomb => turret}/TileEntityTurretBase.java (99%) create mode 100644 src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java rename src/main/java/com/hbm/tileentity/{bomb => turret}/TileEntityTurretCIWS.java (94%) rename src/main/java/com/hbm/tileentity/{bomb => turret}/TileEntityTurretCheapo.java (94%) create mode 100644 src/main/java/com/hbm/tileentity/turret/TileEntityTurretChekhov.java rename src/main/java/com/hbm/tileentity/{bomb => turret}/TileEntityTurretFlamer.java (66%) rename src/main/java/com/hbm/tileentity/{bomb => turret}/TileEntityTurretHeavy.java (66%) rename src/main/java/com/hbm/tileentity/{bomb => turret}/TileEntityTurretLight.java (66%) rename src/main/java/com/hbm/tileentity/{bomb => turret}/TileEntityTurretRocket.java (66%) rename src/main/java/com/hbm/tileentity/{bomb => turret}/TileEntityTurretSpitfire.java (67%) rename src/main/java/com/hbm/tileentity/{bomb => turret}/TileEntityTurretTau.java (66%) diff --git a/src/main/java/assets/hbm/lang/en_US.lang b/src/main/java/assets/hbm/lang/en_US.lang index 805aff88b..c7867a0c4 100644 --- a/src/main/java/assets/hbm/lang/en_US.lang +++ b/src/main/java/assets/hbm/lang/en_US.lang @@ -2470,7 +2470,7 @@ tile.hadron_plating_glass.name=Particle Accelerator Plating (Window) tile.hadron_plating_striped.name=Particle Accelerator Plating (Cool Hazard Stripes) tile.hadron_plating_voltz.name=Particle Accelerator Plating (VOLTZ) tile.hadron_plating_yellow.name=Particle Accelerator Plating (YelloDye) -tile.hadron_power.name=Particle Accelerator Power Plugtankish wanted +tile.hadron_power.name=Particle Accelerator Power Plug tile.hazmat.name=Hazmat Cloth Block tile.iter.name=Fusion Reactor tile.lamp_tritium_blue_off.name=Blue Tritium Lamp @@ -2798,4 +2798,4 @@ weapon.ability.chainsaw=Painsaw weapon.ability.radiation=Radioactive Blade weapon.ability.phosphorus=Phosphorus Tip weapon.ability.stun=Stunning -weapon.ability.vampire=Vampire \ No newline at end of file +weapon.ability.vampire=Vampire diff --git a/src/main/java/assets/hbm/models/turrets/turret_chekhov.obj b/src/main/java/assets/hbm/models/turrets/turret_chekhov.obj index d9488dcef..c0f567d4a 100644 --- a/src/main/java/assets/hbm/models/turrets/turret_chekhov.obj +++ b/src/main/java/assets/hbm/models/turrets/turret_chekhov.obj @@ -5018,14 +5018,6 @@ v 0.574524 0.250000 0.397748 v 0.574524 0.375000 0.397748 v 0.220971 0.250000 0.397748 v 0.397748 0.250000 0.220971 -v 0.000000 0.312500 -0.500000 -v 0.353553 0.312500 -0.353553 -v 0.500000 0.312500 0.000000 -v 0.353553 0.312500 0.353553 -v -0.000000 0.312500 0.500000 -v -0.353553 0.312500 0.353553 -v -0.500000 0.312500 0.000000 -v -0.353553 0.312500 -0.353553 v 0.000000 0.312500 -0.625000 v 0.441942 0.312500 -0.441942 v 0.625000 0.312500 0.000000 @@ -5034,14 +5026,6 @@ v -0.000000 0.312500 0.625000 v -0.441942 0.312500 0.441942 v -0.625000 0.312500 0.000000 v -0.441942 0.312500 -0.441942 -v 0.000000 0.437500 -0.500000 -v 0.353553 0.437500 -0.353553 -v 0.500000 0.437500 0.000000 -v 0.353553 0.437500 0.353553 -v -0.000000 0.437500 0.500000 -v -0.353553 0.437500 0.353553 -v -0.500000 0.437500 0.000000 -v -0.353553 0.437500 -0.353553 v 0.000000 0.437500 -0.625000 v 0.441942 0.437500 -0.441942 v 0.625000 0.437500 0.000000 @@ -5082,6 +5066,38 @@ v -0.375000 0.500000 0.375000 v -0.500000 0.500000 0.375000 v -0.375000 0.500000 0.500000 v -0.500000 0.500000 0.500000 +v 0.000000 0.312500 -0.500000 +v 0.353553 0.312500 -0.353553 +v 0.500000 0.312500 0.000000 +v 0.353553 0.312500 0.353553 +v -0.000000 0.312500 0.500000 +v -0.353553 0.312500 0.353553 +v -0.500000 0.312500 0.000000 +v -0.353553 0.312500 -0.353553 +v 0.000000 0.312500 -0.625000 +v 0.441942 0.312500 -0.441942 +v 0.625000 0.312500 0.000000 +v 0.441942 0.312500 0.441942 +v -0.000000 0.312500 0.625000 +v -0.441942 0.312500 0.441942 +v -0.625000 0.312500 0.000000 +v -0.441942 0.312500 -0.441942 +v 0.000000 0.437500 -0.500000 +v 0.353553 0.437500 -0.353553 +v 0.500000 0.437500 0.000000 +v 0.353553 0.437500 0.353553 +v -0.000000 0.437500 0.500000 +v -0.353553 0.437500 0.353553 +v -0.500000 0.437500 0.000000 +v -0.353553 0.437500 -0.353553 +v 0.000000 0.437500 -0.625000 +v 0.441942 0.437500 -0.441942 +v 0.625000 0.437500 0.000000 +v 0.441942 0.437500 0.441942 +v -0.000000 0.437500 0.625000 +v -0.441942 0.437500 0.441942 +v -0.625000 0.437500 0.000000 +v -0.441942 0.437500 -0.441942 vt 0.590909 0.652174 vt 0.409091 0.304348 vt 0.590909 0.304348 @@ -5184,6 +5200,39 @@ vt 0.886364 0.913043 vt 1.000000 0.826087 vt 0.931818 0.782609 vt 0.954545 0.782609 +vt 0.568182 0.869565 +vt 0.590909 0.826087 +vt 0.590909 0.869565 +vt 0.545455 0.826087 +vt 0.545455 0.869565 +vt 0.613636 0.869565 +vt 0.636364 0.826087 +vt 0.636364 0.869565 +vt 0.613636 0.826087 +vt 0.545455 0.869565 +vt 0.568182 0.826087 +vt 0.568182 0.869565 +vt 0.613636 0.826087 +vt 0.636364 0.869565 +vt 0.613636 0.869565 +vt 0.590909 0.869565 +vt 0.590909 0.826087 +vt 0.590909 0.869565 +vt 0.613636 0.826087 +vt 0.613636 0.869565 +vt 0.568182 0.826087 +vt 0.568182 0.869565 +vt 0.545455 0.869565 +vt 0.636364 0.826087 +vt 0.636364 0.869565 +vt 0.613636 0.869565 +vt 0.636364 0.826087 +vt 0.636364 0.869565 +vt 0.590909 0.826087 +vt 0.590909 0.869565 +vt 0.568182 0.869565 +vt 0.545455 0.869565 +vt 0.568182 0.826087 vt 0.363636 0.913043 vt 0.284091 0.869565 vt 0.352273 0.869565 @@ -5229,39 +5278,6 @@ vt 0.715909 1.000000 vt 0.102273 1.000000 vt 0.181818 0.956522 vt 0.170455 1.000000 -vt 0.568182 0.869565 -vt 0.590909 0.826087 -vt 0.590909 0.869565 -vt 0.545455 0.826087 -vt 0.545455 0.869565 -vt 0.613636 0.869565 -vt 0.636364 0.826087 -vt 0.636364 0.869565 -vt 0.613636 0.826087 -vt 0.545455 0.869565 -vt 0.568182 0.826087 -vt 0.568182 0.869565 -vt 0.613636 0.826087 -vt 0.636364 0.869565 -vt 0.613636 0.869565 -vt 0.590909 0.869565 -vt 0.590909 0.826087 -vt 0.590909 0.869565 -vt 0.613636 0.826087 -vt 0.613636 0.869565 -vt 0.568182 0.826087 -vt 0.568182 0.869565 -vt 0.545455 0.869565 -vt 0.636364 0.826087 -vt 0.636364 0.869565 -vt 0.613636 0.869565 -vt 0.636364 0.826087 -vt 0.636364 0.869565 -vt 0.590909 0.826087 -vt 0.590909 0.869565 -vt 0.568182 0.869565 -vt 0.545455 0.869565 -vt 0.568182 0.826087 vt 0.409091 0.652174 vt 0.204545 0.652174 vt 0.136364 0.347826 @@ -5294,11 +5310,6 @@ vt 0.931818 0.956522 vt 1.000000 1.000000 vt 0.954545 1.000000 vt 0.931818 0.956522 -vt 0.545455 0.913043 -vt 0.181818 0.913043 -vt 0.465909 1.000000 -vt 0.011364 1.000000 -vt 0.375000 1.000000 vt 0.568182 0.826087 vt 0.545455 0.826087 vt 0.636364 0.826087 @@ -5306,6 +5317,11 @@ vt 0.590909 0.826087 vt 0.545455 0.826087 vt 0.613636 0.826087 vt 0.545455 0.826087 +vt 0.545455 0.913043 +vt 0.181818 0.913043 +vt 0.465909 1.000000 +vt 0.011364 1.000000 +vt 0.375000 1.000000 vt 0.409091 0.869565 vt 0.340909 0.695652 vt 0.409091 0.695652 @@ -5323,7 +5339,25 @@ vt 0.545455 0.869565 vt 0.477273 0.695652 vt 0.545455 0.695652 vt 0.477273 0.869565 +vt 0.090909 0.913043 +vt 0.000000 0.956522 +vt 0.000000 0.913043 +vt 0.727273 0.913043 +vt 0.636364 0.956522 +vt 0.636364 0.913043 +vt 0.545455 0.956522 +vt 0.545455 0.913043 +vt 0.454545 0.956522 +vt 0.454545 0.913043 +vt 0.363636 0.956522 +vt 0.363636 0.913043 +vt 0.272727 0.956522 +vt 0.272727 0.913043 +vt 0.181818 0.956522 +vt 0.181818 0.913043 +vt 0.090909 0.956522 vt 0.000000 0.869565 +vt 0.727273 0.956522 vn 0.0000 -1.0000 0.0000 vn 0.0000 1.0000 0.0000 vn 0.8944 0.4472 0.0000 @@ -5338,22 +5372,6 @@ vn 0.7071 0.0000 -0.7071 vn 0.7071 0.0000 0.7071 vn -0.7071 0.0000 -0.7071 vn -0.7071 0.0000 0.7071 -vn -0.5490 -0.6302 0.5490 -vn -0.7764 0.6302 0.0000 -vn -0.7764 -0.6302 0.0000 -vn -0.5490 0.6302 -0.5490 -vn -0.5490 -0.6302 -0.5490 -vn 0.0000 0.6302 -0.7764 -vn 0.0000 -0.6302 -0.7764 -vn 0.5490 0.6302 -0.5490 -vn 0.5490 -0.6302 -0.5490 -vn 0.7764 0.6302 0.0000 -vn 0.7764 -0.6302 0.0000 -vn 0.5490 0.6302 0.5490 -vn 0.5490 -0.6302 0.5490 -vn 0.0000 0.6302 0.7764 -vn 0.0000 -0.6302 0.7764 -vn -0.5490 0.6302 0.5490 s off f 1361/1776/100 1358/1777/100 1360/1778/100 f 1355/1779/101 1356/1780/101 1357/1781/101 @@ -5401,38 +5419,38 @@ f 1441/1871/113 1437/1872/113 1424/1873/113 f 1443/1865/100 1436/1869/100 1441/1874/100 f 1422/1875/101 1437/1872/101 1439/1868/101 f 1439/1868/110 1438/1876/110 1443/1877/110 -f 1456/1878/100 1449/1879/100 1448/1880/100 -f 1446/1881/100 1455/1882/100 1447/1883/100 -f 1461/1884/100 1446/1885/100 1453/1886/100 -f 1451/1887/100 1460/1888/100 1452/1889/100 -f 1457/1890/100 1450/1891/100 1449/1892/100 -f 1447/1893/100 1456/1878/100 1448/1894/100 -f 1460/1895/100 1453/1896/100 1452/1897/100 -f 1450/1898/100 1459/1899/100 1451/1900/100 -f 1465/1901/101 1472/1902/101 1464/1903/101 -f 1462/1904/101 1471/1905/101 1470/1906/101 -f 1462/1907/101 1477/1908/101 1469/1909/101 -f 1467/1910/101 1476/1911/101 1475/1912/101 -f 1466/1913/101 1473/1914/101 1465/1915/101 -f 1463/1916/101 1472/1902/101 1471/1905/101 -f 1469/1917/101 1476/1918/101 1468/1919/101 -f 1467/1920/101 1474/1921/101 1466/1922/101 -f 1480/1923/109 1482/1924/109 1478/1925/109 -f 1485/1926/105 1480/1923/105 1481/1927/105 -f 1479/1928/108 1485/1929/108 1481/1930/108 -f 1478/1925/103 1483/1931/103 1479/1928/103 -f 1488/1932/109 1490/1933/109 1486/1934/109 -f 1493/1935/105 1488/1936/105 1489/1937/105 -f 1487/1938/108 1493/1935/108 1489/1937/108 -f 1486/1934/103 1491/1939/103 1487/1938/103 -f 1496/1940/109 1498/1941/109 1494/1942/109 -f 1501/1943/105 1496/1940/105 1497/1944/105 -f 1495/1945/108 1501/1943/108 1497/1944/108 -f 1494/1942/103 1499/1946/103 1495/1947/103 -f 1504/1948/109 1506/1949/109 1502/1950/109 -f 1509/1951/105 1504/1948/105 1505/1952/105 -f 1503/1953/108 1509/1951/108 1505/1952/108 -f 1502/1954/103 1507/1955/103 1503/1953/103 +f 1464/1878/109 1466/1879/109 1462/1880/109 +f 1469/1881/105 1464/1878/105 1465/1882/105 +f 1463/1883/108 1469/1884/108 1465/1885/108 +f 1462/1880/103 1467/1886/103 1463/1883/103 +f 1472/1887/109 1474/1888/109 1470/1889/109 +f 1477/1890/105 1472/1891/105 1473/1892/105 +f 1471/1893/108 1477/1890/108 1473/1892/108 +f 1470/1889/103 1475/1894/103 1471/1893/103 +f 1480/1895/109 1482/1896/109 1478/1897/109 +f 1485/1898/105 1480/1895/105 1481/1899/105 +f 1479/1900/108 1485/1898/108 1481/1899/108 +f 1478/1897/103 1483/1901/103 1479/1902/103 +f 1488/1903/109 1490/1904/109 1486/1905/109 +f 1493/1906/105 1488/1903/105 1489/1907/105 +f 1487/1908/108 1493/1906/108 1489/1907/108 +f 1486/1909/103 1491/1910/103 1487/1908/103 +f 1504/1911/100 1497/1912/100 1496/1913/100 +f 1494/1914/100 1503/1915/100 1495/1916/100 +f 1509/1917/100 1494/1918/100 1501/1919/100 +f 1499/1920/100 1508/1921/100 1500/1922/100 +f 1505/1923/100 1498/1924/100 1497/1925/100 +f 1495/1926/100 1504/1911/100 1496/1927/100 +f 1508/1928/100 1501/1929/100 1500/1930/100 +f 1498/1931/100 1507/1932/100 1499/1933/100 +f 1513/1934/101 1520/1935/101 1512/1936/101 +f 1510/1937/101 1519/1938/101 1518/1939/101 +f 1510/1940/101 1525/1941/101 1517/1942/101 +f 1515/1943/101 1524/1944/101 1523/1945/101 +f 1514/1946/101 1521/1947/101 1513/1948/101 +f 1511/1949/101 1520/1935/101 1519/1938/101 +f 1517/1950/101 1524/1951/101 1516/1952/101 +f 1515/1953/101 1522/1954/101 1514/1955/101 f 1361/1776/100 1359/1956/100 1358/1777/100 f 1355/1779/101 1354/1816/101 1356/1780/101 f 1364/1782/102 1372/1957/102 1374/1783/102 @@ -5511,38 +5529,38 @@ f 1422/1875/101 1424/1873/101 1437/1872/101 f 1442/1981/110 1445/1852/110 1443/1877/110 f 1445/1852/110 1422/1875/110 1443/1877/110 f 1422/1875/110 1439/1868/110 1443/1877/110 -f 1456/1878/100 1457/1890/100 1449/1879/100 -f 1446/1881/100 1454/1988/100 1455/1882/100 -f 1461/1884/100 1454/1988/100 1446/1885/100 -f 1451/1887/100 1459/1899/100 1460/1888/100 -f 1457/1890/100 1458/1989/100 1450/1891/100 -f 1447/1893/100 1455/1882/100 1456/1878/100 -f 1460/1895/100 1461/1884/100 1453/1896/100 -f 1450/1898/100 1458/1989/100 1459/1899/100 -f 1465/1901/101 1473/1914/101 1472/1902/101 -f 1462/1904/101 1463/1990/101 1471/1905/101 -f 1462/1907/101 1470/1906/101 1477/1908/101 -f 1467/1910/101 1468/1991/101 1476/1911/101 -f 1466/1913/101 1474/1921/101 1473/1914/101 -f 1463/1916/101 1464/1992/101 1472/1902/101 -f 1469/1917/101 1477/1908/101 1476/1918/101 -f 1467/1920/101 1475/1912/101 1474/1921/101 -f 1480/1923/109 1484/1993/109 1482/1924/109 -f 1485/1926/105 1484/1993/105 1480/1923/105 -f 1479/1928/108 1483/1931/108 1485/1929/108 -f 1478/1925/103 1482/1924/103 1483/1931/103 -f 1488/1932/109 1492/1994/109 1490/1933/109 -f 1493/1935/105 1492/1995/105 1488/1936/105 -f 1487/1938/108 1491/1939/108 1493/1935/108 -f 1486/1934/103 1490/1933/103 1491/1939/103 -f 1496/1940/109 1500/1996/109 1498/1941/109 -f 1501/1943/105 1500/1996/105 1496/1940/105 -f 1495/1945/108 1499/1997/108 1501/1943/108 -f 1494/1942/103 1498/1941/103 1499/1946/103 -f 1504/1948/109 1508/1998/109 1506/1949/109 -f 1509/1951/105 1508/1998/105 1504/1948/105 -f 1503/1953/108 1507/1955/108 1509/1951/108 -f 1502/1954/103 1506/1999/103 1507/1955/103 +f 1464/1878/109 1468/1988/109 1466/1879/109 +f 1469/1881/105 1468/1988/105 1464/1878/105 +f 1463/1883/108 1467/1886/108 1469/1884/108 +f 1462/1880/103 1466/1879/103 1467/1886/103 +f 1472/1887/109 1476/1989/109 1474/1888/109 +f 1477/1890/105 1476/1990/105 1472/1891/105 +f 1471/1893/108 1475/1894/108 1477/1890/108 +f 1470/1889/103 1474/1888/103 1475/1894/103 +f 1480/1895/109 1484/1991/109 1482/1896/109 +f 1485/1898/105 1484/1991/105 1480/1895/105 +f 1479/1900/108 1483/1992/108 1485/1898/108 +f 1478/1897/103 1482/1896/103 1483/1901/103 +f 1488/1903/109 1492/1993/109 1490/1904/109 +f 1493/1906/105 1492/1993/105 1488/1903/105 +f 1487/1908/108 1491/1910/108 1493/1906/108 +f 1486/1909/103 1490/1994/103 1491/1910/103 +f 1504/1911/100 1505/1923/100 1497/1912/100 +f 1494/1914/100 1502/1995/100 1503/1915/100 +f 1509/1917/100 1502/1995/100 1494/1918/100 +f 1499/1920/100 1507/1932/100 1508/1921/100 +f 1505/1923/100 1506/1996/100 1498/1924/100 +f 1495/1926/100 1503/1915/100 1504/1911/100 +f 1508/1928/100 1509/1917/100 1501/1929/100 +f 1498/1931/100 1506/1996/100 1507/1932/100 +f 1513/1934/101 1521/1947/101 1520/1935/101 +f 1510/1937/101 1511/1997/101 1519/1938/101 +f 1510/1940/101 1518/1939/101 1525/1941/101 +f 1515/1943/101 1516/1998/101 1524/1944/101 +f 1514/1946/101 1522/1954/101 1521/1947/101 +f 1511/1949/101 1512/1999/101 1520/1935/101 +f 1517/1950/101 1525/1941/101 1524/1951/101 +f 1515/1953/101 1523/1945/101 1522/1954/101 s 1 f 1379/2000/103 1380/2001/110 1378/2002/103 f 1381/2003/110 1382/2004/109 1380/2001/110 @@ -5552,30 +5570,30 @@ f 1387/2009/105 1388/2010/113 1386/2008/105 f 1389/2011/113 1390/2012/108 1388/2010/113 f 1391/2013/108 1392/2014/112 1390/2015/108 f 1393/2016/112 1378/2002/103 1392/2014/112 -f 1459/1899/114 1476/1911/115 1460/1888/116 -f 1460/1895/116 1477/1908/117 1461/1884/118 -f 1461/1884/118 1470/1906/119 1454/1988/120 -f 1454/1988/120 1471/1905/121 1455/1882/122 -f 1455/1882/122 1472/1902/123 1456/1878/124 -f 1456/1878/124 1473/1914/125 1457/1890/126 -f 1457/1890/126 1474/1921/127 1458/1989/128 -f 1458/1989/128 1475/1912/129 1459/1899/114 +f 1451/2017/113 1460/2018/108 1452/2019/108 +f 1452/2020/108 1461/2021/112 1453/2022/112 +f 1453/2022/112 1454/2023/103 1446/2024/103 +f 1446/2024/103 1455/2025/110 1447/2026/110 +f 1447/2026/110 1456/2027/109 1448/2028/109 +f 1448/2028/109 1457/2029/111 1449/2030/111 +f 1449/2030/111 1458/2031/105 1450/2032/105 +f 1450/2032/105 1459/2033/113 1451/2017/113 f 1379/2000/103 1381/2003/110 1380/2001/110 f 1381/2003/110 1383/2005/109 1382/2004/109 f 1383/2005/109 1385/2007/111 1384/2006/111 f 1385/2007/111 1387/2009/105 1386/2008/105 f 1387/2009/105 1389/2011/113 1388/2010/113 -f 1389/2011/113 1391/2017/108 1390/2012/108 +f 1389/2011/113 1391/2034/108 1390/2012/108 f 1391/2013/108 1393/2016/112 1392/2014/112 f 1393/2016/112 1379/2000/103 1378/2002/103 -f 1459/1899/114 1475/1912/129 1476/1911/115 -f 1460/1895/116 1476/1918/115 1477/1908/117 -f 1461/1884/118 1477/1908/117 1470/1906/119 -f 1454/1988/120 1470/1906/119 1471/1905/121 -f 1455/1882/122 1471/1905/121 1472/1902/123 -f 1456/1878/124 1472/1902/123 1473/1914/125 -f 1457/1890/126 1473/1914/125 1474/1921/127 -f 1458/1989/128 1474/1921/127 1475/1912/129 +f 1451/2017/113 1459/2033/113 1460/2018/108 +f 1452/2020/108 1460/2035/108 1461/2021/112 +f 1453/2022/112 1461/2021/112 1454/2023/103 +f 1446/2024/103 1454/2023/103 1455/2025/110 +f 1447/2026/110 1455/2025/110 1456/2027/109 +f 1448/2028/109 1456/2027/109 1457/2029/111 +f 1449/2030/111 1457/2029/111 1458/2031/105 +f 1450/2032/105 1458/2031/105 1459/2033/113 o Connectors v 0.312500 0.312500 1.000000 v 0.312500 0.687500 1.000000 @@ -5964,230 +5982,230 @@ vn -0.7071 0.7071 0.0000 vn 0.7071 -0.7071 -0.0000 vn 0.7071 0.7071 -0.0000 s off -f 1511/2018/130 1512/2019/130 1510/2020/130 -f 1517/2021/131 1520/2022/131 1521/2023/131 -f 1517/2021/132 1514/2024/132 1516/2025/132 -f 1515/2026/133 1510/2020/133 1514/2024/133 -f 1516/2027/134 1510/2020/134 1512/2028/134 -f 1513/2029/135 1515/2026/135 1517/2030/135 -f 1520/2022/132 1525/2031/132 1521/2023/132 -f 1512/2028/136 1520/2032/136 1516/2027/136 -f 1517/2030/137 1518/2033/137 1513/2029/137 -f 1513/2034/138 1519/2035/138 1512/2019/138 -f 1522/2036/139 1524/2037/139 1523/2038/139 -f 1519/2039/134 1524/2040/134 1520/2032/134 -f 1521/2041/135 1522/2036/135 1518/2033/135 -f 1518/2042/130 1523/2043/130 1519/2035/130 -f 1527/2044/130 1528/2045/130 1526/2046/130 -f 1532/2047/131 1537/2048/131 1533/2049/131 -f 1533/2049/132 1530/2050/132 1532/2047/132 -f 1531/2051/133 1526/2046/133 1530/2050/133 -f 1532/2052/134 1526/2046/134 1528/2053/134 -f 1529/2054/135 1531/2051/135 1533/2055/135 -f 1536/2056/132 1541/2057/132 1537/2048/132 -f 1528/2053/136 1536/2058/136 1532/2052/136 -f 1533/2055/137 1534/2059/137 1529/2054/137 -f 1529/2060/138 1535/2061/138 1528/2045/138 -f 1538/2062/139 1540/2063/139 1539/2064/139 -f 1535/2065/134 1540/2066/134 1536/2058/134 -f 1537/2067/135 1538/2062/135 1534/2059/135 -f 1534/2068/130 1539/2069/130 1535/2061/130 -f 1543/2070/132 1544/2071/132 1542/2072/132 -f 1549/2073/140 1552/2074/140 1553/2075/140 -f 1549/2073/130 1546/2076/130 1548/2077/130 -f 1547/2078/139 1542/2072/139 1546/2076/139 -f 1548/2079/134 1542/2072/134 1544/2080/134 -f 1545/2081/135 1547/2078/135 1549/2082/135 -f 1552/2074/130 1557/2083/130 1553/2075/130 -f 1544/2080/141 1552/2084/141 1548/2079/141 -f 1549/2082/142 1550/2085/142 1545/2081/142 -f 1545/2086/143 1551/2087/143 1544/2071/143 -f 1554/2088/133 1556/2089/133 1555/2090/133 -f 1551/2091/134 1556/2092/134 1552/2084/134 -f 1550/2085/135 1557/2093/135 1554/2088/135 -f 1550/2094/132 1555/2095/132 1551/2087/132 -f 1559/2096/132 1560/2097/132 1558/2098/132 -f 1565/2099/140 1568/2100/140 1569/2101/140 -f 1565/2099/130 1562/2102/130 1564/2103/130 -f 1563/2104/139 1558/2098/139 1562/2102/139 -f 1564/2105/134 1558/2098/134 1560/2106/134 -f 1561/2107/135 1563/2104/135 1565/2108/135 -f 1568/2100/130 1573/2109/130 1569/2101/130 -f 1560/2106/141 1568/2110/141 1564/2105/141 -f 1565/2108/142 1566/2111/142 1561/2107/142 -f 1561/2112/143 1567/2113/143 1560/2097/143 -f 1570/2114/133 1572/2115/133 1571/2116/133 -f 1567/2117/134 1572/2118/134 1568/2110/134 -f 1566/2111/135 1573/2119/135 1570/2114/135 -f 1566/2120/132 1571/2121/132 1567/2113/132 -f 1575/2122/133 1576/2123/133 1574/2124/133 -f 1580/2125/138 1585/2126/138 1581/2127/138 -f 1581/2127/139 1578/2128/139 1580/2125/139 -f 1579/2129/132 1574/2124/132 1578/2128/132 -f 1580/2130/134 1574/2124/134 1576/2131/134 -f 1577/2132/135 1579/2129/135 1581/2133/135 -f 1584/2134/139 1589/2135/139 1585/2126/139 -f 1576/2131/144 1584/2136/144 1580/2130/144 -f 1581/2133/145 1582/2137/145 1577/2132/145 -f 1577/2138/140 1583/2139/140 1576/2123/140 -f 1586/2140/130 1588/2141/130 1587/2142/130 -f 1583/2143/134 1588/2144/134 1584/2136/134 -f 1585/2145/135 1586/2140/135 1582/2137/135 -f 1582/2146/133 1587/2147/133 1583/2139/133 -f 1591/2148/133 1592/2149/133 1590/2150/133 -f 1596/2151/138 1601/2152/138 1597/2153/138 -f 1597/2153/139 1594/2154/139 1596/2151/139 -f 1595/2155/132 1590/2150/132 1594/2154/132 -f 1596/2156/134 1590/2150/134 1592/2157/134 -f 1593/2158/135 1595/2155/135 1597/2159/135 -f 1600/2160/139 1605/2161/139 1601/2152/139 -f 1592/2157/144 1600/2162/144 1596/2156/144 -f 1597/2159/145 1598/2163/145 1593/2158/145 -f 1593/2164/140 1599/2165/140 1592/2149/140 -f 1602/2166/130 1604/2167/130 1603/2168/130 -f 1599/2169/134 1604/2170/134 1600/2162/134 -f 1601/2171/135 1602/2166/135 1598/2163/135 -f 1598/2172/133 1603/2173/133 1599/2165/133 -f 1607/2174/139 1608/2175/139 1606/2176/139 -f 1612/2177/143 1617/2178/143 1613/2179/143 -f 1613/2179/133 1610/2180/133 1612/2177/133 -f 1611/2181/130 1606/2176/130 1610/2180/130 -f 1612/2182/134 1606/2176/134 1608/2183/134 -f 1609/2184/135 1611/2181/135 1613/2185/135 -f 1616/2186/133 1621/2187/133 1617/2178/133 -f 1608/2183/146 1616/2188/146 1612/2182/146 -f 1613/2185/147 1614/2189/147 1609/2184/147 -f 1609/2190/131 1615/2191/131 1608/2175/131 -f 1618/2192/132 1620/2193/132 1619/2194/132 -f 1615/2195/134 1620/2196/134 1616/2188/134 -f 1617/2197/135 1618/2192/135 1614/2189/135 -f 1614/2198/139 1619/2199/139 1615/2191/139 -f 1623/2200/139 1624/2201/139 1622/2202/139 -f 1628/2203/143 1633/2204/143 1629/2205/143 -f 1629/2205/133 1626/2206/133 1628/2203/133 -f 1627/2207/130 1622/2202/130 1626/2206/130 -f 1628/2208/134 1622/2202/134 1624/2209/134 -f 1625/2210/135 1627/2207/135 1629/2211/135 -f 1632/2212/133 1637/2213/133 1633/2204/133 -f 1624/2209/146 1632/2214/146 1628/2208/146 -f 1629/2211/147 1630/2215/147 1625/2210/147 -f 1625/2216/131 1631/2217/131 1624/2201/131 -f 1634/2218/132 1636/2219/132 1635/2220/132 -f 1631/2221/134 1636/2222/134 1632/2214/134 -f 1633/2223/135 1634/2218/135 1630/2215/135 -f 1630/2224/139 1635/2225/139 1631/2217/139 -f 1511/2018/130 1513/2034/130 1512/2019/130 -f 1517/2021/131 1516/2025/131 1520/2022/131 -f 1517/2021/132 1515/2026/132 1514/2024/132 -f 1515/2026/133 1511/2018/133 1510/2020/133 -f 1516/2027/134 1514/2024/134 1510/2020/134 -f 1513/2029/135 1511/2018/135 1515/2026/135 -f 1520/2022/132 1524/2226/132 1525/2031/132 -f 1512/2028/136 1519/2039/136 1520/2032/136 -f 1517/2030/137 1521/2041/137 1518/2033/137 -f 1513/2034/138 1518/2042/138 1519/2035/138 -f 1522/2036/139 1525/2227/139 1524/2037/139 -f 1519/2039/134 1523/2228/134 1524/2040/134 -f 1521/2041/135 1525/2227/135 1522/2036/135 -f 1518/2042/130 1522/2229/130 1523/2043/130 -f 1527/2044/130 1529/2060/130 1528/2045/130 -f 1532/2047/131 1536/2056/131 1537/2048/131 -f 1533/2049/132 1531/2051/132 1530/2050/132 -f 1531/2051/133 1527/2044/133 1526/2046/133 -f 1532/2052/134 1530/2050/134 1526/2046/134 -f 1529/2054/135 1527/2044/135 1531/2051/135 -f 1536/2056/132 1540/2230/132 1541/2057/132 -f 1528/2053/136 1535/2065/136 1536/2058/136 -f 1533/2055/137 1537/2067/137 1534/2059/137 -f 1529/2060/138 1534/2068/138 1535/2061/138 -f 1538/2062/139 1541/2231/139 1540/2063/139 -f 1535/2065/134 1539/2232/134 1540/2066/134 -f 1537/2067/135 1541/2231/135 1538/2062/135 -f 1534/2068/130 1538/2233/130 1539/2069/130 -f 1543/2070/132 1545/2086/132 1544/2071/132 -f 1549/2073/140 1548/2077/140 1552/2074/140 -f 1549/2073/130 1547/2078/130 1546/2076/130 -f 1547/2078/139 1543/2070/139 1542/2072/139 -f 1548/2079/134 1546/2076/134 1542/2072/134 -f 1545/2081/135 1543/2070/135 1547/2078/135 -f 1552/2074/130 1556/2234/130 1557/2083/130 -f 1544/2080/141 1551/2091/141 1552/2084/141 -f 1549/2082/142 1553/2235/142 1550/2085/142 -f 1545/2086/143 1550/2094/143 1551/2087/143 -f 1554/2088/133 1557/2093/133 1556/2089/133 -f 1551/2091/134 1555/2236/134 1556/2092/134 -f 1550/2085/135 1553/2235/135 1557/2093/135 -f 1550/2094/132 1554/2237/132 1555/2095/132 -f 1559/2096/132 1561/2112/132 1560/2097/132 -f 1565/2099/140 1564/2103/140 1568/2100/140 -f 1565/2099/130 1563/2104/130 1562/2102/130 -f 1563/2104/139 1559/2096/139 1558/2098/139 -f 1564/2105/134 1562/2102/134 1558/2098/134 -f 1561/2107/135 1559/2096/135 1563/2104/135 -f 1568/2100/130 1572/2238/130 1573/2109/130 -f 1560/2106/141 1567/2117/141 1568/2110/141 -f 1565/2108/142 1569/2239/142 1566/2111/142 -f 1561/2112/143 1566/2120/143 1567/2113/143 -f 1570/2114/133 1573/2119/133 1572/2115/133 -f 1567/2117/134 1571/2240/134 1572/2118/134 -f 1566/2111/135 1569/2239/135 1573/2119/135 -f 1566/2120/132 1570/2241/132 1571/2121/132 -f 1575/2122/133 1577/2138/133 1576/2123/133 -f 1580/2125/138 1584/2134/138 1585/2126/138 -f 1581/2127/139 1579/2129/139 1578/2128/139 -f 1579/2129/132 1575/2122/132 1574/2124/132 -f 1580/2130/134 1578/2128/134 1574/2124/134 -f 1577/2132/135 1575/2122/135 1579/2129/135 -f 1584/2134/139 1588/2242/139 1589/2135/139 -f 1576/2131/144 1583/2143/144 1584/2136/144 -f 1581/2133/145 1585/2145/145 1582/2137/145 -f 1577/2138/140 1582/2146/140 1583/2139/140 -f 1586/2140/130 1589/2243/130 1588/2141/130 -f 1583/2143/134 1587/2244/134 1588/2144/134 -f 1585/2145/135 1589/2243/135 1586/2140/135 -f 1582/2146/133 1586/2245/133 1587/2147/133 -f 1591/2148/133 1593/2164/133 1592/2149/133 -f 1596/2151/138 1600/2160/138 1601/2152/138 -f 1597/2153/139 1595/2155/139 1594/2154/139 -f 1595/2155/132 1591/2148/132 1590/2150/132 -f 1596/2156/134 1594/2154/134 1590/2150/134 -f 1593/2158/135 1591/2148/135 1595/2155/135 -f 1600/2160/139 1604/2246/139 1605/2161/139 -f 1592/2157/144 1599/2169/144 1600/2162/144 -f 1597/2159/145 1601/2171/145 1598/2163/145 -f 1593/2164/140 1598/2172/140 1599/2165/140 -f 1602/2166/130 1605/2247/130 1604/2167/130 -f 1599/2169/134 1603/2248/134 1604/2170/134 -f 1601/2171/135 1605/2247/135 1602/2166/135 -f 1598/2172/133 1602/2249/133 1603/2173/133 -f 1607/2174/139 1609/2190/139 1608/2175/139 -f 1612/2177/143 1616/2186/143 1617/2178/143 -f 1613/2179/133 1611/2181/133 1610/2180/133 -f 1611/2181/130 1607/2174/130 1606/2176/130 -f 1612/2182/134 1610/2180/134 1606/2176/134 -f 1609/2184/135 1607/2174/135 1611/2181/135 -f 1616/2186/133 1620/2250/133 1621/2187/133 -f 1608/2183/146 1615/2195/146 1616/2188/146 -f 1613/2185/147 1617/2197/147 1614/2189/147 -f 1609/2190/131 1614/2198/131 1615/2191/131 -f 1618/2192/132 1621/2251/132 1620/2193/132 -f 1615/2195/134 1619/2252/134 1620/2196/134 -f 1617/2197/135 1621/2251/135 1618/2192/135 -f 1614/2198/139 1618/2253/139 1619/2199/139 -f 1623/2200/139 1625/2216/139 1624/2201/139 -f 1628/2203/143 1632/2212/143 1633/2204/143 -f 1629/2205/133 1627/2207/133 1626/2206/133 -f 1627/2207/130 1623/2200/130 1622/2202/130 -f 1628/2208/134 1626/2206/134 1622/2202/134 -f 1625/2210/135 1623/2200/135 1627/2207/135 -f 1632/2212/133 1636/2254/133 1637/2213/133 -f 1624/2209/146 1631/2221/146 1632/2214/146 -f 1629/2211/147 1633/2223/147 1630/2215/147 -f 1625/2216/131 1630/2224/131 1631/2217/131 -f 1634/2218/132 1637/2255/132 1636/2219/132 -f 1631/2221/134 1635/2256/134 1636/2222/134 -f 1633/2223/135 1637/2255/135 1634/2218/135 -f 1630/2224/139 1634/2257/139 1635/2225/139 +f 1527/2036/114 1528/2037/114 1526/2038/114 +f 1533/2039/115 1536/2040/115 1537/2041/115 +f 1533/2039/116 1530/2042/116 1532/2043/116 +f 1531/2044/117 1526/2038/117 1530/2042/117 +f 1532/2045/118 1526/2038/118 1528/2046/118 +f 1529/2047/119 1531/2044/119 1533/2048/119 +f 1536/2040/116 1541/2049/116 1537/2041/116 +f 1528/2046/120 1536/2050/120 1532/2045/120 +f 1533/2048/121 1534/2051/121 1529/2047/121 +f 1529/2052/122 1535/2053/122 1528/2037/122 +f 1538/2054/123 1540/2055/123 1539/2056/123 +f 1535/2057/118 1540/2058/118 1536/2050/118 +f 1537/2059/119 1538/2054/119 1534/2051/119 +f 1534/2060/114 1539/2061/114 1535/2053/114 +f 1543/2062/114 1544/2063/114 1542/2064/114 +f 1548/2065/115 1553/2066/115 1549/2067/115 +f 1549/2067/116 1546/2068/116 1548/2065/116 +f 1547/2069/117 1542/2064/117 1546/2068/117 +f 1548/2070/118 1542/2064/118 1544/2071/118 +f 1545/2072/119 1547/2069/119 1549/2073/119 +f 1552/2074/116 1557/2075/116 1553/2066/116 +f 1544/2071/120 1552/2076/120 1548/2070/120 +f 1549/2073/121 1550/2077/121 1545/2072/121 +f 1545/2078/122 1551/2079/122 1544/2063/122 +f 1554/2080/123 1556/2081/123 1555/2082/123 +f 1551/2083/118 1556/2084/118 1552/2076/118 +f 1553/2085/119 1554/2080/119 1550/2077/119 +f 1550/2086/114 1555/2087/114 1551/2079/114 +f 1559/2088/116 1560/2089/116 1558/2090/116 +f 1565/2091/124 1568/2092/124 1569/2093/124 +f 1565/2091/114 1562/2094/114 1564/2095/114 +f 1563/2096/123 1558/2090/123 1562/2094/123 +f 1564/2097/118 1558/2090/118 1560/2098/118 +f 1561/2099/119 1563/2096/119 1565/2100/119 +f 1568/2092/114 1573/2101/114 1569/2093/114 +f 1560/2098/125 1568/2102/125 1564/2097/125 +f 1565/2100/126 1566/2103/126 1561/2099/126 +f 1561/2104/127 1567/2105/127 1560/2089/127 +f 1570/2106/117 1572/2107/117 1571/2108/117 +f 1567/2109/118 1572/2110/118 1568/2102/118 +f 1566/2103/119 1573/2111/119 1570/2106/119 +f 1566/2112/116 1571/2113/116 1567/2105/116 +f 1575/2114/116 1576/2115/116 1574/2116/116 +f 1581/2117/124 1584/2118/124 1585/2119/124 +f 1581/2117/114 1578/2120/114 1580/2121/114 +f 1579/2122/123 1574/2116/123 1578/2120/123 +f 1580/2123/118 1574/2116/118 1576/2124/118 +f 1577/2125/119 1579/2122/119 1581/2126/119 +f 1584/2118/114 1589/2127/114 1585/2119/114 +f 1576/2124/125 1584/2128/125 1580/2123/125 +f 1581/2126/126 1582/2129/126 1577/2125/126 +f 1577/2130/127 1583/2131/127 1576/2115/127 +f 1586/2132/117 1588/2133/117 1587/2134/117 +f 1583/2135/118 1588/2136/118 1584/2128/118 +f 1582/2129/119 1589/2137/119 1586/2132/119 +f 1582/2138/116 1587/2139/116 1583/2131/116 +f 1591/2140/117 1592/2141/117 1590/2142/117 +f 1596/2143/122 1601/2144/122 1597/2145/122 +f 1597/2145/123 1594/2146/123 1596/2143/123 +f 1595/2147/116 1590/2142/116 1594/2146/116 +f 1596/2148/118 1590/2142/118 1592/2149/118 +f 1593/2150/119 1595/2147/119 1597/2151/119 +f 1600/2152/123 1605/2153/123 1601/2144/123 +f 1592/2149/128 1600/2154/128 1596/2148/128 +f 1597/2151/129 1598/2155/129 1593/2150/129 +f 1593/2156/124 1599/2157/124 1592/2141/124 +f 1602/2158/114 1604/2159/114 1603/2160/114 +f 1599/2161/118 1604/2162/118 1600/2154/118 +f 1601/2163/119 1602/2158/119 1598/2155/119 +f 1598/2164/117 1603/2165/117 1599/2157/117 +f 1607/2166/117 1608/2167/117 1606/2168/117 +f 1612/2169/122 1617/2170/122 1613/2171/122 +f 1613/2171/123 1610/2172/123 1612/2169/123 +f 1611/2173/116 1606/2168/116 1610/2172/116 +f 1612/2174/118 1606/2168/118 1608/2175/118 +f 1609/2176/119 1611/2173/119 1613/2177/119 +f 1616/2178/123 1621/2179/123 1617/2170/123 +f 1608/2175/128 1616/2180/128 1612/2174/128 +f 1613/2177/129 1614/2181/129 1609/2176/129 +f 1609/2182/124 1615/2183/124 1608/2167/124 +f 1618/2184/114 1620/2185/114 1619/2186/114 +f 1615/2187/118 1620/2188/118 1616/2180/118 +f 1617/2189/119 1618/2184/119 1614/2181/119 +f 1614/2190/117 1619/2191/117 1615/2183/117 +f 1623/2192/123 1624/2193/123 1622/2194/123 +f 1628/2195/127 1633/2196/127 1629/2197/127 +f 1629/2197/117 1626/2198/117 1628/2195/117 +f 1627/2199/114 1622/2194/114 1626/2198/114 +f 1628/2200/118 1622/2194/118 1624/2201/118 +f 1625/2202/119 1627/2199/119 1629/2203/119 +f 1632/2204/117 1637/2205/117 1633/2196/117 +f 1624/2201/130 1632/2206/130 1628/2200/130 +f 1629/2203/131 1630/2207/131 1625/2202/131 +f 1625/2208/115 1631/2209/115 1624/2193/115 +f 1634/2210/116 1636/2211/116 1635/2212/116 +f 1631/2213/118 1636/2214/118 1632/2206/118 +f 1633/2215/119 1634/2210/119 1630/2207/119 +f 1630/2216/123 1635/2217/123 1631/2209/123 +f 1639/2218/123 1640/2219/123 1638/2220/123 +f 1644/2221/127 1649/2222/127 1645/2223/127 +f 1645/2223/117 1642/2224/117 1644/2221/117 +f 1643/2225/114 1638/2220/114 1642/2224/114 +f 1644/2226/118 1638/2220/118 1640/2227/118 +f 1641/2228/119 1643/2225/119 1645/2229/119 +f 1648/2230/117 1653/2231/117 1649/2222/117 +f 1640/2227/130 1648/2232/130 1644/2226/130 +f 1645/2229/131 1646/2233/131 1641/2228/131 +f 1641/2234/115 1647/2235/115 1640/2219/115 +f 1650/2236/116 1652/2237/116 1651/2238/116 +f 1647/2239/118 1652/2240/118 1648/2232/118 +f 1649/2241/119 1650/2236/119 1646/2233/119 +f 1646/2242/123 1651/2243/123 1647/2235/123 +f 1527/2036/114 1529/2052/114 1528/2037/114 +f 1533/2039/115 1532/2043/115 1536/2040/115 +f 1533/2039/116 1531/2044/116 1530/2042/116 +f 1531/2044/117 1527/2036/117 1526/2038/117 +f 1532/2045/118 1530/2042/118 1526/2038/118 +f 1529/2047/119 1527/2036/119 1531/2044/119 +f 1536/2040/116 1540/2244/116 1541/2049/116 +f 1528/2046/120 1535/2057/120 1536/2050/120 +f 1533/2048/121 1537/2059/121 1534/2051/121 +f 1529/2052/122 1534/2060/122 1535/2053/122 +f 1538/2054/123 1541/2245/123 1540/2055/123 +f 1535/2057/118 1539/2246/118 1540/2058/118 +f 1537/2059/119 1541/2245/119 1538/2054/119 +f 1534/2060/114 1538/2247/114 1539/2061/114 +f 1543/2062/114 1545/2078/114 1544/2063/114 +f 1548/2065/115 1552/2074/115 1553/2066/115 +f 1549/2067/116 1547/2069/116 1546/2068/116 +f 1547/2069/117 1543/2062/117 1542/2064/117 +f 1548/2070/118 1546/2068/118 1542/2064/118 +f 1545/2072/119 1543/2062/119 1547/2069/119 +f 1552/2074/116 1556/2248/116 1557/2075/116 +f 1544/2071/120 1551/2083/120 1552/2076/120 +f 1549/2073/121 1553/2085/121 1550/2077/121 +f 1545/2078/122 1550/2086/122 1551/2079/122 +f 1554/2080/123 1557/2249/123 1556/2081/123 +f 1551/2083/118 1555/2250/118 1556/2084/118 +f 1553/2085/119 1557/2249/119 1554/2080/119 +f 1550/2086/114 1554/2251/114 1555/2087/114 +f 1559/2088/116 1561/2104/116 1560/2089/116 +f 1565/2091/124 1564/2095/124 1568/2092/124 +f 1565/2091/114 1563/2096/114 1562/2094/114 +f 1563/2096/123 1559/2088/123 1558/2090/123 +f 1564/2097/118 1562/2094/118 1558/2090/118 +f 1561/2099/119 1559/2088/119 1563/2096/119 +f 1568/2092/114 1572/2252/114 1573/2101/114 +f 1560/2098/125 1567/2109/125 1568/2102/125 +f 1565/2100/126 1569/2253/126 1566/2103/126 +f 1561/2104/127 1566/2112/127 1567/2105/127 +f 1570/2106/117 1573/2111/117 1572/2107/117 +f 1567/2109/118 1571/2254/118 1572/2110/118 +f 1566/2103/119 1569/2253/119 1573/2111/119 +f 1566/2112/116 1570/2255/116 1571/2113/116 +f 1575/2114/116 1577/2130/116 1576/2115/116 +f 1581/2117/124 1580/2121/124 1584/2118/124 +f 1581/2117/114 1579/2122/114 1578/2120/114 +f 1579/2122/123 1575/2114/123 1574/2116/123 +f 1580/2123/118 1578/2120/118 1574/2116/118 +f 1577/2125/119 1575/2114/119 1579/2122/119 +f 1584/2118/114 1588/2256/114 1589/2127/114 +f 1576/2124/125 1583/2135/125 1584/2128/125 +f 1581/2126/126 1585/2257/126 1582/2129/126 +f 1577/2130/127 1582/2138/127 1583/2131/127 +f 1586/2132/117 1589/2137/117 1588/2133/117 +f 1583/2135/118 1587/2258/118 1588/2136/118 +f 1582/2129/119 1585/2257/119 1589/2137/119 +f 1582/2138/116 1586/2259/116 1587/2139/116 +f 1591/2140/117 1593/2156/117 1592/2141/117 +f 1596/2143/122 1600/2152/122 1601/2144/122 +f 1597/2145/123 1595/2147/123 1594/2146/123 +f 1595/2147/116 1591/2140/116 1590/2142/116 +f 1596/2148/118 1594/2146/118 1590/2142/118 +f 1593/2150/119 1591/2140/119 1595/2147/119 +f 1600/2152/123 1604/2260/123 1605/2153/123 +f 1592/2149/128 1599/2161/128 1600/2154/128 +f 1597/2151/129 1601/2163/129 1598/2155/129 +f 1593/2156/124 1598/2164/124 1599/2157/124 +f 1602/2158/114 1605/2261/114 1604/2159/114 +f 1599/2161/118 1603/2262/118 1604/2162/118 +f 1601/2163/119 1605/2261/119 1602/2158/119 +f 1598/2164/117 1602/2263/117 1603/2165/117 +f 1607/2166/117 1609/2182/117 1608/2167/117 +f 1612/2169/122 1616/2178/122 1617/2170/122 +f 1613/2171/123 1611/2173/123 1610/2172/123 +f 1611/2173/116 1607/2166/116 1606/2168/116 +f 1612/2174/118 1610/2172/118 1606/2168/118 +f 1609/2176/119 1607/2166/119 1611/2173/119 +f 1616/2178/123 1620/2264/123 1621/2179/123 +f 1608/2175/128 1615/2187/128 1616/2180/128 +f 1613/2177/129 1617/2189/129 1614/2181/129 +f 1609/2182/124 1614/2190/124 1615/2183/124 +f 1618/2184/114 1621/2265/114 1620/2185/114 +f 1615/2187/118 1619/2266/118 1620/2188/118 +f 1617/2189/119 1621/2265/119 1618/2184/119 +f 1614/2190/117 1618/2267/117 1619/2191/117 +f 1623/2192/123 1625/2208/123 1624/2193/123 +f 1628/2195/127 1632/2204/127 1633/2196/127 +f 1629/2197/117 1627/2199/117 1626/2198/117 +f 1627/2199/114 1623/2192/114 1622/2194/114 +f 1628/2200/118 1626/2198/118 1622/2194/118 +f 1625/2202/119 1623/2192/119 1627/2199/119 +f 1632/2204/117 1636/2268/117 1637/2205/117 +f 1624/2201/130 1631/2213/130 1632/2206/130 +f 1629/2203/131 1633/2215/131 1630/2207/131 +f 1625/2208/115 1630/2216/115 1631/2209/115 +f 1634/2210/116 1637/2269/116 1636/2211/116 +f 1631/2213/118 1635/2270/118 1636/2214/118 +f 1633/2215/119 1637/2269/119 1634/2210/119 +f 1630/2216/123 1634/2271/123 1635/2217/123 +f 1639/2218/123 1641/2234/123 1640/2219/123 +f 1644/2221/127 1648/2230/127 1649/2222/127 +f 1645/2223/117 1643/2225/117 1642/2224/117 +f 1643/2225/114 1639/2218/114 1638/2220/114 +f 1644/2226/118 1642/2224/118 1638/2220/118 +f 1641/2228/119 1639/2218/119 1643/2225/119 +f 1648/2230/117 1652/2272/117 1653/2231/117 +f 1640/2227/130 1647/2239/130 1648/2232/130 +f 1645/2229/131 1649/2241/131 1646/2233/131 +f 1641/2234/115 1646/2242/115 1647/2235/115 +f 1650/2236/116 1653/2273/116 1652/2237/116 +f 1647/2239/118 1651/2274/118 1652/2240/118 +f 1649/2241/119 1653/2273/119 1650/2236/119 +f 1646/2242/123 1650/2275/123 1651/2243/123 o Base v 0.000000 0.500000 -1.000000 v -0.382683 0.500000 -0.923880 @@ -7007,304 +7025,304 @@ vn 0.7071 0.7071 0.0000 vn 0.6533 0.7071 -0.2706 vn 0.5000 0.7071 -0.5000 s off -f 1687/2258/148 1688/2259/148 1686/2260/148 -f 1688/2259/149 1693/2261/149 1692/2262/149 -f 1693/2261/150 1690/2263/150 1692/2262/150 -f 1691/2264/151 1686/2265/151 1690/2263/151 -f 1688/2266/152 1690/2263/152 1686/2265/152 -f 1693/2261/153 1687/2267/153 1691/2264/153 -f 1695/2268/150 1696/2269/150 1694/2270/150 -f 1696/2269/151 1701/2271/151 1700/2272/151 -f 1701/2271/148 1698/2273/148 1700/2272/148 -f 1699/2274/149 1694/2275/149 1698/2273/149 -f 1700/2276/152 1694/2275/152 1696/2277/152 -f 1697/2278/154 1699/2274/154 1701/2271/154 -f 1703/2279/151 1704/2280/151 1702/2281/151 -f 1704/2280/148 1709/2282/148 1708/2283/148 -f 1709/2282/149 1706/2284/149 1708/2283/149 -f 1707/2285/150 1702/2286/150 1706/2284/150 -f 1708/2287/152 1702/2286/152 1704/2288/152 -f 1705/2289/155 1707/2285/155 1709/2282/155 -f 1711/2290/149 1712/2291/149 1710/2292/149 -f 1712/2291/150 1717/2293/150 1716/2294/150 -f 1717/2293/151 1714/2295/151 1716/2294/151 -f 1715/2296/148 1710/2297/148 1714/2295/148 -f 1716/2298/152 1710/2297/152 1712/2299/152 -f 1717/2293/156 1711/2300/156 1715/2296/156 -f 1804/2301/152 1802/2302/152 1800/2303/152 -f 1824/2304/157 1863/2305/157 1877/2306/157 -f 1823/2307/157 1877/2308/157 1876/2309/157 -f 1822/2310/157 1876/2311/157 1875/2312/157 -f 1821/2313/157 1875/2314/157 1874/2315/157 -f 1821/2316/157 1873/2317/157 1820/2318/157 -f 1819/2319/157 1873/2320/157 1872/2321/157 -f 1818/2322/157 1872/2323/157 1871/2324/157 -f 1818/2325/157 1870/2326/157 1817/2327/157 -f 1817/2328/157 1869/2329/157 1816/2330/157 -f 1816/2331/157 1868/2332/157 1815/2333/157 -f 1815/2334/157 1867/2335/157 1814/2336/157 -f 1814/2337/157 1866/2338/157 1829/2339/157 -f 1829/2340/157 1865/2341/157 1828/2342/157 -f 1828/2343/157 1864/2344/157 1827/2345/157 -f 1827/2346/157 1862/2347/157 1826/2348/157 -f 1825/2349/157 1862/2350/157 1863/2351/157 -f 1894/2352/157 1889/2353/157 1895/2354/157 -f 1896/2355/157 1890/2356/157 1894/2357/157 -f 1897/2358/157 1891/2359/157 1896/2360/157 -f 1897/2361/157 1893/2362/157 1892/2363/157 -f 1898/2364/157 1878/2365/157 1893/2366/157 -f 1900/2367/157 1878/2368/157 1899/2369/157 -f 1900/2370/157 1880/2371/157 1879/2372/157 -f 1901/2373/157 1881/2374/157 1880/2375/157 -f 1902/2376/157 1882/2377/157 1881/2378/157 -f 1904/2379/157 1882/2380/157 1903/2381/157 -f 1905/2382/157 1883/2383/157 1904/2384/157 -f 1906/2385/157 1884/2386/157 1905/2387/157 -f 1907/2388/157 1885/2389/157 1906/2390/157 -f 1908/2391/157 1886/2392/157 1907/2393/157 -f 1909/2394/157 1887/2395/157 1908/2396/157 -f 1895/2397/157 1888/2398/157 1909/2399/157 -f 1841/2400/157 1837/2401/157 1833/2402/157 -f 1687/2258/148 1689/2403/148 1688/2259/148 -f 1688/2259/149 1689/2403/149 1693/2261/149 -f 1693/2261/150 1691/2264/150 1690/2263/150 -f 1691/2264/151 1687/2404/151 1686/2265/151 -f 1688/2266/152 1692/2405/152 1690/2263/152 -f 1693/2261/153 1689/2406/153 1687/2267/153 -f 1695/2268/150 1697/2407/150 1696/2269/150 -f 1696/2269/151 1697/2407/151 1701/2271/151 -f 1701/2271/148 1699/2274/148 1698/2273/148 -f 1699/2274/149 1695/2408/149 1694/2275/149 -f 1700/2276/152 1698/2273/152 1694/2275/152 -f 1697/2278/154 1695/2409/154 1699/2274/154 -f 1703/2279/151 1705/2410/151 1704/2280/151 -f 1704/2280/148 1705/2410/148 1709/2282/148 -f 1709/2282/149 1707/2285/149 1706/2284/149 -f 1707/2285/150 1703/2411/150 1702/2286/150 -f 1708/2287/152 1706/2284/152 1702/2286/152 -f 1705/2289/155 1703/2412/155 1707/2285/155 -f 1711/2290/149 1713/2413/149 1712/2291/149 -f 1712/2291/150 1713/2413/150 1717/2293/150 -f 1717/2293/151 1715/2296/151 1714/2295/151 -f 1715/2296/148 1711/2414/148 1710/2297/148 -f 1716/2298/152 1714/2295/152 1710/2297/152 -f 1717/2293/156 1713/2415/156 1711/2300/156 -f 1800/2303/152 1799/2416/152 1798/2417/152 -f 1798/2417/152 1813/2418/152 1812/2419/152 -f 1812/2419/152 1811/2420/152 1808/2421/152 -f 1811/2420/152 1810/2422/152 1808/2421/152 -f 1810/2422/152 1809/2423/152 1808/2421/152 -f 1808/2421/152 1807/2424/152 1806/2425/152 -f 1806/2425/152 1805/2426/152 1804/2301/152 -f 1804/2301/152 1803/2427/152 1802/2302/152 -f 1802/2302/152 1801/2428/152 1800/2303/152 -f 1800/2303/152 1798/2417/152 1808/2421/152 -f 1798/2417/152 1812/2419/152 1808/2421/152 -f 1808/2421/152 1806/2425/152 1800/2303/152 -f 1806/2425/152 1804/2301/152 1800/2303/152 -f 1824/2304/157 1825/2429/157 1863/2305/157 -f 1823/2307/157 1824/2430/157 1877/2308/157 -f 1822/2310/157 1823/2431/157 1876/2311/157 -f 1821/2313/157 1822/2432/157 1875/2314/157 -f 1821/2316/157 1874/2433/157 1873/2317/157 -f 1819/2319/157 1820/2434/157 1873/2320/157 -f 1818/2322/157 1819/2435/157 1872/2323/157 -f 1818/2325/157 1871/2436/157 1870/2326/157 -f 1817/2328/157 1870/2437/157 1869/2329/157 -f 1816/2331/157 1869/2438/157 1868/2332/157 -f 1815/2334/157 1868/2439/157 1867/2335/157 -f 1814/2337/157 1867/2440/157 1866/2338/157 -f 1829/2340/157 1866/2441/157 1865/2341/157 -f 1828/2343/157 1865/2442/157 1864/2344/157 -f 1827/2346/157 1864/2443/157 1862/2347/157 -f 1825/2349/157 1826/2444/157 1862/2350/157 -f 1894/2352/157 1890/2445/157 1889/2353/157 -f 1896/2355/157 1891/2446/157 1890/2356/157 -f 1897/2358/157 1892/2447/157 1891/2359/157 -f 1897/2361/157 1898/2448/157 1893/2362/157 -f 1898/2364/157 1899/2449/157 1878/2365/157 -f 1900/2367/157 1879/2450/157 1878/2368/157 -f 1900/2370/157 1901/2451/157 1880/2371/157 -f 1901/2373/157 1902/2452/157 1881/2374/157 -f 1902/2376/157 1903/2453/157 1882/2377/157 -f 1904/2379/157 1883/2454/157 1882/2380/157 -f 1905/2382/157 1884/2455/157 1883/2383/157 -f 1906/2385/157 1885/2456/157 1884/2386/157 -f 1907/2388/157 1886/2457/157 1885/2389/157 -f 1908/2391/157 1887/2458/157 1886/2392/157 -f 1909/2394/157 1888/2459/157 1887/2395/157 -f 1895/2397/157 1889/2460/157 1888/2398/157 -f 1844/2461/157 1845/2462/157 1843/2463/157 -f 1843/2463/157 1842/2464/157 1844/2461/157 -f 1842/2464/157 1841/2400/157 1844/2461/157 -f 1841/2400/157 1840/2465/157 1837/2401/157 -f 1840/2465/157 1839/2466/157 1837/2401/157 -f 1839/2466/157 1838/2467/157 1837/2401/157 -f 1837/2401/157 1836/2468/157 1835/2469/157 -f 1835/2469/157 1834/2470/157 1833/2402/157 -f 1833/2402/157 1832/2471/157 1831/2472/157 -f 1831/2472/157 1830/2473/157 1833/2402/157 -f 1830/2473/157 1844/2461/157 1833/2402/157 -f 1837/2401/157 1835/2469/157 1833/2402/157 -f 1844/2461/157 1841/2400/157 1833/2402/157 +f 1703/2276/132 1704/2277/132 1702/2278/132 +f 1704/2277/133 1709/2279/133 1708/2280/133 +f 1709/2279/134 1706/2281/134 1708/2280/134 +f 1707/2282/135 1702/2283/135 1706/2281/135 +f 1704/2284/136 1706/2281/136 1702/2283/136 +f 1709/2279/137 1703/2285/137 1707/2282/137 +f 1711/2286/134 1712/2287/134 1710/2288/134 +f 1712/2287/135 1717/2289/135 1716/2290/135 +f 1717/2289/132 1714/2291/132 1716/2290/132 +f 1715/2292/133 1710/2293/133 1714/2291/133 +f 1716/2294/136 1710/2293/136 1712/2295/136 +f 1713/2296/138 1715/2292/138 1717/2289/138 +f 1719/2297/135 1720/2298/135 1718/2299/135 +f 1720/2298/132 1725/2300/132 1724/2301/132 +f 1725/2300/133 1722/2302/133 1724/2301/133 +f 1723/2303/134 1718/2304/134 1722/2302/134 +f 1724/2305/136 1718/2304/136 1720/2306/136 +f 1721/2307/139 1723/2303/139 1725/2300/139 +f 1727/2308/133 1728/2309/133 1726/2310/133 +f 1728/2309/134 1733/2311/134 1732/2312/134 +f 1733/2311/135 1730/2313/135 1732/2312/135 +f 1731/2314/132 1726/2315/132 1730/2313/132 +f 1732/2316/136 1726/2315/136 1728/2317/136 +f 1733/2311/140 1727/2318/140 1731/2314/140 +f 1820/2319/136 1818/2320/136 1816/2321/136 +f 1840/2322/141 1879/2323/141 1893/2324/141 +f 1839/2325/141 1893/2326/141 1892/2327/141 +f 1838/2328/141 1892/2329/141 1891/2330/141 +f 1837/2331/141 1891/2332/141 1890/2333/141 +f 1837/2334/141 1889/2335/141 1836/2336/141 +f 1835/2337/141 1889/2338/141 1888/2339/141 +f 1834/2340/141 1888/2341/141 1887/2342/141 +f 1834/2343/141 1886/2344/141 1833/2345/141 +f 1833/2346/141 1885/2347/141 1832/2348/141 +f 1832/2349/141 1884/2350/141 1831/2351/141 +f 1831/2352/141 1883/2353/141 1830/2354/141 +f 1830/2355/141 1882/2356/141 1845/2357/141 +f 1845/2358/141 1881/2359/141 1844/2360/141 +f 1844/2361/141 1880/2362/141 1843/2363/141 +f 1843/2364/141 1878/2365/141 1842/2366/141 +f 1841/2367/141 1878/2368/141 1879/2369/141 +f 1910/2370/141 1905/2371/141 1911/2372/141 +f 1912/2373/141 1906/2374/141 1910/2375/141 +f 1913/2376/141 1907/2377/141 1912/2378/141 +f 1913/2379/141 1909/2380/141 1908/2381/141 +f 1914/2382/141 1894/2383/141 1909/2384/141 +f 1916/2385/141 1894/2386/141 1915/2387/141 +f 1916/2388/141 1896/2389/141 1895/2390/141 +f 1917/2391/141 1897/2392/141 1896/2393/141 +f 1918/2394/141 1898/2395/141 1897/2396/141 +f 1920/2397/141 1898/2398/141 1919/2399/141 +f 1921/2400/141 1899/2401/141 1920/2402/141 +f 1922/2403/141 1900/2404/141 1921/2405/141 +f 1923/2406/141 1901/2407/141 1922/2408/141 +f 1924/2409/141 1902/2410/141 1923/2411/141 +f 1925/2412/141 1903/2413/141 1924/2414/141 +f 1911/2415/141 1904/2416/141 1925/2417/141 +f 1857/2418/141 1853/2419/141 1849/2420/141 +f 1703/2276/132 1705/2421/132 1704/2277/132 +f 1704/2277/133 1705/2421/133 1709/2279/133 +f 1709/2279/134 1707/2282/134 1706/2281/134 +f 1707/2282/135 1703/2422/135 1702/2283/135 +f 1704/2284/136 1708/2423/136 1706/2281/136 +f 1709/2279/137 1705/2424/137 1703/2285/137 +f 1711/2286/134 1713/2425/134 1712/2287/134 +f 1712/2287/135 1713/2425/135 1717/2289/135 +f 1717/2289/132 1715/2292/132 1714/2291/132 +f 1715/2292/133 1711/2426/133 1710/2293/133 +f 1716/2294/136 1714/2291/136 1710/2293/136 +f 1713/2296/138 1711/2427/138 1715/2292/138 +f 1719/2297/135 1721/2428/135 1720/2298/135 +f 1720/2298/132 1721/2428/132 1725/2300/132 +f 1725/2300/133 1723/2303/133 1722/2302/133 +f 1723/2303/134 1719/2429/134 1718/2304/134 +f 1724/2305/136 1722/2302/136 1718/2304/136 +f 1721/2307/139 1719/2430/139 1723/2303/139 +f 1727/2308/133 1729/2431/133 1728/2309/133 +f 1728/2309/134 1729/2431/134 1733/2311/134 +f 1733/2311/135 1731/2314/135 1730/2313/135 +f 1731/2314/132 1727/2432/132 1726/2315/132 +f 1732/2316/136 1730/2313/136 1726/2315/136 +f 1733/2311/140 1729/2433/140 1727/2318/140 +f 1816/2321/136 1815/2434/136 1814/2435/136 +f 1814/2435/136 1829/2436/136 1828/2437/136 +f 1828/2437/136 1827/2438/136 1824/2439/136 +f 1827/2438/136 1826/2440/136 1824/2439/136 +f 1826/2440/136 1825/2441/136 1824/2439/136 +f 1824/2439/136 1823/2442/136 1822/2443/136 +f 1822/2443/136 1821/2444/136 1820/2319/136 +f 1820/2319/136 1819/2445/136 1818/2320/136 +f 1818/2320/136 1817/2446/136 1816/2321/136 +f 1816/2321/136 1814/2435/136 1824/2439/136 +f 1814/2435/136 1828/2437/136 1824/2439/136 +f 1824/2439/136 1822/2443/136 1816/2321/136 +f 1822/2443/136 1820/2319/136 1816/2321/136 +f 1840/2322/141 1841/2447/141 1879/2323/141 +f 1839/2325/141 1840/2448/141 1893/2326/141 +f 1838/2328/141 1839/2449/141 1892/2329/141 +f 1837/2331/141 1838/2450/141 1891/2332/141 +f 1837/2334/141 1890/2451/141 1889/2335/141 +f 1835/2337/141 1836/2452/141 1889/2338/141 +f 1834/2340/141 1835/2453/141 1888/2341/141 +f 1834/2343/141 1887/2454/141 1886/2344/141 +f 1833/2346/141 1886/2455/141 1885/2347/141 +f 1832/2349/141 1885/2456/141 1884/2350/141 +f 1831/2352/141 1884/2457/141 1883/2353/141 +f 1830/2355/141 1883/2458/141 1882/2356/141 +f 1845/2358/141 1882/2459/141 1881/2359/141 +f 1844/2361/141 1881/2460/141 1880/2362/141 +f 1843/2364/141 1880/2461/141 1878/2365/141 +f 1841/2367/141 1842/2462/141 1878/2368/141 +f 1910/2370/141 1906/2463/141 1905/2371/141 +f 1912/2373/141 1907/2464/141 1906/2374/141 +f 1913/2376/141 1908/2465/141 1907/2377/141 +f 1913/2379/141 1914/2466/141 1909/2380/141 +f 1914/2382/141 1915/2467/141 1894/2383/141 +f 1916/2385/141 1895/2468/141 1894/2386/141 +f 1916/2388/141 1917/2469/141 1896/2389/141 +f 1917/2391/141 1918/2470/141 1897/2392/141 +f 1918/2394/141 1919/2471/141 1898/2395/141 +f 1920/2397/141 1899/2472/141 1898/2398/141 +f 1921/2400/141 1900/2473/141 1899/2401/141 +f 1922/2403/141 1901/2474/141 1900/2404/141 +f 1923/2406/141 1902/2475/141 1901/2407/141 +f 1924/2409/141 1903/2476/141 1902/2410/141 +f 1925/2412/141 1904/2477/141 1903/2413/141 +f 1911/2415/141 1905/2478/141 1904/2416/141 +f 1860/2479/141 1861/2480/141 1859/2481/141 +f 1859/2481/141 1858/2482/141 1860/2479/141 +f 1858/2482/141 1857/2418/141 1860/2479/141 +f 1857/2418/141 1856/2483/141 1853/2419/141 +f 1856/2483/141 1855/2484/141 1853/2419/141 +f 1855/2484/141 1854/2485/141 1853/2419/141 +f 1853/2419/141 1852/2486/141 1851/2487/141 +f 1851/2487/141 1850/2488/141 1849/2420/141 +f 1849/2420/141 1848/2489/141 1847/2490/141 +f 1847/2490/141 1846/2491/141 1849/2420/141 +f 1846/2491/141 1860/2479/141 1849/2420/141 +f 1853/2419/141 1851/2487/141 1849/2420/141 +f 1860/2479/141 1857/2418/141 1849/2420/141 s 1 -f 1760/2474/158 1729/2475/150 1761/2476/150 -f 1729/2477/150 1762/2478/159 1761/2479/150 -f 1730/2480/159 1763/2481/160 1762/2482/159 -f 1731/2483/160 1764/2484/161 1763/2485/160 -f 1732/2486/161 1765/2487/149 1764/2488/161 -f 1733/2489/149 1751/2490/162 1765/2491/149 -f 1719/2492/162 1750/2493/163 1751/2494/162 -f 1718/2495/163 1752/2496/164 1750/2497/163 -f 1720/2498/164 1753/2499/148 1752/2500/164 -f 1721/2501/148 1754/2502/165 1753/2503/148 -f 1722/2504/165 1755/2505/166 1754/2506/165 -f 1723/2507/166 1756/2508/167 1755/2509/166 -f 1724/2510/167 1757/2511/151 1756/2512/167 -f 1725/2513/151 1758/2514/168 1757/2515/151 -f 1726/2516/168 1759/2517/169 1758/2518/168 -f 1727/2519/169 1760/2520/158 1759/2521/169 -f 1643/2522/164 1676/2523/148 1644/2524/148 -f 1651/2525/158 1684/2526/150 1652/2527/150 -f 1644/2528/148 1677/2529/165 1645/2530/165 -f 1652/2531/150 1685/2532/159 1653/2533/159 -f 1645/2534/165 1678/2535/166 1646/2536/166 -f 1638/2537/160 1671/2538/161 1639/2539/161 -f 1653/2540/159 1670/2541/160 1638/2542/160 -f 1646/2543/166 1679/2544/167 1647/2545/167 -f 1639/2546/161 1672/2547/149 1640/2548/149 -f 1647/2549/167 1680/2550/151 1648/2551/151 -f 1640/2552/149 1673/2553/162 1641/2554/162 -f 1648/2555/151 1681/2556/168 1649/2557/168 -f 1641/2558/162 1674/2559/163 1642/2560/163 -f 1649/2561/168 1682/2562/169 1650/2563/169 -f 1642/2564/163 1675/2565/164 1643/2566/164 -f 1650/2567/169 1683/2568/158 1651/2569/158 -f 1743/2570/161 1661/2571/160 1742/2572/160 -f 1736/2573/151 1669/2574/167 1735/2575/167 -f 1744/2576/149 1660/2577/161 1743/2578/161 -f 1737/2579/168 1667/2580/151 1736/2581/151 -f 1745/2582/162 1659/2583/149 1744/2584/149 -f 1738/2585/169 1666/2586/168 1737/2587/168 -f 1746/2588/163 1658/2589/162 1745/2590/162 -f 1739/2591/158 1665/2592/169 1738/2593/169 -f 1747/2594/164 1657/2595/163 1746/2596/163 -f 1740/2597/150 1664/2598/158 1739/2599/158 -f 1748/2600/148 1656/2601/164 1747/2602/164 -f 1741/2603/159 1663/2604/150 1740/2605/150 -f 1749/2606/165 1655/2607/148 1748/2608/148 -f 1742/2609/160 1662/2610/159 1741/2611/159 -f 1735/2612/167 1668/2613/166 1734/2614/166 -f 1734/2615/166 1654/2616/165 1749/2617/165 -f 1911/2618/170 1847/2619/171 1846/2620/170 -f 1772/2621/148 1787/2622/164 1771/2623/164 -f 1780/2624/150 1795/2625/158 1779/2626/158 -f 1773/2627/165 1788/2628/148 1772/2621/148 -f 1781/2629/159 1796/2630/150 1780/2624/150 -f 1774/2631/166 1789/2632/165 1773/2627/165 -f 1767/2633/161 1783/2634/160 1766/2635/160 -f 1766/2635/160 1797/2636/159 1781/2629/159 -f 1775/2637/167 1790/2638/166 1774/2631/166 -f 1768/2639/149 1782/2640/161 1767/2633/161 -f 1776/2641/151 1791/2642/167 1775/2637/167 -f 1769/2643/162 1784/2644/149 1768/2639/149 -f 1777/2645/168 1792/2646/151 1776/2641/151 -f 1770/2647/163 1785/2648/162 1769/2643/162 -f 1778/2649/169 1793/2650/168 1777/2645/168 -f 1771/2623/164 1786/2651/163 1770/2652/163 -f 1779/2626/158 1794/2653/169 1778/2649/169 -f 1925/2654/172 1846/2655/170 1861/2656/172 -f 1910/2657/171 1848/2658/173 1847/2659/171 -f 1912/2660/173 1849/2661/174 1848/2662/173 -f 1913/2663/174 1850/2664/175 1849/2665/174 -f 1914/2666/175 1851/2667/176 1850/2668/175 -f 1851/2669/176 1916/2670/177 1852/2671/177 -f 1916/2670/177 1853/2672/178 1852/2673/177 -f 1917/2674/178 1854/2675/179 1853/2676/178 -f 1918/2677/179 1855/2678/180 1854/2679/179 -f 1919/2680/180 1856/2681/181 1855/2682/180 -f 1856/2683/181 1921/2684/182 1857/2685/182 -f 1857/2686/182 1922/2687/183 1858/2688/183 -f 1922/2687/183 1859/2689/184 1858/2690/183 -f 1923/2691/184 1860/2692/185 1859/2693/184 -f 1924/2694/185 1861/2695/172 1860/2696/185 -f 1760/2474/158 1728/2697/158 1729/2475/150 -f 1729/2477/150 1730/2698/159 1762/2478/159 -f 1730/2480/159 1731/2699/160 1763/2481/160 -f 1731/2483/160 1732/2700/161 1764/2484/161 -f 1732/2486/161 1733/2701/149 1765/2487/149 -f 1733/2489/149 1719/2702/162 1751/2490/162 -f 1719/2492/162 1718/2703/163 1750/2493/163 -f 1718/2495/163 1720/2704/164 1752/2496/164 -f 1720/2498/164 1721/2705/148 1753/2499/148 -f 1721/2501/148 1722/2706/165 1754/2502/165 -f 1722/2504/165 1723/2707/166 1755/2505/166 -f 1723/2507/166 1724/2708/167 1756/2508/167 -f 1724/2510/167 1725/2709/151 1757/2511/151 -f 1725/2513/151 1726/2710/168 1758/2514/168 -f 1726/2516/168 1727/2711/169 1759/2517/169 -f 1727/2519/169 1728/2712/158 1760/2520/158 -f 1643/2522/164 1675/2713/164 1676/2523/148 -f 1651/2525/158 1683/2714/158 1684/2526/150 -f 1644/2528/148 1676/2715/148 1677/2529/165 -f 1652/2531/150 1684/2716/150 1685/2532/159 -f 1645/2534/165 1677/2717/165 1678/2535/166 -f 1638/2537/160 1670/2718/160 1671/2538/161 -f 1653/2540/159 1685/2719/159 1670/2541/160 -f 1646/2543/166 1678/2720/166 1679/2544/167 -f 1639/2546/161 1671/2721/161 1672/2547/149 -f 1647/2549/167 1679/2722/167 1680/2550/151 -f 1640/2552/149 1672/2723/149 1673/2553/162 -f 1648/2555/151 1680/2724/151 1681/2556/168 -f 1641/2558/162 1673/2725/162 1674/2559/163 -f 1649/2561/168 1681/2726/168 1682/2562/169 -f 1642/2564/163 1674/2727/163 1675/2565/164 -f 1650/2567/169 1682/2728/169 1683/2568/158 -f 1743/2570/161 1660/2729/161 1661/2571/160 -f 1736/2573/151 1667/2730/151 1669/2574/167 -f 1744/2576/149 1659/2731/149 1660/2577/161 -f 1737/2579/168 1666/2732/168 1667/2580/151 -f 1745/2582/162 1658/2733/162 1659/2583/149 -f 1738/2585/169 1665/2734/169 1666/2586/168 -f 1746/2588/163 1657/2735/163 1658/2589/162 -f 1739/2591/158 1664/2736/158 1665/2592/169 -f 1747/2594/164 1656/2737/164 1657/2595/163 -f 1740/2597/150 1663/2738/150 1664/2598/158 -f 1748/2600/148 1655/2739/148 1656/2601/164 -f 1741/2603/159 1662/2740/159 1663/2604/150 -f 1749/2606/165 1654/2741/165 1655/2607/148 -f 1742/2609/160 1661/2742/160 1662/2610/159 -f 1735/2612/167 1669/2743/167 1668/2613/166 -f 1734/2615/166 1668/2744/166 1654/2616/165 -f 1911/2618/170 1910/2657/171 1847/2619/171 -f 1772/2621/148 1788/2628/148 1787/2622/164 -f 1780/2624/150 1796/2630/150 1795/2625/158 -f 1773/2627/165 1789/2632/165 1788/2628/148 -f 1781/2629/159 1797/2636/159 1796/2630/150 -f 1774/2631/166 1790/2638/166 1789/2632/165 -f 1767/2633/161 1782/2640/161 1783/2634/160 -f 1766/2635/160 1783/2634/160 1797/2636/159 -f 1775/2637/167 1791/2642/167 1790/2638/166 -f 1768/2639/149 1784/2644/149 1782/2640/161 -f 1776/2641/151 1792/2646/151 1791/2642/167 -f 1769/2643/162 1785/2648/162 1784/2644/149 -f 1777/2645/168 1793/2650/168 1792/2646/151 -f 1770/2647/163 1786/2745/163 1785/2648/162 -f 1778/2649/169 1794/2653/169 1793/2650/168 -f 1771/2623/164 1787/2622/164 1786/2651/163 -f 1779/2626/158 1795/2625/158 1794/2653/169 -f 1925/2654/172 1911/2618/170 1846/2655/170 -f 1910/2657/171 1912/2660/173 1848/2658/173 -f 1912/2660/173 1913/2663/174 1849/2661/174 -f 1913/2663/174 1914/2746/175 1850/2664/175 -f 1914/2666/175 1915/2747/176 1851/2667/176 -f 1851/2669/176 1915/2747/176 1916/2670/177 -f 1916/2670/177 1917/2674/178 1853/2672/178 -f 1917/2674/178 1918/2677/179 1854/2675/179 -f 1918/2677/179 1919/2680/180 1855/2678/180 -f 1919/2680/180 1920/2748/181 1856/2681/181 -f 1856/2683/181 1920/2748/181 1921/2684/182 -f 1857/2686/182 1921/2684/182 1922/2687/183 -f 1922/2687/183 1923/2691/184 1859/2689/184 -f 1923/2691/184 1924/2694/185 1860/2692/185 -f 1924/2694/185 1925/2654/172 1861/2695/172 +f 1776/2492/142 1745/2493/134 1777/2494/134 +f 1745/2495/134 1778/2496/143 1777/2497/134 +f 1746/2498/143 1779/2499/144 1778/2500/143 +f 1747/2501/144 1780/2502/145 1779/2503/144 +f 1748/2504/145 1781/2505/133 1780/2506/145 +f 1749/2507/133 1767/2508/146 1781/2509/133 +f 1735/2510/146 1766/2511/147 1767/2512/146 +f 1734/2513/147 1768/2514/148 1766/2515/147 +f 1736/2516/148 1769/2517/132 1768/2518/148 +f 1737/2519/132 1770/2520/149 1769/2521/132 +f 1738/2522/149 1771/2523/150 1770/2524/149 +f 1739/2525/150 1772/2526/151 1771/2527/150 +f 1740/2528/151 1773/2529/135 1772/2530/151 +f 1741/2531/135 1774/2532/152 1773/2533/135 +f 1742/2534/152 1775/2535/153 1774/2536/152 +f 1743/2537/153 1776/2538/142 1775/2539/153 +f 1659/2540/148 1692/2541/132 1660/2542/132 +f 1667/2543/142 1700/2544/134 1668/2545/134 +f 1660/2546/132 1693/2547/149 1661/2548/149 +f 1668/2549/134 1701/2550/143 1669/2551/143 +f 1661/2552/149 1694/2553/150 1662/2554/150 +f 1654/2555/144 1687/2556/145 1655/2557/145 +f 1669/2558/143 1686/2559/144 1654/2560/144 +f 1662/2561/150 1695/2562/151 1663/2563/151 +f 1655/2564/145 1688/2565/133 1656/2566/133 +f 1663/2567/151 1696/2568/135 1664/2569/135 +f 1656/2570/133 1689/2571/146 1657/2572/146 +f 1664/2573/135 1697/2574/152 1665/2575/152 +f 1657/2576/146 1690/2577/147 1658/2578/147 +f 1665/2579/152 1698/2580/153 1666/2581/153 +f 1658/2582/147 1691/2583/148 1659/2584/148 +f 1666/2585/153 1699/2586/142 1667/2587/142 +f 1759/2588/145 1677/2589/144 1758/2590/144 +f 1752/2591/135 1685/2592/151 1751/2593/151 +f 1760/2594/133 1676/2595/145 1759/2596/145 +f 1753/2597/152 1683/2598/135 1752/2599/135 +f 1761/2600/146 1675/2601/133 1760/2602/133 +f 1754/2603/153 1682/2604/152 1753/2605/152 +f 1762/2606/147 1674/2607/146 1761/2608/146 +f 1755/2609/142 1681/2610/153 1754/2611/153 +f 1763/2612/148 1673/2613/147 1762/2614/147 +f 1756/2615/134 1680/2616/142 1755/2617/142 +f 1764/2618/132 1672/2619/148 1763/2620/148 +f 1757/2621/143 1679/2622/134 1756/2623/134 +f 1765/2624/149 1671/2625/132 1764/2626/132 +f 1758/2627/144 1678/2628/143 1757/2629/143 +f 1751/2630/151 1684/2631/150 1750/2632/150 +f 1750/2633/150 1670/2634/149 1765/2635/149 +f 1927/2636/154 1863/2637/155 1862/2638/154 +f 1788/2639/132 1803/2640/148 1787/2641/148 +f 1796/2642/134 1811/2643/142 1795/2644/142 +f 1789/2645/149 1804/2646/132 1788/2639/132 +f 1797/2647/143 1812/2648/134 1796/2642/134 +f 1790/2649/150 1805/2650/149 1789/2645/149 +f 1783/2651/145 1799/2652/144 1782/2653/144 +f 1782/2653/144 1813/2654/143 1797/2647/143 +f 1791/2655/151 1806/2656/150 1790/2649/150 +f 1784/2657/133 1798/2658/145 1783/2651/145 +f 1792/2659/135 1807/2660/151 1791/2655/151 +f 1785/2661/146 1800/2662/133 1784/2657/133 +f 1793/2663/152 1808/2664/135 1792/2659/135 +f 1786/2665/147 1801/2666/146 1785/2661/146 +f 1794/2667/153 1809/2668/152 1793/2663/152 +f 1787/2641/148 1802/2669/147 1786/2670/147 +f 1795/2644/142 1810/2671/153 1794/2667/153 +f 1941/2672/156 1862/2673/154 1877/2674/156 +f 1926/2675/155 1864/2676/157 1863/2677/155 +f 1928/2678/157 1865/2679/158 1864/2680/157 +f 1929/2681/158 1866/2682/159 1865/2683/158 +f 1930/2684/159 1867/2685/160 1866/2686/159 +f 1867/2687/160 1932/2688/161 1868/2689/161 +f 1932/2688/161 1869/2690/162 1868/2691/161 +f 1933/2692/162 1870/2693/163 1869/2694/162 +f 1934/2695/163 1871/2696/164 1870/2697/163 +f 1935/2698/164 1872/2699/165 1871/2700/164 +f 1872/2701/165 1937/2702/166 1873/2703/166 +f 1873/2704/166 1938/2705/167 1874/2706/167 +f 1938/2705/167 1875/2707/168 1874/2708/167 +f 1939/2709/168 1876/2710/169 1875/2711/168 +f 1940/2712/169 1877/2713/156 1876/2714/169 +f 1776/2492/142 1744/2715/142 1745/2493/134 +f 1745/2495/134 1746/2716/143 1778/2496/143 +f 1746/2498/143 1747/2717/144 1779/2499/144 +f 1747/2501/144 1748/2718/145 1780/2502/145 +f 1748/2504/145 1749/2719/133 1781/2505/133 +f 1749/2507/133 1735/2720/146 1767/2508/146 +f 1735/2510/146 1734/2721/147 1766/2511/147 +f 1734/2513/147 1736/2722/148 1768/2514/148 +f 1736/2516/148 1737/2723/132 1769/2517/132 +f 1737/2519/132 1738/2724/149 1770/2520/149 +f 1738/2522/149 1739/2725/150 1771/2523/150 +f 1739/2525/150 1740/2726/151 1772/2526/151 +f 1740/2528/151 1741/2727/135 1773/2529/135 +f 1741/2531/135 1742/2728/152 1774/2532/152 +f 1742/2534/152 1743/2729/153 1775/2535/153 +f 1743/2537/153 1744/2730/142 1776/2538/142 +f 1659/2540/148 1691/2731/148 1692/2541/132 +f 1667/2543/142 1699/2732/142 1700/2544/134 +f 1660/2546/132 1692/2733/132 1693/2547/149 +f 1668/2549/134 1700/2734/134 1701/2550/143 +f 1661/2552/149 1693/2735/149 1694/2553/150 +f 1654/2555/144 1686/2736/144 1687/2556/145 +f 1669/2558/143 1701/2737/143 1686/2559/144 +f 1662/2561/150 1694/2738/150 1695/2562/151 +f 1655/2564/145 1687/2739/145 1688/2565/133 +f 1663/2567/151 1695/2740/151 1696/2568/135 +f 1656/2570/133 1688/2741/133 1689/2571/146 +f 1664/2573/135 1696/2742/135 1697/2574/152 +f 1657/2576/146 1689/2743/146 1690/2577/147 +f 1665/2579/152 1697/2744/152 1698/2580/153 +f 1658/2582/147 1690/2745/147 1691/2583/148 +f 1666/2585/153 1698/2746/153 1699/2586/142 +f 1759/2588/145 1676/2747/145 1677/2589/144 +f 1752/2591/135 1683/2748/135 1685/2592/151 +f 1760/2594/133 1675/2749/133 1676/2595/145 +f 1753/2597/152 1682/2750/152 1683/2598/135 +f 1761/2600/146 1674/2751/146 1675/2601/133 +f 1754/2603/153 1681/2752/153 1682/2604/152 +f 1762/2606/147 1673/2753/147 1674/2607/146 +f 1755/2609/142 1680/2754/142 1681/2610/153 +f 1763/2612/148 1672/2755/148 1673/2613/147 +f 1756/2615/134 1679/2756/134 1680/2616/142 +f 1764/2618/132 1671/2757/132 1672/2619/148 +f 1757/2621/143 1678/2758/143 1679/2622/134 +f 1765/2624/149 1670/2759/149 1671/2625/132 +f 1758/2627/144 1677/2760/144 1678/2628/143 +f 1751/2630/151 1685/2761/151 1684/2631/150 +f 1750/2633/150 1684/2762/150 1670/2634/149 +f 1927/2636/154 1926/2675/155 1863/2637/155 +f 1788/2639/132 1804/2646/132 1803/2640/148 +f 1796/2642/134 1812/2648/134 1811/2643/142 +f 1789/2645/149 1805/2650/149 1804/2646/132 +f 1797/2647/143 1813/2654/143 1812/2648/134 +f 1790/2649/150 1806/2656/150 1805/2650/149 +f 1783/2651/145 1798/2658/145 1799/2652/144 +f 1782/2653/144 1799/2652/144 1813/2654/143 +f 1791/2655/151 1807/2660/151 1806/2656/150 +f 1784/2657/133 1800/2662/133 1798/2658/145 +f 1792/2659/135 1808/2664/135 1807/2660/151 +f 1785/2661/146 1801/2666/146 1800/2662/133 +f 1793/2663/152 1809/2668/152 1808/2664/135 +f 1786/2665/147 1802/2763/147 1801/2666/146 +f 1794/2667/153 1810/2671/153 1809/2668/152 +f 1787/2641/148 1803/2640/148 1802/2669/147 +f 1795/2644/142 1811/2643/142 1810/2671/153 +f 1941/2672/156 1927/2636/154 1862/2673/154 +f 1926/2675/155 1928/2678/157 1864/2676/157 +f 1928/2678/157 1929/2681/158 1865/2679/158 +f 1929/2681/158 1930/2764/159 1866/2682/159 +f 1930/2684/159 1931/2765/160 1867/2685/160 +f 1867/2687/160 1931/2765/160 1932/2688/161 +f 1932/2688/161 1933/2692/162 1869/2690/162 +f 1933/2692/162 1934/2695/163 1870/2693/163 +f 1934/2695/163 1935/2698/164 1871/2696/164 +f 1935/2698/164 1936/2766/165 1872/2699/165 +f 1872/2701/165 1936/2766/165 1937/2702/166 +f 1873/2704/166 1937/2702/166 1938/2705/167 +f 1938/2705/167 1939/2709/168 1875/2707/168 +f 1939/2709/168 1940/2712/169 1876/2710/169 +f 1940/2712/169 1941/2672/156 1877/2713/156 diff --git a/src/main/java/assets/hbm/textures/gui/weapon/gui_turret_base.png b/src/main/java/assets/hbm/textures/gui/weapon/gui_turret_base.png new file mode 100644 index 0000000000000000000000000000000000000000..07fb3d08a0fa25b2b8b5a5989f883e40b859beae GIT binary patch literal 3735 zcmbW4c{tSHzra5;eJV?qp&DfgO+#df6ee4ikS%22LZoaV`!Mp2h(Uf*B3s|c5F*7` zMzST##AKO_$&z)9h76|R&iCH?d+zs-d!PHe_dL(%Ip=)d?{m)cUe4=zpA;*L%X~b? zc>n<5Gch)>1^@_W2m!bba5|Teavx3yhF&tU<>IthF7F2bz;9tGqN7SX5JS}4&ep8 zFNDt<)kS%ypwyn4d21IkCzR|r8m~^PBX`koFu^!u3P-$o*bp$|A5W~L#=e)4&OJbTOp87N0bHZzOIeHsoN&|zDW!Rx$S%gufJVStm#7YF zamY28pBr#f-%2Zv6Gi~)0V+>>{LhOvi4I6Z2!1${sU7ax;_Zr~Jbp${%=%I#m_N7< z=kdD?#lU^0cIBAciB}?`S5utT`M6{`8t{A0N+~O@Q9Bq6ou`i9m&pM zu<5au1_ryocG^yHe)0dIk5NejsOgBUI-OFHlR)H*Om4h-7(8E}v&|D)P!b4~)e6;! z3jz6Eri5@~AXq{k@=V?o=(_T1%r5(EYDqC(^12BB^_62yo?Oviaz?-rEnp^Ib%RtMIs}473vf{^QF}|`a@ywo|7?PYE~G(`+@#Y#`3^Y zien|{U#0>X8AtsP?`~pf!?F?+6F)IGZ)g^z_ADa4g=s3FD@kt1wYow4b1qJ#D)Ck4 zD%7CmdF66DmpBWY5$!sheAO(l(?(WLQYZsK)skCv)pxYGZL7dp!Drz3r#gw_P@w%p2N;eK*fN>h%uU6-x~`cW{U~Y5%NpCADNBmM$C8WPf+= zVtAJK1AMQc!Xhw8?ofJuQ6oNGpcKPqvw4%DI8rLLx;Pv<#ya;{lFK5fNw$o05og|q z(1pK6FNTrGlncImt{SdB(JdEct5;JmJ|50-l`g|IFXfM#-_zmVQ9dMp8Cd*-m^>Ha zxSfa8t9E?T@~EhAa6Tj~%s{BzDju{7W0IN@=mS|k@^~y3tN2^{c)Hxw z%%crA?ChE?WAC}Y@YL=U{tZz|cL$53$A($6eA3Kszg2S_&k=)~mDy-$YHAi99Qz|6 z+X#$)J1gk%)~R5xt!}a+;2%I91^w2%s=?eo{8R^fW3k@+YaLnWx1l?w$$hE9>vx3) zbQB>Rx2P|Jgy2XPz;bGF+;^6o59?ubgqDy=ymxAPr#kYXh(@EWn~-KV+{R0dwH6HW zsXclSFDryeBs1nu>~*|;bWQ8K6GrH~g5WJ&wH7<1aplFBi6B^e7?FU_pahaO-Q)M} z;+Xg}&?<59F7)nK$ouj>)62d%6mK?=Ck2U|?L$S(PG)Bp*J5?RgarrYbJ6lA??nhn!a=A6y4AeFwyavo(bbPl>l^{0Z8 zjQXY3fq{V`*VFYbiUn<%Jae~BVW`%llS93mU&vtF9%s5mevL1N>m^B@g#w4YKtQ&O z3$RLq0Yw~8>7F$LFrFNADSX|v|4*3(p0yA_8eM0O%!(Ir@BGV=u zsz+5?wE|sxJX+kYh$LB%1DsOeaQ^KdP4y1K^(HkBb_rnM>g|T1mT-dp@{==N# z_aA4Yh6PV#6GHVPfCW={#32Sv(EtHNzUtHcb(%X906L9%Ub$`!1zY*+fA3BaTl&<$?Y>FKMnym2ri;C^hAYE3v2I@(QzUk4?n=h|1N_e(_D z4Fj8MYr<)Oso?K5@sohmP%)evuu#2w_3^847Y_7?yJl*|BqSPcoz$@LC=nm6Fw6p| z7v-R8_BiRG{%03h3%r=;S7GJ%d%dOW#y{i3i!S>?BiE>U%L2+#5~Po*irH+(D!VG& z8X_mw|5kT*s&0?H22}ZuOTEJxr?*)?&hh>gv-*ZbzT0kJa0*AEjvqfth>d~V1eKRb z3|(;}i+#v49W(wa*PU3KM^wwCpU9+*<8%E-{w&1Bs9UMc&vsllT!vxH=d}Zt9&*1l zMej3oN(cN8sSjtzqOW8?zhv}ISt+#m2C8x|bV#(C&cHC~?S(asL3h0c_9L^oOCez; zSE0dD1eXP`r_C4{Zo;_%sCp8j=IO8KDo@!d+ftDF;cNphy3+da3Ig)vOC;zKiW&d* z&O8eo`qM5MIDa579eqn)X{^qd3xjl00-ZSb+3fwc$nTVr;lv3`K5JOH_(^$4GJkWi zPMZ=K-#W|F6~kPe(@wfBGIA4negtcy&Px@!7catGofK{2Es%t$KcLdxgw}dXtJQ=| z1t9(?#Wz(t4c8d8RnnOO?9lN0P9GYXeNh!^*fxrG zCHl^yeRj^02Q6L*K&C&~L*lqpGE4|J5?`AVZ_nhn!O=#WOn+!r{#5!EBjAo$w-87w z%%zl0SY;GyHJe7Ye|cGDK1*Y-?>^>RZ5}j#mlYR8y!r9{{Op-6h`qs8glFK#JpT6v zX9f=hPY%kP9*T-#zR5D!3@QLm`$DMs|52t%_urGokM{41^>kwTcb}u(iJ{{i>CN+> zBw~(n*K6_;)e$IJrRMoRa_7~C!W23zti zMsPMA2yyqKDsvRdNR6eI@S)XtQ=(vmWVHt zi>0k1p6vVo8k3f)TknNNEm-&&N)n80L6v0v|MF^Om{4W~q25a$HC{nbPX23%MwwYe z{9Wf?49q_*D(5ldxFT`Y>WIidv0ROY81$d<3^rByoqSB`fw3T{CuRr}g 0) { for(int i = 0; i < 4; i++) { float f = x; @@ -68,7 +73,7 @@ public class MachineForceField extends BlockContainer { float f2 = z; float f4 = rand.nextFloat(); float f5 = rand.nextFloat(); - + if(te.color == 0xFF0000) world.spawnParticle("lava", f + f4, f1, f2 + f5, 0.0D, 0.0D, 0.0D); else @@ -81,10 +86,54 @@ public class MachineForceField extends BlockContainer { float f2 = z; float f4 = rand.nextFloat(); float f5 = rand.nextFloat(); - + world.spawnParticle("smoke", f + f4, f1, f2 + f5, 0.0D, 0.0D, 0.0D); } } } + @Override + public void breakBlock(World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, Block p_149749_5_, int p_149749_6_) { + if(!keepInventory) { + ISidedInventory tileentityfurnace = (ISidedInventory) p_149749_1_.getTileEntity(p_149749_2_, p_149749_3_, p_149749_4_); + + if(tileentityfurnace != null) { + for(int i1 = 0; i1 < tileentityfurnace.getSizeInventory(); ++i1) { + ItemStack itemstack = tileentityfurnace.getStackInSlot(i1); + + if(itemstack != null) { + float f = this.field_149933_a.nextFloat() * 0.8F + 0.1F; + float f1 = this.field_149933_a.nextFloat() * 0.8F + 0.1F; + float f2 = this.field_149933_a.nextFloat() * 0.8F + 0.1F; + + while(itemstack.stackSize > 0) { + int j1 = this.field_149933_a.nextInt(21) + 10; + + if(j1 > itemstack.stackSize) { + j1 = itemstack.stackSize; + } + + itemstack.stackSize -= j1; + EntityItem entityitem = new EntityItem(p_149749_1_, p_149749_2_ + f, p_149749_3_ + f1, p_149749_4_ + f2, new ItemStack(itemstack.getItem(), j1, itemstack.getItemDamage())); + + if(itemstack.hasTagCompound()) { + entityitem.getEntityItem().setTagCompound((NBTTagCompound) itemstack.getTagCompound().copy()); + } + + float f3 = 0.05F; + entityitem.motionX = (float) this.field_149933_a.nextGaussian() * f3; + entityitem.motionY = (float) this.field_149933_a.nextGaussian() * f3 + 0.2F; + entityitem.motionZ = (float) this.field_149933_a.nextGaussian() * f3; + p_149749_1_.spawnEntityInWorld(entityitem); + } + } + } + + p_149749_1_.func_147453_f(p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_); + } + } + + super.breakBlock(p_149749_1_, p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_, p_149749_6_); + } + } diff --git a/src/main/java/com/hbm/explosion/ExplosionNukeGeneric.java b/src/main/java/com/hbm/explosion/ExplosionNukeGeneric.java index bad508f24..3462d83a6 100644 --- a/src/main/java/com/hbm/explosion/ExplosionNukeGeneric.java +++ b/src/main/java/com/hbm/explosion/ExplosionNukeGeneric.java @@ -38,7 +38,7 @@ import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.lib.ModDamageSource; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.bomb.TileEntityTurretBase; +import com.hbm.tileentity.turret.TileEntityTurretBase; import com.hbm.util.ArmorUtil; import cofh.api.energy.IEnergyProvider; diff --git a/src/main/java/com/hbm/items/machine/ItemTurretChip.java b/src/main/java/com/hbm/items/machine/ItemTurretChip.java index 9fec4ad8d..481142786 100644 --- a/src/main/java/com/hbm/items/machine/ItemTurretChip.java +++ b/src/main/java/com/hbm/items/machine/ItemTurretChip.java @@ -2,7 +2,7 @@ package com.hbm.items.machine; import java.util.Arrays; import com.hbm.blocks.bomb.TurretBase; -import com.hbm.tileentity.bomb.TileEntityTurretBase; +import com.hbm.tileentity.turret.TileEntityTurretBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/hbm/items/tool/ItemTurretControl.java b/src/main/java/com/hbm/items/tool/ItemTurretControl.java index 84ffeb91d..bc43a016b 100644 --- a/src/main/java/com/hbm/items/tool/ItemTurretControl.java +++ b/src/main/java/com/hbm/items/tool/ItemTurretControl.java @@ -3,8 +3,8 @@ package com.hbm.items.tool; import java.util.List; import com.hbm.blocks.bomb.TurretBase; -import com.hbm.tileentity.bomb.TileEntityTurretBase; -import com.hbm.tileentity.bomb.TileEntityTurretCheapo; +import com.hbm.tileentity.turret.TileEntityTurretBase; +import com.hbm.tileentity.turret.TileEntityTurretCheapo; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/hbm/items/weapon/ItemTurretAmmo.java b/src/main/java/com/hbm/items/weapon/ItemTurretAmmo.java index 325afc01a..1d58cb36b 100644 --- a/src/main/java/com/hbm/items/weapon/ItemTurretAmmo.java +++ b/src/main/java/com/hbm/items/weapon/ItemTurretAmmo.java @@ -1,6 +1,6 @@ package com.hbm.items.weapon; -import com.hbm.tileentity.bomb.TileEntityTurretBase; +import com.hbm.tileentity.turret.TileEntityTurretBase; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index a4eb0ae52..6f1078057 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -50,10 +50,7 @@ import com.hbm.entity.projectile.*; import com.hbm.handler.HbmKeybinds.EnumKeybind; import com.hbm.items.ModItems; import com.hbm.particle.*; -import com.hbm.render.anim.BusAnimation; -import com.hbm.render.anim.BusAnimationKeyframe; -import com.hbm.render.anim.BusAnimationSequence; -import com.hbm.render.anim.HbmAnimations; +import com.hbm.render.anim.*; import com.hbm.render.anim.HbmAnimations.Animation; import com.hbm.render.block.*; import com.hbm.render.entity.*; @@ -74,6 +71,7 @@ import com.hbm.tileentity.bomb.*; import com.hbm.tileentity.conductor.*; import com.hbm.tileentity.deco.*; import com.hbm.tileentity.machine.*; +import com.hbm.tileentity.turret.*; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index 388f8d544..3b9109660 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -72,6 +72,7 @@ import com.hbm.tileentity.conductor.*; import com.hbm.tileentity.deco.*; import com.hbm.tileentity.machine.*; import com.hbm.tileentity.machine.TileEntityMachineReactorLarge.ReactorFuelType; +import com.hbm.tileentity.turret.*; import com.hbm.world.generator.CellularDungeonFactory; import cpw.mods.fml.common.SidedProxy; diff --git a/src/main/java/com/hbm/packet/AuxGaugePacket.java b/src/main/java/com/hbm/packet/AuxGaugePacket.java index d0494ded5..9f165b3ff 100644 --- a/src/main/java/com/hbm/packet/AuxGaugePacket.java +++ b/src/main/java/com/hbm/packet/AuxGaugePacket.java @@ -7,8 +7,6 @@ import com.hbm.tileentity.bomb.TileEntityCompactLauncher; import com.hbm.tileentity.bomb.TileEntityLaunchTable; import com.hbm.tileentity.bomb.TileEntityNukeCustom; import com.hbm.tileentity.bomb.TileEntityNukeN45; -import com.hbm.tileentity.bomb.TileEntityTurretCIWS; -import com.hbm.tileentity.bomb.TileEntityTurretCheapo; import com.hbm.tileentity.deco.TileEntityBomber; import com.hbm.tileentity.machine.TileEntityAMSBase; import com.hbm.tileentity.machine.TileEntityAMSEmitter; @@ -23,6 +21,8 @@ import com.hbm.tileentity.machine.TileEntityMachineElectricFurnace; import com.hbm.tileentity.machine.TileEntityMachineGasCent; import com.hbm.tileentity.machine.TileEntityMachineReactorLarge; import com.hbm.tileentity.machine.TileEntityMachineReactorLarge.ReactorFuelType; +import com.hbm.tileentity.turret.TileEntityTurretCIWS; +import com.hbm.tileentity.turret.TileEntityTurretCheapo; import com.hbm.tileentity.machine.TileEntityMachineReactorSmall; import com.hbm.tileentity.machine.TileEntityMachineSeleniumEngine; import com.hbm.tileentity.machine.TileEntityRadioRec; diff --git a/src/main/java/com/hbm/packet/TETurretPacket.java b/src/main/java/com/hbm/packet/TETurretPacket.java index 346949ae8..a229cbe21 100644 --- a/src/main/java/com/hbm/packet/TETurretPacket.java +++ b/src/main/java/com/hbm/packet/TETurretPacket.java @@ -1,6 +1,7 @@ package com.hbm.packet; -import com.hbm.tileentity.bomb.TileEntityTurretBase; +import com.hbm.tileentity.turret.TileEntityTurretBase; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/com/hbm/render/tileentity/RenderCIWSTurret.java b/src/main/java/com/hbm/render/tileentity/RenderCIWSTurret.java index 59500b978..289eb35e7 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderCIWSTurret.java +++ b/src/main/java/com/hbm/render/tileentity/RenderCIWSTurret.java @@ -3,8 +3,8 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; import com.hbm.main.ResourceManager; -import com.hbm.tileentity.bomb.TileEntityTurretBase; -import com.hbm.tileentity.bomb.TileEntityTurretCIWS; +import com.hbm.tileentity.turret.TileEntityTurretBase; +import com.hbm.tileentity.turret.TileEntityTurretCIWS; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/hbm/render/tileentity/RenderCheapoTurret.java b/src/main/java/com/hbm/render/tileentity/RenderCheapoTurret.java index cd1d29a87..735ddfb24 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderCheapoTurret.java +++ b/src/main/java/com/hbm/render/tileentity/RenderCheapoTurret.java @@ -3,8 +3,8 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; import com.hbm.main.ResourceManager; -import com.hbm.tileentity.bomb.TileEntityTurretBase; -import com.hbm.tileentity.bomb.TileEntityTurretCheapo; +import com.hbm.tileentity.turret.TileEntityTurretBase; +import com.hbm.tileentity.turret.TileEntityTurretCheapo; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/hbm/render/tileentity/RenderFlamerTurret.java b/src/main/java/com/hbm/render/tileentity/RenderFlamerTurret.java index 0839af47a..e30c3b46f 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderFlamerTurret.java +++ b/src/main/java/com/hbm/render/tileentity/RenderFlamerTurret.java @@ -3,7 +3,7 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; import com.hbm.main.ResourceManager; -import com.hbm.tileentity.bomb.TileEntityTurretBase; +import com.hbm.tileentity.turret.TileEntityTurretBase; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/hbm/render/tileentity/RenderHeavyTurret.java b/src/main/java/com/hbm/render/tileentity/RenderHeavyTurret.java index 657c64c96..e88b777c5 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderHeavyTurret.java +++ b/src/main/java/com/hbm/render/tileentity/RenderHeavyTurret.java @@ -3,7 +3,8 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; import com.hbm.main.ResourceManager; -import com.hbm.tileentity.bomb.TileEntityTurretBase; +import com.hbm.tileentity.turret.TileEntityTurretBase; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/hbm/render/tileentity/RenderLightTurret.java b/src/main/java/com/hbm/render/tileentity/RenderLightTurret.java index e0cbf14d9..537e0935c 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderLightTurret.java +++ b/src/main/java/com/hbm/render/tileentity/RenderLightTurret.java @@ -3,7 +3,7 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; import com.hbm.main.ResourceManager; -import com.hbm.tileentity.bomb.TileEntityTurretBase; +import com.hbm.tileentity.turret.TileEntityTurretBase; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/hbm/render/tileentity/RenderRocketTurret.java b/src/main/java/com/hbm/render/tileentity/RenderRocketTurret.java index 8e2194766..ccadd92c0 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderRocketTurret.java +++ b/src/main/java/com/hbm/render/tileentity/RenderRocketTurret.java @@ -3,7 +3,7 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; import com.hbm.main.ResourceManager; -import com.hbm.tileentity.bomb.TileEntityTurretBase; +import com.hbm.tileentity.turret.TileEntityTurretBase; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/hbm/render/tileentity/RenderSpitfireTurret.java b/src/main/java/com/hbm/render/tileentity/RenderSpitfireTurret.java index 249a0bfa9..872ef360f 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderSpitfireTurret.java +++ b/src/main/java/com/hbm/render/tileentity/RenderSpitfireTurret.java @@ -3,7 +3,7 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; import com.hbm.main.ResourceManager; -import com.hbm.tileentity.bomb.TileEntityTurretBase; +import com.hbm.tileentity.turret.TileEntityTurretBase; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/hbm/render/tileentity/RenderTauTurret.java b/src/main/java/com/hbm/render/tileentity/RenderTauTurret.java index 8ea01a286..cb0df7113 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderTauTurret.java +++ b/src/main/java/com/hbm/render/tileentity/RenderTauTurret.java @@ -3,7 +3,7 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; import com.hbm.main.ResourceManager; -import com.hbm.tileentity.bomb.TileEntityTurretBase; +import com.hbm.tileentity.turret.TileEntityTurretBase; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityTurretChekhov.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityTurretChekhov.java deleted file mode 100644 index e62f205fc..000000000 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityTurretChekhov.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.hbm.tileentity.bomb; - -import net.minecraft.tileentity.TileEntity; - -public class TileEntityTurretChekhov extends TileEntity { - -} diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityTurretBase.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBase.java similarity index 99% rename from src/main/java/com/hbm/tileentity/bomb/TileEntityTurretBase.java rename to src/main/java/com/hbm/tileentity/turret/TileEntityTurretBase.java index 728d47a43..e99893b9c 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityTurretBase.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBase.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity.bomb; +package com.hbm.tileentity.turret; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java new file mode 100644 index 000000000..7ec38b00e --- /dev/null +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java @@ -0,0 +1,212 @@ +package com.hbm.tileentity.turret; + +import java.util.List; + +import com.hbm.handler.BulletConfiguration; +import com.hbm.tileentity.TileEntityMachineBase; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.entity.Entity; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.Vec3; + +/** + * More over-engineered than ever, but chopping this thing into the smallest possible pieces makes it easier for my demented brain to comprehend + * @author hbm + * + */ +public abstract class TileEntityTurretBaseNT extends TileEntityMachineBase { + + //what way are we facing? + public double rotationYaw; + public double rotationPitch; + //only used by clients for interpolation + public double lastRotationYaw; + public double lastRotationPitch; + //is the turret on? + public boolean isOn = false; + //is the turret aimed at the target? + public boolean aligned = false; + + public boolean targetPlayers = false; + public boolean targetAnimals = false; + public boolean targetMobs = true; + public boolean targetMachines = true; + + public Entity target; + + //tally marks! + public int stattrak; + + /** + * X + * + * YYY + * YYY + * YYY Z + * + * X -> ai slot (0) + * Y -> ammo slots (1 - 9) + * Z -> battery slot (10) + */ + + public TileEntityTurretBaseNT() { + super(11); + } + + /** + * Reads the namelist from the AI chip in slot 0 + * @return null if there is either no chip to be found or if the name list is empty, otherwise it just reads the strings from the chip's NBT + */ + public List getWhitelist() { + return null; + } + + /** + * Finds the nearest acceptable target within range aand in line of sight + */ + protected void seekNewTarget() { + + } + + /** + * Turns the turret by a specific amount of degrees towards the target + */ + protected void alignTurret() { + + /* TODO */ + + //if the delta is smaller than the angular velocity, just snap directly to the optimal position + //check if the delta exceeds 180 and choose an appropriate shortest turning direction based on that + } + + /** + * Checks line of sight to the passed entity along with whether the angle falls within swivel range + * @return + */ + public boolean entityInLOS(Entity e) { + return false; //TODO: for the love of god don't forget to check the swivel range + } + + /** + * How many degrees the turret can deviate from the target to be acceptable to fire at + * @return + */ + public double getAcceptableInaccuracy() { + return 5; + } + + /** + * How many degrees the turret can rotate per tick (4.5°/t = 90°/s or a half turn in two seconds) + * @return + */ + public double getTurretYawSpeed() { + return 4.5D; + } + + /** + * How many degrees the turret can lift per tick (3°/t = 60°/s or roughly the lowest to the highest point of an average turret in one second) + * @return + */ + public double getTurretPitchSpeed() { + return 3D; + } + + /** + * Makes turrets sad :'( + * @return + */ + public double getTurretDepression() { + return 30D; + } + + /** + * Makes turrets feel privileged + * @return + */ + public double getTurretElevation() { + return 30D; + } + + /** + * How many ticks until a target rescan is required + * @return + */ + public int getDecetorInterval() { + return 20; + } + + /** + * The pivot point of the turret, larger models have a default of 1.5 + * @return + */ + public double getHeightOffset() { + return 1.5D; + } + + /** + * Horizontal offset for the spawn point of bullets + * @return + */ + public double getBarrelLength() { + return 1.0D; + } + + /** + * The pivot point of the turret, this position is used for LOS calculation and more + * @return + */ + public Vec3 getTurretPos() { + //TODO: account for multiblock rotation + return Vec3.createVectorHelper(xCoord, yCoord + getHeightOffset(), zCoord); + } + + /** + * Yes, new turrets fire BulletNTs. + * @return + */ + protected abstract List getAmmoList(); + + /* + * the void + * + * + * more stuff pending: the thing that makes the pew pew + * probably a separate method that consumes or checks ammo + * mayhaps some dangly bits that tie together the GUI with the AI chip's whitelist + */ + + @Override + public void updateEntity() { + + //hinga dinga durgen + + //let's see + + //check power, if it's turned on, all that jazz + + //is there an active enemy? good, aim at it (alignTurret does all that) + + //is the gun aimed? now shøøt + + //check ammo, spawn boolets if present, make empty clicking if not + + //decrement the timer, if the timer runs out, set the timer to the detector interval and choose a new target + + //target choosing time? seekNewTarget does all the work + } + + @Override + public AxisAlignedBB getRenderBoundingBox() { + return TileEntity.INFINITE_EXTENT_AABB; + } + + @Override + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() + { + return 65536.0D; + } +} diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityTurretCIWS.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretCIWS.java similarity index 94% rename from src/main/java/com/hbm/tileentity/bomb/TileEntityTurretCIWS.java rename to src/main/java/com/hbm/tileentity/turret/TileEntityTurretCIWS.java index c2c1e965a..da2ab3722 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityTurretCIWS.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretCIWS.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity.bomb; +package com.hbm.tileentity.turret; import com.hbm.packet.AuxGaugePacket; import com.hbm.packet.PacketDispatcher; diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityTurretCheapo.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretCheapo.java similarity index 94% rename from src/main/java/com/hbm/tileentity/bomb/TileEntityTurretCheapo.java rename to src/main/java/com/hbm/tileentity/turret/TileEntityTurretCheapo.java index 70bd75636..6fc311f09 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityTurretCheapo.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretCheapo.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity.bomb; +package com.hbm.tileentity.turret; import com.hbm.packet.AuxGaugePacket; import com.hbm.packet.PacketDispatcher; diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretChekhov.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretChekhov.java new file mode 100644 index 000000000..cb078dc46 --- /dev/null +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretChekhov.java @@ -0,0 +1,30 @@ +package com.hbm.tileentity.turret; + +import java.util.ArrayList; +import java.util.List; + +import com.hbm.handler.BulletConfiguration; +import com.hbm.handler.guncfg.Gun75BoltFactory; + +public class TileEntityTurretChekhov extends TileEntityTurretBaseNT { + + static List configs = new ArrayList(); + + //because cramming it into the ArrayList's constructor with nested curly brackets and all that turned out to be not as pretty + //also having a floaty `static` like this looks fun + //idk if it's just me though + static { + configs.add(Gun75BoltFactory.get75BoltConfig()); + } + + @Override + protected List getAmmoList() { + return null; + } + + @Override + public String getName() { + return "container.turretChekhov"; + } + +} diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityTurretFlamer.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretFlamer.java similarity index 66% rename from src/main/java/com/hbm/tileentity/bomb/TileEntityTurretFlamer.java rename to src/main/java/com/hbm/tileentity/turret/TileEntityTurretFlamer.java index cbc8f21da..7a1fa934b 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityTurretFlamer.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretFlamer.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity.bomb; +package com.hbm.tileentity.turret; public class TileEntityTurretFlamer extends TileEntityTurretBase { diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityTurretHeavy.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretHeavy.java similarity index 66% rename from src/main/java/com/hbm/tileentity/bomb/TileEntityTurretHeavy.java rename to src/main/java/com/hbm/tileentity/turret/TileEntityTurretHeavy.java index 3627c2b40..762dc86a2 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityTurretHeavy.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretHeavy.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity.bomb; +package com.hbm.tileentity.turret; public class TileEntityTurretHeavy extends TileEntityTurretBase { diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityTurretLight.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretLight.java similarity index 66% rename from src/main/java/com/hbm/tileentity/bomb/TileEntityTurretLight.java rename to src/main/java/com/hbm/tileentity/turret/TileEntityTurretLight.java index 6597f783a..ec9dc93ea 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityTurretLight.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretLight.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity.bomb; +package com.hbm.tileentity.turret; public class TileEntityTurretLight extends TileEntityTurretBase { diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityTurretRocket.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretRocket.java similarity index 66% rename from src/main/java/com/hbm/tileentity/bomb/TileEntityTurretRocket.java rename to src/main/java/com/hbm/tileentity/turret/TileEntityTurretRocket.java index e7fdb51c2..4360ef6b8 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityTurretRocket.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretRocket.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity.bomb; +package com.hbm.tileentity.turret; public class TileEntityTurretRocket extends TileEntityTurretBase { diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityTurretSpitfire.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretSpitfire.java similarity index 67% rename from src/main/java/com/hbm/tileentity/bomb/TileEntityTurretSpitfire.java rename to src/main/java/com/hbm/tileentity/turret/TileEntityTurretSpitfire.java index 5323ff669..59ab1bbfe 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityTurretSpitfire.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretSpitfire.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity.bomb; +package com.hbm.tileentity.turret; public class TileEntityTurretSpitfire extends TileEntityTurretBase { diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityTurretTau.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretTau.java similarity index 66% rename from src/main/java/com/hbm/tileentity/bomb/TileEntityTurretTau.java rename to src/main/java/com/hbm/tileentity/turret/TileEntityTurretTau.java index 0c2c6ecf0..a5c20c16b 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityTurretTau.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretTau.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity.bomb; +package com.hbm.tileentity.turret; public class TileEntityTurretTau extends TileEntityTurretBase {