diff --git a/src/main/java/api/hbm/block/IScrewable.java b/src/main/java/api/hbm/block/IScrewable.java new file mode 100644 index 000000000..16dd8b872 --- /dev/null +++ b/src/main/java/api/hbm/block/IScrewable.java @@ -0,0 +1,9 @@ +package api.hbm.block; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; + +public interface IScrewable { + + public boolean onScrew(World world, EntityPlayer player, int x, int y, int z, int side, float fX, float fY, float fZ); +} diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index db9e4543f..779ddec58 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -625,6 +625,7 @@ public class ModBlocks { public static Block barrel_corroded; public static Block barrel_iron; public static Block barrel_steel; + public static Block barrel_tcalloy; public static Block barrel_antimatter; public static final int guiID_barrel = 92; @@ -1561,6 +1562,7 @@ public class ModBlocks { barrel_corroded = new BlockFluidBarrel(Material.iron, 6000).setBlockName("barrel_corroded").setStepSound(Block.soundTypeMetal).setHardness(2.0F).setResistance(5.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":barrel_corroded"); barrel_iron = new BlockFluidBarrel(Material.iron, 8000).setBlockName("barrel_iron").setStepSound(Block.soundTypeMetal).setHardness(2.0F).setResistance(5.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":barrel_iron"); barrel_steel = new BlockFluidBarrel(Material.iron, 16000).setBlockName("barrel_steel").setStepSound(Block.soundTypeMetal).setHardness(2.0F).setResistance(5.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":barrel_steel"); + barrel_tcalloy = new BlockFluidBarrel(Material.iron, 24000).setBlockName("barrel_tcalloy").setStepSound(Block.soundTypeMetal).setHardness(2.0F).setResistance(5.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":barrel_tcalloy"); barrel_antimatter = new BlockFluidBarrel(Material.iron, 16000).setBlockName("barrel_antimatter").setStepSound(Block.soundTypeMetal).setHardness(2.0F).setResistance(5.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":barrel_antimatter"); machine_transformer = new MachineTransformer(Material.iron, 10000L, 1).setBlockName("machine_transformer").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_transformer_iron"); @@ -2470,6 +2472,7 @@ public class ModBlocks { GameRegistry.registerBlock(barrel_corroded, ItemBlockLore.class, barrel_corroded.getUnlocalizedName()); GameRegistry.registerBlock(barrel_iron, ItemBlockLore.class, barrel_iron.getUnlocalizedName()); GameRegistry.registerBlock(barrel_steel, ItemBlockLore.class, barrel_steel.getUnlocalizedName()); + GameRegistry.registerBlock(barrel_tcalloy, ItemBlockLore.class, barrel_tcalloy.getUnlocalizedName()); GameRegistry.registerBlock(barrel_antimatter, ItemBlockLore.class, barrel_antimatter.getUnlocalizedName()); GameRegistry.registerBlock(machine_battery_potato, machine_battery_potato.getUnlocalizedName()); GameRegistry.registerBlock(machine_battery, machine_battery.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/blocks/machine/BlockFluidBarrel.java b/src/main/java/com/hbm/blocks/machine/BlockFluidBarrel.java index a6b12b070..dd1d2511e 100644 --- a/src/main/java/com/hbm/blocks/machine/BlockFluidBarrel.java +++ b/src/main/java/com/hbm/blocks/machine/BlockFluidBarrel.java @@ -3,7 +3,6 @@ package com.hbm.blocks.machine; import java.util.Random; import com.hbm.blocks.ModBlocks; -import com.hbm.interfaces.Spaghetti; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityBarrel; @@ -66,74 +65,64 @@ public class BlockFluidBarrel extends BlockContainer { return false; } } - + @Override - public void setBlockBoundsBasedOnState(IBlockAccess p_149719_1_, int p_149719_2_, int p_149719_3_, int p_149719_4_) - { - float f = 0.0625F; - this.setBlockBounds(2*f, 0.0F, 2*f, 14*f, 1.0F, 14*f); - } - + public void setBlockBoundsBasedOnState(IBlockAccess p_149719_1_, int p_149719_2_, int p_149719_3_, int p_149719_4_) { + float f = 0.0625F; + this.setBlockBounds(2 * f, 0.0F, 2 * f, 14 * f, 1.0F, 14 * f); + } + @Override public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { - float f = 0.0625F; - this.setBlockBounds(2*f, 0.0F, 2*f, 14*f, 1.0F, 14*f); + float f = 0.0625F; + this.setBlockBounds(2 * f, 0.0F, 2 * f, 14 * f, 1.0F, 14 * f); return AxisAlignedBB.getBoundingBox(x + this.minX, y + this.minY, z + this.minZ, x + this.maxX, y + this.maxY, z + this.maxZ); } - private final Random field_149933_a = new Random(); + private final Random field_149933_a = new Random(); public static boolean keepInventory; - + @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_); + 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(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; + 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; + while(itemstack.stackSize > 0) { + int j1 = this.field_149933_a.nextInt(21) + 10; - if (j1 > itemstack.stackSize) - { - j1 = itemstack.stackSize; - } + 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())); + 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()); - } + 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); - } - } - } + 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_); - } + 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/blocks/machine/BlockHadronDiode.java b/src/main/java/com/hbm/blocks/machine/BlockHadronDiode.java index 811ed41fe..65504bbb9 100644 --- a/src/main/java/com/hbm/blocks/machine/BlockHadronDiode.java +++ b/src/main/java/com/hbm/blocks/machine/BlockHadronDiode.java @@ -5,6 +5,7 @@ import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityHadronDiode; import com.hbm.tileentity.machine.TileEntityHadronDiode.DiodeConfig; +import api.hbm.block.IScrewable; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.BlockContainer; @@ -16,8 +17,8 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -public class BlockHadronDiode extends BlockContainer { - +public class BlockHadronDiode extends BlockContainer implements IScrewable { + @SideOnly(Side.CLIENT) private IIcon iconIn; @SideOnly(Side.CLIENT) @@ -31,7 +32,7 @@ public class BlockHadronDiode extends BlockContainer { public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { return new TileEntityHadronDiode(); } - + @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconRegister) { @@ -40,13 +41,13 @@ public class BlockHadronDiode extends BlockContainer { this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":hadron_diode"); } - @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { - + @SideOnly(Side.CLIENT) + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { + TileEntityHadronDiode diode = (TileEntityHadronDiode) world.getTileEntity(x, y, z); - + DiodeConfig conf = diode.getConfig(side); - + switch(conf) { case NONE: return blockIcon; @@ -56,25 +57,21 @@ public class BlockHadronDiode extends BlockContainer { default: return iconOut; } - } + } - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float fx, float fy, float fz) { - - if(player.getHeldItem() != null && player.getHeldItem().getItem() == ModItems.screwdriver) { - - if(!world.isRemote) { - TileEntityHadronDiode diode = (TileEntityHadronDiode) world.getTileEntity(x, y, z); - int config = diode.getConfig(side).ordinal(); - config += 1; - config %= DiodeConfig.values().length; - diode.setConfig(side, config); - } - - world.markBlockForUpdate(x, y, z); - - return true; - } else { - return false; - } - } + @Override + public boolean onScrew(World world, EntityPlayer player, int x, int y, int z, int side, float fX, float fY, float fZ) { + + if(!world.isRemote) { + TileEntityHadronDiode diode = (TileEntityHadronDiode) world.getTileEntity(x, y, z); + int config = diode.getConfig(side).ordinal(); + config += 1; + config %= DiodeConfig.values().length; + diode.setConfig(side, config); + } + + world.markBlockForUpdate(x, y, z); + + return true; + } } diff --git a/src/main/java/com/hbm/blocks/machine/MachineChungus.java b/src/main/java/com/hbm/blocks/machine/MachineChungus.java index aa912bfad..0d45d9d0c 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineChungus.java +++ b/src/main/java/com/hbm/blocks/machine/MachineChungus.java @@ -1,12 +1,16 @@ package com.hbm.blocks.machine; import com.hbm.blocks.BlockDummyable; +import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.MultiblockHandlerXR; import com.hbm.tileentity.TileEntityProxyCombo; import com.hbm.tileentity.machine.TileEntityChungus; import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; public class MachineChungus extends BlockDummyable { @@ -25,15 +29,107 @@ public class MachineChungus extends BlockDummyable { return null; } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { + + if(!player.isSneaking()) { + + int[] pos = this.findCore(world, x, y, z); + + if(pos == null) + return true; + + TileEntityChungus entity = (TileEntityChungus) world.getTileEntity(pos[0], pos[1], pos[2]); + if(entity != null) { + + ForgeDirection dir = ForgeDirection.getOrientation(entity.getBlockMetadata() - this.offset); + ForgeDirection turn = dir.getRotation(ForgeDirection.DOWN); + + int iX = entity.xCoord + dir.offsetX + turn.offsetX * 2; + int iX2 = entity.xCoord + dir.offsetX * 2 + turn.offsetX * 2; + int iZ = entity.zCoord + dir.offsetZ + turn.offsetZ * 2; + int iZ2 = entity.zCoord + dir.offsetZ * 2 + turn.offsetZ * 2; + + if((x == iX || x == iX2) && (z == iZ || z == iZ2) && y < entity.yCoord + 2) { + world.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, "hbm:block.chungusLever", 1.5F, 1.0F); + + if(!world.isRemote) { + switch(entity.tanks[0].getTankType()) { + case STEAM: + entity.tanks[0].setTankType(FluidType.HOTSTEAM); + entity.tanks[1].setTankType(FluidType.STEAM); + entity.tanks[0].setFill(entity.tanks[0].getFill() / 10); + entity.tanks[1].setFill(0); + break; + + case HOTSTEAM: + entity.tanks[0].setTankType(FluidType.SUPERHOTSTEAM); + entity.tanks[1].setTankType(FluidType.HOTSTEAM); + entity.tanks[0].setFill(entity.tanks[0].getFill() / 10); + entity.tanks[1].setFill(0); + break; + + case SUPERHOTSTEAM: + entity.tanks[0].setTankType(FluidType.ULTRAHOTSTEAM); + entity.tanks[1].setTankType(FluidType.SUPERHOTSTEAM); + entity.tanks[0].setFill(entity.tanks[0].getFill() / 10); + entity.tanks[1].setFill(0); + break; + + default: + case ULTRAHOTSTEAM: + entity.tanks[0].setTankType(FluidType.STEAM); + entity.tanks[1].setTankType(FluidType.WATER); + entity.tanks[0].setFill(Math.min(entity.tanks[0].getFill() * 1000, entity.tanks[0].getMaxFill())); + entity.tanks[1].setFill(0); + break; + } + + entity.markDirty(); + } + + return true; + } + } + } + + return false; + } @Override public int[] getDimensions() { - return new int[] { 3, 0, 10, 4, 2, 2 }; + return new int[] { 3, 0, 0, 3, 2, 2 }; } @Override public int getOffset() { - return 4; + return 3; } + @Override + public void fillSpace(World world, int x, int y, int z, ForgeDirection dir, int o) { + super.fillSpace(world, x, y, z, dir, o); + MultiblockHandlerXR.fillSpace(world, x + dir.offsetX * o , y + dir.offsetY * o, z + dir.offsetZ * o, new int[] {4, -4, 0, 3, 1, 1}, this, dir); + MultiblockHandlerXR.fillSpace(world, x + dir.offsetX * o , y + dir.offsetY * o, z + dir.offsetZ * o, new int[] {3, 0, 6, -1, 1, 1}, this, dir); + MultiblockHandlerXR.fillSpace(world, x + dir.offsetX * o , y + dir.offsetY * o, z + dir.offsetZ * o, new int[] {2, 0, 10, -7, 1, 1}, this, dir); + world.setBlock(x + dir.offsetX, y + 2, z + dir.offsetZ, this, dir.ordinal(), 3); + + this.makeExtra(world, x + dir.offsetX, y + 2, z + dir.offsetZ); + this.makeExtra(world, x + dir.offsetX * (o - 10), y, z + dir.offsetZ * (o - 10)); + ForgeDirection side = dir.getRotation(ForgeDirection.UP); + this.makeExtra(world, x + dir.offsetX * o + side.offsetX * 2 , y, z + dir.offsetZ * o + side.offsetZ * 2); + this.makeExtra(world, x + dir.offsetX * o - side.offsetX * 2 , y, z + dir.offsetZ * o - side.offsetZ * 2); + } + + @Override + protected boolean checkRequirement(World world, int x, int y, int z, ForgeDirection dir, int o) { + + if(!MultiblockHandlerXR.checkSpace(world, x + dir.offsetX * o , y + dir.offsetY * o, z + dir.offsetZ * o, getDimensions(), x, y, z, dir)) return false; + if(!MultiblockHandlerXR.checkSpace(world, x + dir.offsetX * o , y + dir.offsetY * o, z + dir.offsetZ * o, new int[] {3, 0, 6, -1, 1, 1}, x, y, z, dir)) return false; + if(!MultiblockHandlerXR.checkSpace(world, x + dir.offsetX * o , y + dir.offsetY * o, z + dir.offsetZ * o, new int[] {2, 0, 10, -7, 1, 1}, x, y, z, dir)) return false; + if(!world.getBlock(x + dir.offsetX, y + 2, z + dir.offsetZ).canPlaceBlockAt(world, x + dir.offsetX, y + 2, z + dir.offsetZ)) return false; + + return true; + } } diff --git a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKBase.java b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKBase.java index 9d1b768bf..df749a2b6 100644 --- a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKBase.java +++ b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKBase.java @@ -8,6 +8,7 @@ import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.rbmk.RBMKDials; import com.hbm.tileentity.machine.rbmk.TileEntityRBMKBase; +import api.hbm.block.IScrewable; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.Block; @@ -20,7 +21,9 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public abstract class RBMKBase extends BlockDummyable { +public abstract class RBMKBase extends BlockDummyable implements IScrewable { + + public static boolean dropLids = true; protected RBMKBase() { super(Material.iron); @@ -63,7 +66,6 @@ public abstract class RBMKBase extends BlockDummyable { } if(!player.isSneaking()) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, gui, world, pos[0], pos[1], pos[2]); return true; } else { @@ -123,7 +125,7 @@ public abstract class RBMKBase extends BlockDummyable { @Override public void breakBlock(World world, int x, int y, int z, Block b, int i) { - if(!world.isRemote) { + if(!world.isRemote && dropLids) { if(i == DIR_NORMAL_LID.ordinal() + offset) { world.spawnEntityInWorld(new EntityItem(world, x + 0.5, y + 0.5 + RBMKDials.getColumnHeight(world), z + 0.5, new ItemStack(ModItems.rbmk_lid))); @@ -135,6 +137,40 @@ public abstract class RBMKBase extends BlockDummyable { super.breakBlock(world, x, y, z, b, i); } + + @Override + public boolean onScrew(World world, EntityPlayer player, int x, int y, int z, int side, float fX, float fY, float fZ) { + + int[] pos = this.findCore(world, x, y, z); + + if(pos != null) { + TileEntity te = world.getTileEntity(pos[0], pos[1], pos[2]); + + if(te instanceof TileEntityRBMKBase) { + + TileEntityRBMKBase rbmk = (TileEntityRBMKBase) te; + int i = rbmk.getBlockMetadata(); + + if(rbmk.hasLid() && rbmk.isLidRemovable()) { + + if(!world.isRemote) { + if(i == DIR_NORMAL_LID.ordinal() + offset) { + world.spawnEntityInWorld(new EntityItem(world, pos[0] + 0.5, pos[1] + 0.5 + RBMKDials.getColumnHeight(world), pos[2] + 0.5, new ItemStack(ModItems.rbmk_lid))); + } + if(i == DIR_GLASS_LID.ordinal() + offset) { + world.spawnEntityInWorld(new EntityItem(world, pos[0] + 0.5, pos[1] + 0.5 + RBMKDials.getColumnHeight(world), pos[2] + 0.5, new ItemStack(ModItems.rbmk_lid_glass))); + } + + world.setBlockMetadataWithNotify(pos[0], pos[1], pos[2], DIR_NO_LID.ordinal() + this.offset, 3); + } + + return true; + } + } + } + + return false; + } public static int renderIDRods = RenderingRegistry.getNextAvailableRenderId(); public static int renderIDPassive = RenderingRegistry.getNextAvailableRenderId(); diff --git a/src/main/java/com/hbm/crafting/ConsumableRecipes.java b/src/main/java/com/hbm/crafting/ConsumableRecipes.java index d4330e79d..7ffee955b 100644 --- a/src/main/java/com/hbm/crafting/ConsumableRecipes.java +++ b/src/main/java/com/hbm/crafting/ConsumableRecipes.java @@ -170,6 +170,8 @@ public class ConsumableRecipes { GameRegistry.addRecipe(new ItemStack(ModItems.bathwater_mk2, 1), new Object[] { "MWM", "WBW", "MWM", 'M', ModItems.bottle_mercury, 'W', ModItems.nuclear_waste, 'B', ModItems.bathwater }); GameRegistry.addRecipe(new ItemStack(ModItems.back_tesla, 1), new Object[] { "DGD", "GTG", "DGD", 'D', ModItems.ducttape, 'G', ModItems.wire_gold, 'T', ModBlocks.tesla }); GameRegistry.addRecipe(new ItemStack(ModItems.medal_liquidator, 1), new Object[] { "GBG", "BFB", "GBG", 'G', ModItems.nugget_au198, 'B', ModItems.ingot_boron, 'F', ModItems.debris_fuel }); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.injector_5htp, 1), new Object[] { ModItems.five_htp, ModItems.circuit_targeting_tier1, ModItems.plate_saturnite }); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.injector_knife, 1), new Object[] { ModItems.injector_5htp, Items.iron_sword }); //Stealth boy GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.stealth_boy, 1), new Object[] { " B", "LI", "LC", 'B', Item.getItemFromBlock(Blocks.stone_button), 'L', Items.leather, 'I', "ingotSteel", 'C', ModItems.circuit_red_copper })); diff --git a/src/main/java/com/hbm/crafting/MineralRecipes.java b/src/main/java/com/hbm/crafting/MineralRecipes.java index 275e681ce..ea664bd8d 100644 --- a/src/main/java/com/hbm/crafting/MineralRecipes.java +++ b/src/main/java/com/hbm/crafting/MineralRecipes.java @@ -101,6 +101,7 @@ public class MineralRecipes { RecipesCommon.addBillet(ModItems.billet_pu238, ModItems.nugget_pu238, "nuggetPlutonium238", "tinyPu238"); RecipesCommon.addBillet(ModItems.billet_pu239, ModItems.nugget_pu239, "nuggetPlutonium239", "tinyPu239"); RecipesCommon.addBillet(ModItems.billet_pu240, ModItems.nugget_pu240, "nuggetPlutonium240", "tinyPu240"); + RecipesCommon.addBillet(ModItems.billet_pu241, ModItems.nugget_pu241, "nuggetPlutonium241", "tinyPu241"); RecipesCommon.addBillet(ModItems.billet_pu_mix, ModItems.nugget_pu_mix); RecipesCommon.addBillet(ModItems.billet_neptunium, ModItems.nugget_neptunium, "nuggetNeptunium237", "tinyNp237"); RecipesCommon.addBillet(ModItems.billet_polonium, ModItems.nugget_polonium, "nuggetPolonium"); @@ -164,6 +165,7 @@ public class MineralRecipes { GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg), new Object[] { ModItems.billet_pu238, ModItems.billet_pu238, ModItems.billet_pu238, "plateIron" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_weak), new Object[] { ModItems.billet_u238, ModItems.billet_u238, ModItems.billet_pu238, "plateIron" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_polonium), new Object[] { ModItems.billet_polonium, ModItems.billet_polonium, ModItems.billet_polonium, "plateIron" })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_gold), new Object[] { ModItems.billet_au198, ModItems.billet_au198, ModItems.billet_au198, "plateIron" })); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_copper), 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_copper }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_fluorite), 1), new Object[] { "###", "###", "###", '#', ModItems.fluorite }); diff --git a/src/main/java/com/hbm/crafting/PowderRecipes.java b/src/main/java/com/hbm/crafting/PowderRecipes.java index b0ee2100d..e90afb923 100644 --- a/src/main/java/com/hbm/crafting/PowderRecipes.java +++ b/src/main/java/com/hbm/crafting/PowderRecipes.java @@ -43,6 +43,7 @@ public class PowderRecipes { GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_advanced_alloy, 3), new Object[] { "dustRedstone", "dustSteel", "dustCopper" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_advanced_alloy, 2), new Object[] { "dustRedCopperAlloy", "dustSteel" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_magnetized_tungsten, 1), new Object[] { "dustTungsten", "nuggetSchrabidium" })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_tcalloy, 1), new Object[] { "dustSteel", "nuggetTechnetium99" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_red_copper, 2), new Object[] { "dustRedstone", "dustCopper" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_steel, 2), new Object[] { "dustIron", "dustCoal" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_dura_steel, 2), new Object[] { "dustSteel", "dustTungsten" })); diff --git a/src/main/java/com/hbm/crafting/RodRecipes.java b/src/main/java/com/hbm/crafting/RodRecipes.java index 2abf50e1d..51fe32723 100644 --- a/src/main/java/com/hbm/crafting/RodRecipes.java +++ b/src/main/java/com/hbm/crafting/RodRecipes.java @@ -163,6 +163,8 @@ public class RodRecipes { RecipesCommon.addRBMKRod(ModItems.billet_thorium_fuel, ModItems.rbmk_fuel_thmeu); RecipesCommon.addRBMKRod(ModItems.billet_plutonium_fuel, ModItems.rbmk_fuel_lep); RecipesCommon.addRBMKRod(ModItems.billet_pu_mix, ModItems.rbmk_fuel_mep); + RecipesCommon.addRBMKRod(ModItems.billet_pu239, ModItems.rbmk_fuel_hep); + RecipesCommon.addRBMKRod(ModItems.billet_pu241, ModItems.rbmk_fuel_hep241); RecipesCommon.addRBMKRod(ModItems.billet_neptunium_fuel, ModItems.rbmk_fuel_men); RecipesCommon.addRBMKRod(ModItems.billet_po210be, ModItems.rbmk_fuel_po210be); RecipesCommon.addRBMKRod(ModItems.billet_pu238be, ModItems.rbmk_fuel_pu238be); diff --git a/src/main/java/com/hbm/handler/EntityEffectHandler.java b/src/main/java/com/hbm/handler/EntityEffectHandler.java index f382bc011..ab98d2e67 100644 --- a/src/main/java/com/hbm/handler/EntityEffectHandler.java +++ b/src/main/java/com/hbm/handler/EntityEffectHandler.java @@ -134,7 +134,7 @@ public class EntityEffectHandler { float digamma = HbmLivingProps.getDigamma(entity); - if(digamma == 0) + if(digamma < 0.01F) return; int chance = Math.max(10 - (int)(digamma), 1); diff --git a/src/main/java/com/hbm/handler/FluidTypeHandler.java b/src/main/java/com/hbm/handler/FluidTypeHandler.java index d467b3c88..d61e78701 100644 --- a/src/main/java/com/hbm/handler/FluidTypeHandler.java +++ b/src/main/java/com/hbm/handler/FluidTypeHandler.java @@ -1,28 +1,38 @@ package com.hbm.handler; +import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; +import java.util.List; import com.hbm.render.util.EnumSymbol; public class FluidTypeHandler { - public enum FluidType { + public static enum FluidTrait { + AMAT, + CORROSIVE, + CORROSIVE_2, + NO_CONTAINER; + } + + public static enum FluidType { NONE (0x888888, 0, 1, 1, 0, 0, 0, EnumSymbol.NONE, "hbmfluid.none"), WATER (0x3333FF, 1, 1, 1, 0, 0, 0, EnumSymbol.NONE, "hbmfluid.water"), - STEAM (0xe5e5e5, 9, 2, 1, 3, 0, 0, EnumSymbol.NONE, "hbmfluid.steam", true, false, false, 100), - HOTSTEAM (0xE7D6D6, 1, 1, 2, 4, 0, 0, EnumSymbol.NONE, "hbmfluid.hotsteam", true, false, false, 300), - SUPERHOTSTEAM (0xE7B7B7, 2, 1, 2, 4, 0, 0, EnumSymbol.NONE, "hbmfluid.superhotsteam", true, false, false, 450), - ULTRAHOTSTEAM (0xE39393, 13, 1, 2, 4, 0, 0, EnumSymbol.NONE, "hbmfluid.ultrahotsteam", true, false, false, 600), + STEAM (0xe5e5e5, 9, 2, 1, 3, 0, 0, EnumSymbol.NONE, "hbmfluid.steam", 100), + HOTSTEAM (0xE7D6D6, 1, 1, 2, 4, 0, 0, EnumSymbol.NONE, "hbmfluid.hotsteam", 300), + SUPERHOTSTEAM (0xE7B7B7, 2, 1, 2, 4, 0, 0, EnumSymbol.NONE, "hbmfluid.superhotsteam", 450), + ULTRAHOTSTEAM (0xE39393, 13, 1, 2, 4, 0, 0, EnumSymbol.NONE, "hbmfluid.ultrahotsteam", 600), COOLANT (0xd8fcff, 2, 1, 1, 1, 0, 0, EnumSymbol.NONE, "hbmfluid.coolant"), - LAVA (0xFF3300, 3, 1, 1, 4, 0, 0, EnumSymbol.NOWATER, "hbmfluid.lava", true, false, false, 1200), + LAVA (0xFF3300, 3, 1, 1, 4, 0, 0, EnumSymbol.NOWATER, "hbmfluid.lava", 1200), DEUTERIUM (0x0000FF, 4, 1, 1, 3, 4, 0, EnumSymbol.NONE, "hbmfluid.deuterium"), TRITIUM (0x000099, 5, 1, 1, 3, 4, 0, EnumSymbol.RADIATION, "hbmfluid.tritium"), OIL (0x020202, 6, 1, 1, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.oil"), - HOTOIL (0x300900, 8, 2, 1, 2, 3, 0, EnumSymbol.NONE, "hbmfluid.hotoil", true, false, false, 350), + HOTOIL (0x300900, 8, 2, 1, 2, 3, 0, EnumSymbol.NONE, "hbmfluid.hotoil", 350), HEAVYOIL (0x141312, 2, 2, 1, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.heavyoil"), BITUMEN (0x1f2426, 3, 2, 1, 2, 0, 0, EnumSymbol.NONE, "hbmfluid.bitumen"), @@ -48,30 +58,30 @@ public class FluidTypeHandler { NITAN (0x8018ad, 15, 2, 1, 2, 4, 1, EnumSymbol.NONE, "hbmfluid.nitan"), - UF6 (0xD1CEBE, 14, 1, 1, 4, 0, 2, EnumSymbol.RADIATION, "hbmfluid.uf6", false, true, false), - PUF6 (0x4C4C4C, 15, 1, 1, 4, 0, 4, EnumSymbol.RADIATION, "hbmfluid.puf6", false, true, false), - SAS3 (0x4ffffc, 14, 2, 1, 5, 0, 4, EnumSymbol.RADIATION, "hbmfluid.sas3", false, true, false), - SCHRABIDIC (0x006B6B, 14, 1, 2, 5, 0, 5, EnumSymbol.ACID, "hbmfluid.schrabidic", false, true, false), + UF6 (0xD1CEBE, 14, 1, 1, 4, 0, 2, EnumSymbol.RADIATION, "hbmfluid.uf6", FluidTrait.CORROSIVE), + PUF6 (0x4C4C4C, 15, 1, 1, 4, 0, 4, EnumSymbol.RADIATION, "hbmfluid.puf6", FluidTrait.CORROSIVE), + SAS3 (0x4ffffc, 14, 2, 1, 5, 0, 4, EnumSymbol.RADIATION, "hbmfluid.sas3", FluidTrait.CORROSIVE), + SCHRABIDIC (0x006B6B, 14, 1, 2, 5, 0, 5, EnumSymbol.ACID, "hbmfluid.schrabidic", FluidTrait.CORROSIVE_2), - AMAT (0x010101, 0, 2, 1, 5, 0, 5, EnumSymbol.ANTIMATTER, "hbmfluid.amat", false, false, true), - ASCHRAB (0xb50000, 1, 2, 1, 5, 0, 5, EnumSymbol.ANTIMATTER, "hbmfluid.aschrab", false, false, true), + AMAT (0x010101, 0, 2, 1, 5, 0, 5, EnumSymbol.ANTIMATTER, "hbmfluid.amat", FluidTrait.AMAT), + ASCHRAB (0xb50000, 1, 2, 1, 5, 0, 5, EnumSymbol.ANTIMATTER, "hbmfluid.aschrab", FluidTrait.AMAT), - ACID (0xfff7aa, 10, 2, 1, 3, 0, 3, EnumSymbol.OXIDIZER, "hbmfluid.acid", false, true, false), - WATZ (0x86653E, 11, 2, 1, 4, 0, 3, EnumSymbol.ACID, "hbmfluid.watz", false, true, false), - CRYOGEL (0x32ffff, 0, 1, 2, 2, 0, 0, EnumSymbol.CROYGENIC, "hbmfluid.cryogel", false, false, false, -170), + ACID (0xfff7aa, 10, 2, 1, 3, 0, 3, EnumSymbol.OXIDIZER, "hbmfluid.acid", FluidTrait.CORROSIVE), + WATZ (0x86653E, 11, 2, 1, 4, 0, 3, EnumSymbol.ACID, "hbmfluid.watz", FluidTrait.CORROSIVE_2), + CRYOGEL (0x32ffff, 0, 1, 2, 2, 0, 0, EnumSymbol.CROYGENIC, "hbmfluid.cryogel", -170), HYDROGEN (0x4286f4, 3, 1, 2, 3, 4, 0, EnumSymbol.CROYGENIC, "hbmfluid.hydrogen"), OXYGEN (0x98bdf9, 4, 1, 2, 3, 0, 0, EnumSymbol.CROYGENIC, "hbmfluid.oxygen"), XENON (0xba45e8, 5, 1, 2, 0, 0, 0, EnumSymbol.ASPHYXIANT, "hbmfluid.xenon"), - BALEFIRE (0x28e02e, 6, 1, 2, 4, 4, 3, EnumSymbol.RADIATION, "hbmfluid.balefire", true, true, false, 1500), + BALEFIRE (0x28e02e, 6, 1, 2, 4, 4, 3, EnumSymbol.RADIATION, "hbmfluid.balefire", 1500, FluidTrait.CORROSIVE), MERCURY (0x808080, 7, 1, 2, 2, 0, 0, EnumSymbol.NONE, "hbmfluid.mercury"), - PLASMA_DT (0xF7AFDE, 8, 1, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_dt", true, false, true, 3250), - PLASMA_HD (0xF0ADF4, 9, 1, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_hd", true, false, true, 2500), - PLASMA_HT (0xD1ABF2, 10, 1, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_ht", true, false, true, 3000), - PLASMA_XM (0xC6A5FF, 11, 1, 2, 0, 4, 1, EnumSymbol.RADIATION, "hbmfluid.plasma_xm", true, false, true, 4250), - PLASMA_BF (0xA7F1A3, 12, 1, 2, 4, 5, 4, EnumSymbol.ANTIMATTER, "hbmfluid.plasma_bf", true, false, true, 8500); + PLASMA_DT (0xF7AFDE, 8, 1, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_dt", 3250, FluidTrait.NO_CONTAINER), + PLASMA_HD (0xF0ADF4, 9, 1, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_hd", 2500, FluidTrait.NO_CONTAINER), + PLASMA_HT (0xD1ABF2, 10, 1, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_ht", 3000, FluidTrait.NO_CONTAINER), + PLASMA_XM (0xC6A5FF, 11, 1, 2, 0, 4, 1, EnumSymbol.RADIATION, "hbmfluid.plasma_xm", 4250, FluidTrait.NO_CONTAINER), + PLASMA_BF (0xA7F1A3, 12, 1, 2, 4, 5, 4, EnumSymbol.ANTIMATTER, "hbmfluid.plasma_bf", 8500, FluidTrait.NO_CONTAINER); //Approximate HEX Color of the fluid, used for pipe rendering @@ -85,19 +95,32 @@ public class FluidTypeHandler { //Unlocalized string ID of the fluid private String name; //Whether the fluid counts is too hot for certain tanks - private boolean hot; + //private boolean hot; //Whether the fluid counts as corrosive and requires a steel tank - private boolean corrosive; + //private boolean corrosive; //Whether the fluid is antimatter and requires magnetic storage - private boolean antimatter; + //private boolean antimatter; public int poison; public int flammability; public int reactivity; public EnumSymbol symbol; public int temperature; + public List traits = new ArrayList(); private FluidType(int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name) { + this(color, x, y, sheet, p, f, r, symbol, name, 0, new FluidTrait[0]); + } + + private FluidType(int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name, FluidTrait... traits) { + this(color, x, y, sheet, p, f, r, symbol, name, 0, traits); + } + + private FluidType(int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name, int temperature) { + this(color, x, y, sheet, p, f, r, symbol, name, temperature, new FluidTrait[0]); + } + + private FluidType(int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name, int temperature, FluidTrait... traits) { this.color = color; this.textureX = x; this.textureY = y; @@ -107,28 +130,8 @@ public class FluidTypeHandler { this.flammability = f; this.reactivity = r; this.symbol = symbol; - this.temperature = 0; - } - - private FluidType(int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name, boolean hot, boolean corrosive, boolean antimatter) { - this.color = color; - this.textureX = x; - this.textureY = y; - this.name = name; - this.sheetID = sheet; - this.poison = p; - this.flammability = f; - this.reactivity = r; - this.symbol = symbol; - this.hot = hot; - this.corrosive = corrosive; - this.antimatter = antimatter; - this.temperature = 0; - } - - private FluidType(int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name, boolean hot, boolean corrosive, boolean antimatter, int temperature) { - this(color, x, y, sheet, p, f, r, symbol, name, hot, corrosive, antimatter); this.temperature = temperature; + Collections.addAll(this.traits, traits); } public int getColor() { @@ -175,18 +178,19 @@ public class FluidTypeHandler { } public boolean isHot() { - return hot; + return this.temperature >= 100; } public boolean isCorrosive() { - return corrosive; + return this.traits.contains(FluidTrait.CORROSIVE) || this.traits.contains(FluidTrait.CORROSIVE_2); } public boolean isAntimatter() { - return antimatter; + return this.traits.contains(FluidTrait.AMAT); + } + + public boolean hasNoContainer() { + return this.traits.contains(FluidTrait.NO_CONTAINER); } }; - - //More stuff to follow. - } diff --git a/src/main/java/com/hbm/inventory/AssemblerRecipes.java b/src/main/java/com/hbm/inventory/AssemblerRecipes.java index 4e2e847bc..34fc71384 100644 --- a/src/main/java/com/hbm/inventory/AssemblerRecipes.java +++ b/src/main/java/com/hbm/inventory/AssemblerRecipes.java @@ -468,12 +468,23 @@ public class AssemblerRecipes { new ComparableStack(ModItems.hull_big_steel, 1), new OreDictStack("plateSteel", 12), new ComparableStack(ModItems.turbine_titanium, 3), - new ComparableStack(ModItems.rotor_steel, 2), - new ComparableStack(ModItems.generator_steel, 2), + new ComparableStack(ModItems.generator_steel, 1), new ComparableStack(ModItems.bolt_compound, 3), new ComparableStack(ModItems.pipes_steel, 1), new ComparableStack(ModItems.circuit_aluminium, 1), }, 20); + makeRecipe(new ComparableStack(ModBlocks.machine_chungus, 1), new AStack[] { + new ComparableStack(ModItems.hull_big_steel, 6), + new OreDictStack("plateSteel", 32), + new OreDictStack("plateTitanium", 12), + new ComparableStack(ModItems.ingot_tcalloy, 16), + new ComparableStack(ModItems.turbine_tungsten, 5), + new ComparableStack(ModItems.turbine_titanium, 3), + new ComparableStack(ModItems.flywheel_beryllium, 1), + new ComparableStack(ModItems.generator_steel, 10), + new ComparableStack(ModItems.bolt_compound, 16), + new ComparableStack(ModItems.pipes_steel, 3) + }, 600); makeRecipe(new ComparableStack(ModItems.pellet_chlorophyte, 2), new AStack[] { new ComparableStack(ModItems.powder_chlorophyte, 1), @@ -737,7 +748,7 @@ public class AssemblerRecipes { hidden.put(new ComparableStack(ModItems.missile_soyuz_lander, 1), new HashSet() {{ add(ModItems.journal_bj); }}); } - private static void makeRecipe(ComparableStack out, AStack[] in, int duration) { + public static void makeRecipe(ComparableStack out, AStack[] in, int duration) { if(out == null || Item.itemRegistry.getNameForObject(out.item) == null) { MainRegistry.logger.error("Canceling assembler registration, item was null!"); diff --git a/src/main/java/com/hbm/inventory/CentrifugeRecipes.java b/src/main/java/com/hbm/inventory/CentrifugeRecipes.java index 71b146a5b..9c962dcd5 100644 --- a/src/main/java/com/hbm/inventory/CentrifugeRecipes.java +++ b/src/main/java/com/hbm/inventory/CentrifugeRecipes.java @@ -21,9 +21,9 @@ public class CentrifugeRecipes { public static void register() { recipes.put(new ComparableStack(ModItems.waste_uranium), new ItemStack[] { - new ItemStack(ModItems.nugget_u235, 1), new ItemStack(ModItems.nugget_u238, 1), new ItemStack(ModItems.nugget_pu_mix, 2), + new ItemStack(ModItems.nugget_technetium, 1), new ItemStack(ModItems.nuclear_waste_tiny, 2) }); recipes.put(new ComparableStack(ModItems.waste_plutonium), new ItemStack[] { diff --git a/src/main/java/com/hbm/inventory/FluidTank.java b/src/main/java/com/hbm/inventory/FluidTank.java index bd026a526..338c314c5 100644 --- a/src/main/java/com/hbm/inventory/FluidTank.java +++ b/src/main/java/com/hbm/inventory/FluidTank.java @@ -1,6 +1,10 @@ package com.hbm.inventory; +import java.util.ArrayList; +import java.util.List; + import com.hbm.handler.ArmorModHandler; +import com.hbm.handler.FluidTypeHandler.FluidTrait; import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IPartiallyFillable; import com.hbm.inventory.gui.GuiInfoContainer; @@ -235,10 +239,26 @@ public class FluidTank { public void renderTankInfo(GuiInfoContainer gui, int mouseX, int mouseY, int x, int y, int width, int height) { if(x <= mouseX && x + width > mouseX && y < mouseY && y + height >= mouseY) { - if(type.temperature == 0) - gui.drawFluidInfo(new String[] { I18n.format(this.type.getUnlocalizedName()), fluid + "/" + maxFluid + "mB" }, mouseX, mouseY); - else - gui.drawFluidInfo(new String[] { I18n.format(this.type.getUnlocalizedName()), fluid + "/" + maxFluid + "mB", EnumChatFormatting.RED + "" + type.temperature + "°C" }, mouseX, mouseY); + List list = new ArrayList(); + list.add(I18n.format(this.type.getUnlocalizedName())); + list.add(fluid + "/" + maxFluid + "mB"); + + if(type.temperature < 0) + list.add(EnumChatFormatting.BLUE + "" + type.temperature + "°C"); + + if(type.temperature > 0) + list.add(EnumChatFormatting.RED + "" + type.temperature + "°C"); + + if(type.isAntimatter()) + list.add(EnumChatFormatting.DARK_RED + "Antimatter"); + + if(type.traits.contains(FluidTrait.CORROSIVE)) + list.add(EnumChatFormatting.YELLOW + "Corrosive"); + + if(type.traits.contains(FluidTrait.CORROSIVE_2)) + list.add(EnumChatFormatting.GOLD + "Strongly Corrosive"); + + gui.drawFluidInfo(list.toArray(new String[0]), mouseX, mouseY); } } diff --git a/src/main/java/com/hbm/inventory/MachineRecipes.java b/src/main/java/com/hbm/inventory/MachineRecipes.java index 91e7daabc..77eac7814 100644 --- a/src/main/java/com/hbm/inventory/MachineRecipes.java +++ b/src/main/java/com/hbm/inventory/MachineRecipes.java @@ -94,6 +94,11 @@ public class MachineRecipes { return new ItemStack(ModItems.ingot_magnetized_tungsten, 1); } + if (mODE(item, new String[] {"ingotSteel", "dustSteel"}) && mODE(item2, new String[] {"nuggetTechnetium99", "tinyTc99"}) + || mODE(item, new String[] {"nuggetTechnetium99", "tinyTc99"}) && mODE(item2, new String[] {"ingotSteel", "dustSteel"})) { + return new ItemStack(ModItems.ingot_tcalloy, 1); + } + if (item.getItem() == ModItems.plate_mixed && mODE(item2, "plateGold") || mODE(item, "plateGold") && item2.getItem() == ModItems.plate_mixed) { return new ItemStack(ModItems.plate_paa, 2); @@ -799,6 +804,8 @@ public class MachineRecipes { getFurnaceOutput(new ItemStack(ModItems.ingot_steel), new ItemStack(ModItems.ingot_cobalt)).copy()); recipes.put(new ItemStack[] { new ItemStack(ModItems.ingot_saturnite), new ItemStack(ModItems.powder_meteorite) }, getFurnaceOutput(new ItemStack(ModItems.ingot_saturnite), new ItemStack(ModItems.powder_meteorite)).copy()); + recipes.put(new ItemStack[] { new ItemStack(ModItems.ingot_steel), new ItemStack(ModItems.nugget_technetium) }, + getFurnaceOutput(new ItemStack(ModItems.ingot_steel), new ItemStack(ModItems.nugget_technetium)).copy()); if(GeneralConfig.enableBabyMode) { recipes.put(new ItemStack[] { new ItemStack(ModItems.canister_empty), new ItemStack(Items.coal) }, diff --git a/src/main/java/com/hbm/inventory/OreDictManager.java b/src/main/java/com/hbm/inventory/OreDictManager.java index a4c3043c9..701ed08b0 100644 --- a/src/main/java/com/hbm/inventory/OreDictManager.java +++ b/src/main/java/com/hbm/inventory/OreDictManager.java @@ -21,6 +21,7 @@ public class OreDictManager { OreDictionary.registerOre("ingotPlutonium239", ModItems.ingot_pu239); OreDictionary.registerOre("ingotPlutonium240", ModItems.ingot_pu240); OreDictionary.registerOre("ingotNeptunium237", ModItems.ingot_neptunium); + OreDictionary.registerOre("ingotTechnetium99", ModItems.ingot_technetium); OreDictionary.registerOre("U233", ModItems.ingot_u233); OreDictionary.registerOre("U235", ModItems.ingot_u235); OreDictionary.registerOre("U238", ModItems.ingot_u238); @@ -58,6 +59,7 @@ public class OreDictManager { OreDictionary.registerOre("ingotAsbestos", ModItems.ingot_asbestos); OreDictionary.registerOre("ingotZirconium", ModItems.ingot_zirconium); OreDictionary.registerOre("ingotBoron", ModItems.ingot_boron); + OreDictionary.registerOre("ingotTcAlloy", ModItems.ingot_tcalloy); OreDictionary.registerOre("nuggetLead", ModItems.nugget_lead); OreDictionary.registerOre("nuggetBeryllium", ModItems.nugget_beryllium); @@ -71,9 +73,11 @@ public class OreDictManager { OreDictionary.registerOre("nuggetPlutonium238", ModItems.nugget_pu238); OreDictionary.registerOre("nuggetPlutonium239", ModItems.nugget_pu239); OreDictionary.registerOre("nuggetPlutonium240", ModItems.nugget_pu240); + OreDictionary.registerOre("nuggetPlutonium241", ModItems.nugget_pu241); OreDictionary.registerOre("nuggetAustralium", ModItems.nugget_australium); OreDictionary.registerOre("nuggetEuphemium", ModItems.nugget_euphemium); OreDictionary.registerOre("nuggetNeptunium237", ModItems.nugget_neptunium); + OreDictionary.registerOre("nuggetTechnetium99", ModItems.nugget_technetium); OreDictionary.registerOre("nuggetPolonium", ModItems.nugget_polonium); OreDictionary.registerOre("nuggetSchrabidium", ModItems.nugget_schrabidium); OreDictionary.registerOre("nuggetZirconium", ModItems.nugget_zirconium); @@ -84,7 +88,9 @@ public class OreDictManager { OreDictionary.registerOre("tinyPu238", ModItems.nugget_pu238); OreDictionary.registerOre("tinyPu239", ModItems.nugget_pu239); OreDictionary.registerOre("tinyPu240", ModItems.nugget_pu240); + OreDictionary.registerOre("tinyPu241", ModItems.nugget_pu241); OreDictionary.registerOre("tinyNp237", ModItems.nugget_neptunium); + OreDictionary.registerOre("tinyTc99", ModItems.nugget_technetium); OreDictionary.registerOre("nuggetNeodymium", ModItems.fragment_neodymium); OreDictionary.registerOre("nuggetCobalt", ModItems.fragment_cobalt); @@ -136,6 +142,7 @@ public class OreDictManager { OreDictionary.registerOre("dustPhosphorus", ModItems.powder_fire); OreDictionary.registerOre("dustZirconium", ModItems.powder_zirconium); OreDictionary.registerOre("dustBoron", ModItems.powder_boron); + OreDictionary.registerOre("dustTcAlloy", ModItems.powder_tcalloy); OreDictionary.registerOre("dustNeptunium", ModItems.powder_neptunium); OreDictionary.registerOre("dustIodine", ModItems.powder_iodine); diff --git a/src/main/java/com/hbm/inventory/SILEXRecipes.java b/src/main/java/com/hbm/inventory/SILEXRecipes.java index 7b116e350..874a8a1e0 100644 --- a/src/main/java/com/hbm/inventory/SILEXRecipes.java +++ b/src/main/java/com/hbm/inventory/SILEXRecipes.java @@ -222,8 +222,8 @@ public class SILEXRecipes { .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 15)) ); recipes.put(new ComparableStack(ModItems.nuclear_waste_long_depleted, 1, ItemWasteLong.WasteClass.URANIUM.ordinal()), new SILEXRecipe(900, 100) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 75)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_bismuth), 5)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 65)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_bismuth), 15)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 20)) ); recipes.put(new ComparableStack(ModItems.nuclear_waste_short, 1, ItemWasteShort.WasteClass.URANIUM.ordinal()), new SILEXRecipe(900, 100) @@ -235,8 +235,8 @@ public class SILEXRecipes { ); recipes.put(new ComparableStack(ModItems.nuclear_waste_short_depleted, 1, ItemWasteShort.WasteClass.URANIUM.ordinal()), new SILEXRecipe(900, 100) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_neptunium), 15)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 35)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_bismuth), 5)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 25)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_bismuth), 15)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 45)) ); @@ -260,8 +260,8 @@ public class SILEXRecipes { .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 25)) ); recipes.put(new ComparableStack(ModItems.nuclear_waste_long_depleted, 1, ItemWasteLong.WasteClass.THORIUM.ordinal()), new SILEXRecipe(900, 100) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 85)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_bismuth), 5)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 75)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_bismuth), 15)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 10)) ); diff --git a/src/main/java/com/hbm/inventory/gui/GUIScreenTemplateFolder.java b/src/main/java/com/hbm/inventory/gui/GUIScreenTemplateFolder.java index b1949945e..84515a50d 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIScreenTemplateFolder.java +++ b/src/main/java/com/hbm/inventory/gui/GUIScreenTemplateFolder.java @@ -63,7 +63,8 @@ public class GUIScreenTemplateFolder extends GuiScreen { allStacks.add(new ItemStack(ModItems.siren_track, 1, i)); // Fluid IDs for(int i = 1; i < FluidType.values().length; i++) - allStacks.add(new ItemStack(ModItems.fluid_identifier, 1, i)); + if(!FluidType.values()[i].hasNoContainer()) + allStacks.add(new ItemStack(ModItems.fluid_identifier, 1, i)); // Assembly Templates for(int i = 0; i < AssemblerRecipes.recipeList.size(); i++) if(AssemblerRecipes.hidden.get(AssemblerRecipes.recipeList.get(i)) == null) diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 82c7e003e..e564644c6 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -104,6 +104,7 @@ public class ModItems { public static Item nugget_mox_fuel; public static Item nugget_schrabidium_fuel; public static Item ingot_advanced_alloy; + public static Item ingot_tcalloy; public static Item lithium; public static Item ingot_zirconium; public static Item ingot_hes; @@ -159,6 +160,7 @@ public class ModItems { public static Item billet_pu238; public static Item billet_pu239; public static Item billet_pu240; + public static Item billet_pu241; public static Item billet_pu_mix; public static Item billet_neptunium; public static Item billet_polonium; @@ -337,6 +339,7 @@ public class ModItems { public static Item powder_cerium; public static Item powder_advanced_alloy; + public static Item powder_tcalloy; public static Item powder_coal; public static Item powder_combine_steel; public static Item powder_diamond; @@ -513,6 +516,7 @@ public class ModItems { public static Item turbine_tungsten; public static Item pellet_coal; public static Item ring_starmetal; + public static Item flywheel_beryllium; public static Item toothpicks; public static Item ducttape; @@ -934,6 +938,8 @@ public class ModItems { public static ItemRBMKRod rbmk_fuel_thmeu; public static ItemRBMKRod rbmk_fuel_lep; public static ItemRBMKRod rbmk_fuel_mep; + public static ItemRBMKRod rbmk_fuel_hep; + public static ItemRBMKRod rbmk_fuel_hep241; public static ItemRBMKRod rbmk_fuel_men; public static ItemRBMKRod rbmk_fuel_mox; public static ItemRBMKRod rbmk_fuel_les; @@ -2369,6 +2375,7 @@ public class ModItems { nugget_mox_fuel = new ItemHazard(ItemHazard.mox * ItemHazard.nugget).setUnlocalizedName("nugget_mox_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_mox_fuel"); nugget_schrabidium_fuel = new ItemHazard(ItemHazard.saf * ItemHazard.nugget, false, true).setUnlocalizedName("nugget_schrabidium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_schrabidium_fuel"); ingot_advanced_alloy = new Item().setUnlocalizedName("ingot_advanced_alloy").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_advanced_alloy"); + ingot_tcalloy = new Item().setUnlocalizedName("ingot_tcalloy").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_tcalloy"); niter = new Item().setUnlocalizedName("niter").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":salpeter"); ingot_copper = new Item().setUnlocalizedName("ingot_copper").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_copper"); @@ -2429,6 +2436,7 @@ public class ModItems { billet_pu238 = new ItemHazard(ItemHazard.pu238 * ItemHazard.billet, true).setUnlocalizedName("billet_pu238").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_pu238"); billet_pu239 = new ItemHazard(ItemHazard.pu239 * ItemHazard.billet).setUnlocalizedName("billet_pu239").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_pu239"); billet_pu240 = new ItemHazard(ItemHazard.pu240 * ItemHazard.billet).setUnlocalizedName("billet_pu240").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_pu240"); + billet_pu241 = new ItemHazard().addRadiation(ItemHazard.pu241 * ItemHazard.billet).toItem().setUnlocalizedName("billet_pu241").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_pu241"); billet_pu_mix = new ItemHazard(ItemHazard.purg * ItemHazard.billet).setUnlocalizedName("billet_pu_mix").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_pu_mix"); billet_neptunium = new ItemHazard(ItemHazard.np237 * ItemHazard.billet).setUnlocalizedName("billet_neptunium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_neptunium"); billet_polonium = new ItemHazard(ItemHazard.po210 * ItemHazard.billet, true).setUnlocalizedName("billet_polonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_polonium"); @@ -2599,6 +2607,7 @@ public class ModItems { dust = new ItemCustomLore().setUnlocalizedName("dust").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":dust"); fallout = new ItemHazard().addRadiation(ItemHazard.fo * ItemHazard.powder).toItem().setUnlocalizedName("fallout").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":fallout"); powder_advanced_alloy = new Item().setUnlocalizedName("powder_advanced_alloy").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_advanced_alloy"); + powder_tcalloy = new Item().setUnlocalizedName("powder_tcalloy").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_tcalloy"); powder_coal = new Item().setUnlocalizedName("powder_coal").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_coal"); powder_combine_steel = new Item().setUnlocalizedName("powder_combine_steel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_combine_steel"); powder_diamond = new Item().setUnlocalizedName("powder_diamond").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_diamond"); @@ -2700,6 +2709,7 @@ public class ModItems { component_emitter = new Item().setUnlocalizedName("component_emitter").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":component_emitter"); chlorine_pinwheel = new Item().setUnlocalizedName("chlorine_pinwheel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":chlorine_pinwheel"); ring_starmetal = new Item().setUnlocalizedName("ring_starmetal").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ring_starmetal"); + flywheel_beryllium = new Item().setUnlocalizedName("flywheel_beryllium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":flywheel_beryllium"); cap_aluminium = new Item().setUnlocalizedName("cap_aluminium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":cap_aluminium"); hull_small_steel = new Item().setUnlocalizedName("hull_small_steel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":hull_small_steel"); @@ -3047,7 +3057,7 @@ public class ModItems { wild_p = new ItemModRevive(3).setUnlocalizedName("wild_p").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":wild_p"); fabsols_vodka = new ItemModRevive(9999).setUnlocalizedName("fabsols_vodka").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":fabsols_vodka"); injector_5htp = new ItemModAuto().setUnlocalizedName("injector_5htp").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":injector_5htp"); - injector_knife = new ItemModAuto().setUnlocalizedName("injector_knife").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":injector_knife"); + injector_knife = new ItemModKnife().setUnlocalizedName("injector_knife").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":injector_knife"); medal_liquidator = new ItemModMedal().setUnlocalizedName("medal_liquidator").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":medal_liquidator"); can_empty = new Item().setUnlocalizedName("can_empty").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":can_empty"); @@ -3276,6 +3286,20 @@ public class ModItems { .setMeltingPoint(2744) .addRadiation(ItemHazard.purg * ItemHazard.rod_rbmk).toItem() .setUnlocalizedName("rbmk_fuel_mep").setTextureName(RefStrings.MODID + ":rbmk_fuel_mep"); + rbmk_fuel_hep = (ItemRBMKRod) new ItemRBMKRod("Highly Enriched Plutonium-239") + .setYield(100000000D) + .setStats(250) + .setHeat(1.5D) + .setMeltingPoint(2744) + .addRadiation(ItemHazard.pu239 * ItemHazard.rod_rbmk).toItem() + .setUnlocalizedName("rbmk_fuel_hep").setTextureName(RefStrings.MODID + ":rbmk_fuel_hep"); + rbmk_fuel_hep241 = (ItemRBMKRod) new ItemRBMKRod("Highly Enriched Plutonium-241") + .setYield(100000000D) + .setStats(280) + .setHeat(1.75D) + .setMeltingPoint(2744) + .addRadiation(ItemHazard.pu241 * ItemHazard.rod_rbmk).toItem() + .setUnlocalizedName("rbmk_fuel_hep241").setTextureName(RefStrings.MODID + ":rbmk_fuel_hep241"); rbmk_fuel_men = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_men) .setYield(100000000D) .setStats(175) @@ -4053,7 +4077,7 @@ public class ModItems { fuse = new ItemCustomLore().setUnlocalizedName("fuse").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":fuse"); redcoil_capacitor = new ItemCapacitor(10).setUnlocalizedName("redcoil_capacitor").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":redcoil_capacitor"); titanium_filter = new ItemCapacitor(6 * 60 * 60 * 20).setUnlocalizedName("titanium_filter").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":titanium_filter"); - screwdriver = new ItemCustomLore().setUnlocalizedName("screwdriver").setMaxStackSize(1).setFull3D().setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":screwdriver"); + screwdriver = new ItemScrewdriver().setUnlocalizedName("screwdriver").setMaxStackSize(1).setFull3D().setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":screwdriver"); overfuse = new ItemCustomLore().setUnlocalizedName("overfuse").setMaxStackSize(1).setFull3D().setTextureName(RefStrings.MODID + ":overfuse"); arc_electrode = new ItemCustomLore().setUnlocalizedName("arc_electrode").setMaxDamage(250).setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setFull3D().setTextureName(RefStrings.MODID + ":arc_electrode"); arc_electrode_burnt = new Item().setUnlocalizedName("arc_electrode_burnt").setMaxStackSize(1).setFull3D().setTextureName(RefStrings.MODID + ":arc_electrode_burnt"); @@ -4463,6 +4487,11 @@ public class ModItems { jackt = new ModArmor(MainRegistry.aMatSteel, 7, 1).setUnlocalizedName("jackt").setTextureName(RefStrings.MODID + ":jackt"); jackt2 = new ModArmor(MainRegistry.aMatSteel, 7, 1).setUnlocalizedName("jackt2").setTextureName(RefStrings.MODID + ":jackt2"); + + initializeItem2(); + } + + public static void initializeItem2() { chainsaw = new ItemToolAbility(25, -0.05, MainRegistry.tMatChainsaw, EnumToolType.AXE) .addBreakAbility(new ToolAbility.SilkAbility()) @@ -4742,11 +4771,6 @@ public class ModItems { meteorite_sword_baleful = new ItemSwordMeteorite(500F, 0, matMeteorite).setUnlocalizedName("meteorite_sword_baleful").setTextureName(RefStrings.MODID + ":meteorite_sword"); mask_of_infamy = new MaskOfInfamy(ArmorMaterial.IRON, 8, 0).setUnlocalizedName("mask_of_infamy").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":mask_of_infamy"); - - initializeItem2(); - } - - public static void initializeItem2() { hazmat_helmet = new ArmorHazmat(MainRegistry.aMatHaz, 9, 0).setUnlocalizedName("hazmat_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_helmet"); hazmat_plate = new ArmorHazmat(MainRegistry.aMatHaz, 9, 1).setUnlocalizedName("hazmat_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_plate"); @@ -5037,6 +5061,7 @@ public class ModItems { GameRegistry.registerItem(ingot_tungsten, ingot_tungsten.getUnlocalizedName()); GameRegistry.registerItem(ingot_aluminium, ingot_aluminium.getUnlocalizedName()); GameRegistry.registerItem(ingot_steel, ingot_steel.getUnlocalizedName()); + GameRegistry.registerItem(ingot_tcalloy, ingot_tcalloy.getUnlocalizedName()); GameRegistry.registerItem(ingot_lead, ingot_lead.getUnlocalizedName()); GameRegistry.registerItem(ingot_bismuth, ingot_bismuth.getUnlocalizedName()); GameRegistry.registerItem(ingot_beryllium, ingot_beryllium.getUnlocalizedName()); @@ -5101,6 +5126,7 @@ public class ModItems { GameRegistry.registerItem(billet_pu238, billet_pu238.getUnlocalizedName()); GameRegistry.registerItem(billet_pu239, billet_pu239.getUnlocalizedName()); GameRegistry.registerItem(billet_pu240, billet_pu240.getUnlocalizedName()); + GameRegistry.registerItem(billet_pu241, billet_pu241.getUnlocalizedName()); GameRegistry.registerItem(billet_pu_mix, billet_pu_mix.getUnlocalizedName()); GameRegistry.registerItem(billet_neptunium, billet_neptunium.getUnlocalizedName()); GameRegistry.registerItem(billet_polonium, billet_polonium.getUnlocalizedName()); @@ -5162,6 +5188,7 @@ public class ModItems { GameRegistry.registerItem(powder_aluminium, powder_aluminium.getUnlocalizedName()); GameRegistry.registerItem(powder_steel, powder_steel.getUnlocalizedName()); GameRegistry.registerItem(powder_steel_tiny, powder_steel_tiny.getUnlocalizedName()); + GameRegistry.registerItem(powder_tcalloy, powder_tcalloy.getUnlocalizedName()); GameRegistry.registerItem(powder_lead, powder_lead.getUnlocalizedName()); GameRegistry.registerItem(powder_yellowcake, powder_yellowcake.getUnlocalizedName()); GameRegistry.registerItem(powder_beryllium, powder_beryllium.getUnlocalizedName()); @@ -5428,6 +5455,7 @@ public class ModItems { GameRegistry.registerItem(blade_tungsten, blade_tungsten.getUnlocalizedName()); GameRegistry.registerItem(turbine_titanium, turbine_titanium.getUnlocalizedName()); GameRegistry.registerItem(turbine_tungsten, turbine_tungsten.getUnlocalizedName()); + GameRegistry.registerItem(flywheel_beryllium, flywheel_beryllium.getUnlocalizedName()); GameRegistry.registerItem(generator_front, generator_front.getUnlocalizedName()); GameRegistry.registerItem(toothpicks, toothpicks.getUnlocalizedName()); GameRegistry.registerItem(ducttape, ducttape.getUnlocalizedName()); @@ -6034,6 +6062,8 @@ public class ModItems { GameRegistry.registerItem(rbmk_fuel_thmeu, rbmk_fuel_thmeu.getUnlocalizedName()); GameRegistry.registerItem(rbmk_fuel_lep, rbmk_fuel_lep.getUnlocalizedName()); GameRegistry.registerItem(rbmk_fuel_mep, rbmk_fuel_mep.getUnlocalizedName()); + GameRegistry.registerItem(rbmk_fuel_hep, rbmk_fuel_hep.getUnlocalizedName()); + GameRegistry.registerItem(rbmk_fuel_hep241, rbmk_fuel_hep241.getUnlocalizedName()); GameRegistry.registerItem(rbmk_fuel_men, rbmk_fuel_men.getUnlocalizedName()); GameRegistry.registerItem(rbmk_fuel_mox, rbmk_fuel_mox.getUnlocalizedName()); GameRegistry.registerItem(rbmk_fuel_les, rbmk_fuel_les.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/armor/ItemModAuto.java b/src/main/java/com/hbm/items/armor/ItemModAuto.java index 81fe68120..bb771b8f8 100644 --- a/src/main/java/com/hbm/items/armor/ItemModAuto.java +++ b/src/main/java/com/hbm/items/armor/ItemModAuto.java @@ -1,12 +1,16 @@ package com.hbm.items.armor; import java.util.List; +import java.util.UUID; +import com.hbm.extprop.HbmLivingProps; import com.hbm.handler.ArmorModHandler; -import com.hbm.items.ModItems; +import com.hbm.potion.HbmPotion; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.potion.PotionEffect; import net.minecraft.util.EnumChatFormatting; public class ItemModAuto extends ItemArmorMod { @@ -17,17 +21,30 @@ public class ItemModAuto extends ItemArmorMod { @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) { - - if(this == ModItems.injector_5htp) { - list.add(EnumChatFormatting.BLUE + "Imported from Japsterdam."); - } - if(this == ModItems.injector_knife) { - list.add(EnumChatFormatting.RED + "Pain."); - list.add(""); - list.add(EnumChatFormatting.RED + "Hurts, doesn't it?"); - } + + list.add(EnumChatFormatting.BLUE + "Imported from Japsterdam."); list.add(""); super.addInformation(stack, player, list, bool); } + + @Override + public void addDesc(List list, ItemStack stack, ItemStack armor) { + list.add(EnumChatFormatting.BLUE + " " + stack.getDisplayName()); + } + + @Override + public void modUpdate(EntityLivingBase entity, ItemStack armor) { + + if(!entity.worldObj.isRemote) { + + if(HbmLivingProps.getDigamma(entity) >= 5F) { + ArmorModHandler.removeMod(armor, ArmorModHandler.extra); + entity.worldObj.playSoundAtEntity(entity, "hbm:item.syringe", 1.0F, 1.0F); + HbmLivingProps.setDigamma(entity, HbmLivingProps.getDigamma(entity) - 5F); + entity.addPotionEffect(new PotionEffect(HbmPotion.stability.id, 60 * 20, 0)); + entity.heal(20F); + } + } + } } diff --git a/src/main/java/com/hbm/items/armor/ItemModKnife.java b/src/main/java/com/hbm/items/armor/ItemModKnife.java new file mode 100644 index 000000000..b4fa2a3e0 --- /dev/null +++ b/src/main/java/com/hbm/items/armor/ItemModKnife.java @@ -0,0 +1,85 @@ +package com.hbm.items.armor; + +import java.util.List; +import java.util.UUID; + +import com.hbm.handler.ArmorModHandler; +import com.hbm.packet.AuxParticlePacketNT; +import com.hbm.packet.PacketDispatcher; + +import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.attributes.AttributeModifier; +import net.minecraft.entity.ai.attributes.IAttributeInstance; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; + +public class ItemModKnife extends ItemArmorMod { + + public static final UUID trigamma_UUID = UUID.fromString("86d44ca9-44f1-4ca6-bdbb-d9d33bead251"); + + public ItemModKnife() { + super(ArmorModHandler.extra, false, true, false, false); + } + + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) { + + list.add(EnumChatFormatting.RED + "Pain."); + list.add(""); + list.add(EnumChatFormatting.RED + "Hurts, doesn't it?"); + + list.add(""); + super.addInformation(stack, player, list, bool); + } + + @Override + public void addDesc(List list, ItemStack stack, ItemStack armor) { + list.add(EnumChatFormatting.RED + " " + stack.getDisplayName()); + } + + @Override + public void modUpdate(EntityLivingBase entity, ItemStack armor) { + + if(!entity.worldObj.isRemote) { + + if(entity.ticksExisted % 50 == 0 && entity.getMaxHealth() > 2F) { + + entity.worldObj.playSoundAtEntity(entity, "hbm:entity.slicer", 1.0F, 1.0F); + + NBTTagCompound nbt = new NBTTagCompound(); + nbt.setString("type", "bloodvomit"); + nbt.setInteger("entity", entity.getEntityId()); + PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(nbt, 0, 0, 0), new TargetPoint(entity.dimension, entity.posX, entity.posY, entity.posZ, 25)); + + IAttributeInstance attributeinstance = entity.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.maxHealth); + + float health = entity.getMaxHealth(); + + try { + attributeinstance.removeModifier(attributeinstance.getModifier(trigamma_UUID)); + } catch(Exception ex) { } + + attributeinstance.applyModifier(new AttributeModifier(trigamma_UUID, "digamma", -(20F - health + 2), 0)); + + if(entity instanceof EntityPlayerMP) { + NBTTagCompound data = new NBTTagCompound(); + data.setString("type", "properJolt"); + + if(entity.getMaxHealth() > 2F) { + data.setInteger("time", 10000 + entity.getRNG().nextInt(10000)); + data.setInteger("maxTime", 10000); + } else { + data.setInteger("time", 0); + data.setInteger("maxTime", 0); + } + PacketDispatcher.wrapper.sendTo(new AuxParticlePacketNT(data, 0, 0, 0), (EntityPlayerMP)entity); + } + } + } + } +} diff --git a/src/main/java/com/hbm/items/block/ItemBlockLore.java b/src/main/java/com/hbm/items/block/ItemBlockLore.java index 53684a0d9..631163477 100644 --- a/src/main/java/com/hbm/items/block/ItemBlockLore.java +++ b/src/main/java/com/hbm/items/block/ItemBlockLore.java @@ -35,7 +35,7 @@ public class ItemBlockLore extends ItemBlock { if(this.field_150939_a == ModBlocks.barrel_corroded) { list.add(EnumChatFormatting.AQUA + "Capacity: 6,000mB"); list.add(EnumChatFormatting.GREEN + "Can store hot fluids"); - list.add(EnumChatFormatting.GREEN + "Can store corrosive fluids"); + list.add(EnumChatFormatting.GREEN + "Can store highly corrosive fluids"); list.add(EnumChatFormatting.YELLOW + "Cannot store antimatter"); list.add(EnumChatFormatting.RED + "Leaky"); } @@ -51,16 +51,24 @@ public class ItemBlockLore extends ItemBlock { list.add(EnumChatFormatting.AQUA + "Capacity: 16,000mB"); list.add(EnumChatFormatting.GREEN + "Can store hot fluids"); list.add(EnumChatFormatting.GREEN + "Can store corrosive fluids"); + list.add(EnumChatFormatting.YELLOW + "Cannot store highly corrosive fluids properly"); list.add(EnumChatFormatting.YELLOW + "Cannot store antimatter"); } if(this.field_150939_a == ModBlocks.barrel_antimatter) { list.add(EnumChatFormatting.AQUA + "Capacity: 16,000mB"); list.add(EnumChatFormatting.GREEN + "Can store hot fluids"); - list.add(EnumChatFormatting.GREEN + "Can store corrosive fluids"); + list.add(EnumChatFormatting.GREEN + "Can store highly corrosive fluids"); list.add(EnumChatFormatting.GREEN + "Can store antimatter"); } + if(this.field_150939_a == ModBlocks.barrel_tcalloy) { + list.add(EnumChatFormatting.AQUA + "Capacity: 24,000mB"); + list.add(EnumChatFormatting.GREEN + "Can store hot fluids"); + list.add(EnumChatFormatting.GREEN + "Can store highly corrosive fluids"); + list.add(EnumChatFormatting.YELLOW + "Cannot store antimatter"); + } + if(this.field_150939_a == ModBlocks.meteor_battery) { list.add("Provides infinite charge to tesla coils"); } diff --git a/src/main/java/com/hbm/items/machine/ItemFluidIdentifier.java b/src/main/java/com/hbm/items/machine/ItemFluidIdentifier.java index 6676e2565..59ad5aceb 100644 --- a/src/main/java/com/hbm/items/machine/ItemFluidIdentifier.java +++ b/src/main/java/com/hbm/items/machine/ItemFluidIdentifier.java @@ -20,123 +20,111 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; public class ItemFluidIdentifier extends Item { - + IIcon overlayIcon; - public ItemFluidIdentifier() - { - this.setHasSubtypes(true); - this.setMaxDamage(0); - } + public ItemFluidIdentifier() { + this.setHasSubtypes(true); + this.setMaxDamage(0); + } - /*@Override - public String getUnlocalizedName(ItemStack stack) - { - int i = stack.getItemDamage(); - return super.getUnlocalizedName() + "." + FluidType.getEnum(i).getName(); - }*/ - - public ItemStack getContainerItem(ItemStack stack) { - return stack.copy(); - } - - public boolean hasContainerItem() { - return true; - } - - public boolean doesContainerItemLeaveCraftingGrid(ItemStack stack) - { - return false; - } + /* + * @Override public String getUnlocalizedName(ItemStack stack) { int i = + * stack.getItemDamage(); return super.getUnlocalizedName() + "." + + * FluidType.getEnum(i).getName(); } + */ + + public ItemStack getContainerItem(ItemStack stack) { + return stack.copy(); + } + + public boolean hasContainerItem() { + return true; + } + + public boolean doesContainerItemLeaveCraftingGrid(ItemStack stack) { + return false; + } - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tabs, List list) - { - for (int i = 0; i < FluidType.values().length; ++i) - { - list.add(new ItemStack(item, 1, i)); - } - } - @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) - { - - if(!(stack.getItem() instanceof ItemFluidIdentifier)) - return; + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs tabs, List list) { + + for(int i = 0; i < FluidType.values().length; ++i) { + if(!FluidType.values()[i].hasNoContainer()) { + list.add(new ItemStack(item, 1, i)); + } + } + } + + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) { + + if(!(stack.getItem() instanceof ItemFluidIdentifier)) + return; list.add(EnumChatFormatting.YELLOW + I18nUtil.resolveKey("info.templatefolder", I18nUtil.resolveKey(ModItems.template_folder.getUnlocalizedName() + ".name"))); list.add(""); - list.add("Universal fluid identifier for:"); - list.add(" " + I18n.format(FluidType.getEnum(stack.getItemDamage()).getUnlocalizedName())); + list.add("Universal fluid identifier for:"); + list.add(" " + I18n.format(FluidType.getEnum(stack.getItemDamage()).getUnlocalizedName())); } - + public static FluidType getType(ItemStack stack) { if(stack != null && stack.getItem() instanceof ItemFluidIdentifier) return FluidType.getEnum(stack.getItemDamage()); else return FluidType.NONE; } - + @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int i, float f1, float f2, float f3) - { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int i, float f1, float f2, float f3) { TileEntity te = world.getTileEntity(x, y, z); if(te != null && te instanceof TileEntityFluidDuct) { - + if(!world.isRemote) { - TileEntityFluidDuct duct = (TileEntityFluidDuct)te; + TileEntityFluidDuct duct = (TileEntityFluidDuct) te; duct.type = FluidType.getEnum(stack.getItemDamage()); } - + player.swingItem(); } return false; - } + } - @Override + @Override @SideOnly(Side.CLIENT) - public boolean requiresMultipleRenderPasses() - { - return true; - } + public boolean requiresMultipleRenderPasses() { + return true; + } - @Override + @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister p_94581_1_) - { - super.registerIcons(p_94581_1_); + public void registerIcons(IIconRegister p_94581_1_) { + super.registerIcons(p_94581_1_); - this.overlayIcon = p_94581_1_.registerIcon("hbm:fluid_identifier_overlay"); - } - - @Override + this.overlayIcon = p_94581_1_.registerIcon("hbm:fluid_identifier_overlay"); + } + + @Override @SideOnly(Side.CLIENT) - public IIcon getIconFromDamageForRenderPass(int p_77618_1_, int p_77618_2_) - { - return p_77618_2_ == 1 ? this.overlayIcon : super.getIconFromDamageForRenderPass(p_77618_1_, p_77618_2_); - } + public IIcon getIconFromDamageForRenderPass(int p_77618_1_, int p_77618_2_) { + return p_77618_2_ == 1 ? this.overlayIcon : super.getIconFromDamageForRenderPass(p_77618_1_, p_77618_2_); + } - @Override + @Override @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack stack, int p_82790_2_) - { - if (p_82790_2_ == 0) - { - return 16777215; - } - else - { - int j = FluidType.getEnum(stack.getItemDamage()).getMSAColor(); + public int getColorFromItemStack(ItemStack stack, int p_82790_2_) { + if(p_82790_2_ == 0) { + return 16777215; + } else { + int j = FluidType.getEnum(stack.getItemDamage()).getMSAColor(); - if (j < 0) - { - j = 16777215; - } + if(j < 0) { + j = 16777215; + } - return j; - } - } + return j; + } + } } diff --git a/src/main/java/com/hbm/items/machine/ItemFluidTank.java b/src/main/java/com/hbm/items/machine/ItemFluidTank.java index 1c953b651..8d9421fce 100644 --- a/src/main/java/com/hbm/items/machine/ItemFluidTank.java +++ b/src/main/java/com/hbm/items/machine/ItemFluidTank.java @@ -13,83 +13,73 @@ import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; public class ItemFluidTank extends Item { - + IIcon overlayIcon; - public ItemFluidTank() - { - this.setHasSubtypes(true); - this.setMaxDamage(0); - } + public ItemFluidTank() { + this.setHasSubtypes(true); + this.setMaxDamage(0); + } - @Override + @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tabs, List list) - { - for (int i = 1; i < FluidType.values().length; ++i) - { - list.add(new ItemStack(item, 1, i)); - } - } + public void getSubItems(Item item, CreativeTabs tabs, List list) { + + for(int i = 1; i < FluidType.values().length; ++i) { + if(!FluidType.values()[i].hasNoContainer()) { + list.add(new ItemStack(item, 1, i)); + } + } + } - public String getItemStackDisplayName(ItemStack stack) - { - String s = ("" + StatCollector.translateToLocal(this.getUnlocalizedName() + ".name")).trim(); - String s1 = ("" + StatCollector.translateToLocal(FluidType.getEnum(stack.getItemDamage()).getUnlocalizedName())).trim(); + public String getItemStackDisplayName(ItemStack stack) { + String s = ("" + StatCollector.translateToLocal(this.getUnlocalizedName() + ".name")).trim(); + String s1 = ("" + StatCollector.translateToLocal(FluidType.getEnum(stack.getItemDamage()).getUnlocalizedName())).trim(); - if (s1 != null) - { - s = s + " " + s1; - } + if(s1 != null) { + s = s + " " + s1; + } - return s; - } + return s; + } - @Override + @Override @SideOnly(Side.CLIENT) - public boolean requiresMultipleRenderPasses() - { - return true; - } + public boolean requiresMultipleRenderPasses() { + return true; + } - @Override + @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister p_94581_1_) - { - super.registerIcons(p_94581_1_); + public void registerIcons(IIconRegister p_94581_1_) { + super.registerIcons(p_94581_1_); - if(this == ModItems.fluid_tank_full) - this.overlayIcon = p_94581_1_.registerIcon("hbm:fluid_tank_overlay"); - if(this == ModItems.fluid_barrel_full) - this.overlayIcon = p_94581_1_.registerIcon("hbm:fluid_barrel_overlay"); - } - - @Override + if(this == ModItems.fluid_tank_full) + this.overlayIcon = p_94581_1_.registerIcon("hbm:fluid_tank_overlay"); + if(this == ModItems.fluid_barrel_full) + this.overlayIcon = p_94581_1_.registerIcon("hbm:fluid_barrel_overlay"); + } + + @Override @SideOnly(Side.CLIENT) - public IIcon getIconFromDamageForRenderPass(int p_77618_1_, int p_77618_2_) - { - return p_77618_2_ == 1 ? this.overlayIcon : super.getIconFromDamageForRenderPass(p_77618_1_, p_77618_2_); - } + public IIcon getIconFromDamageForRenderPass(int p_77618_1_, int p_77618_2_) { + return p_77618_2_ == 1 ? this.overlayIcon : super.getIconFromDamageForRenderPass(p_77618_1_, p_77618_2_); + } - @Override + @Override @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack stack, int p_82790_2_) - { - if (p_82790_2_ == 0) - { - return 16777215; - } - else - { - int j = FluidType.getEnum(stack.getItemDamage()).getMSAColor(); + public int getColorFromItemStack(ItemStack stack, int p_82790_2_) { + if(p_82790_2_ == 0) { + return 16777215; + } else { + int j = FluidType.getEnum(stack.getItemDamage()).getMSAColor(); - if (j < 0) - { - j = 16777215; - } + if(j < 0) { + j = 16777215; + } - return j; - } - } + return j; + } + } } diff --git a/src/main/java/com/hbm/items/tool/ItemScrewdriver.java b/src/main/java/com/hbm/items/tool/ItemScrewdriver.java new file mode 100644 index 000000000..b3f65a73f --- /dev/null +++ b/src/main/java/com/hbm/items/tool/ItemScrewdriver.java @@ -0,0 +1,23 @@ +package com.hbm.items.tool; + +import api.hbm.block.IScrewable; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +public class ItemScrewdriver extends Item { + + @Override + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float fX, float fY, float fZ) { + + Block b = world.getBlock(x, y, z); + + if(b instanceof IScrewable) { + return ((IScrewable)b).onScrew(world, player, x, y, z, side, fX, fY, fZ); + } + + return false; + } +} diff --git a/src/main/java/com/hbm/lib/RefStrings.java b/src/main/java/com/hbm/lib/RefStrings.java index eefc48f2e..7e1e18367 100644 --- a/src/main/java/com/hbm/lib/RefStrings.java +++ b/src/main/java/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ package com.hbm.lib; public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech Mod"; - public static final String VERSION = "1.0.27 BETA (3894)"; + public static final String VERSION = "1.0.27 BETA (3899)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index fe5e6bd4f..753ce7081 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -1182,6 +1182,13 @@ public class ClientProxy extends ServerProxy { player.attackedAtYaw = 0F; } + if("properJolt".equals(type)) { + + player.hurtTime = data.getInteger("time"); + player.maxHurtTime = data.getInteger("maxTime"); + player.attackedAtYaw = 0F; + } + if("sweat".equals(type)) { Entity e = world.getEntityByID(data.getInteger("entity")); diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index f003afcc1..73858484b 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -202,6 +202,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.blade_tungsten, 2), new Object[] { "IP", "TP", "TI", 'P', "plateTitanium", 'T', "ingotTitanium", 'I', "ingotTungsten" })); GameRegistry.addRecipe(new ItemStack(ModItems.turbine_tungsten, 1), new Object[] { "BBB", "BSB", "BBB", 'B', ModItems.blade_tungsten, 'S', ModItems.ingot_dura_steel }); GameRegistry.addRecipe(new ItemStack(ModItems.ring_starmetal, 1), new Object[] { " S ", "S S", " S ", 'S', ModItems.ingot_starmetal }); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.flywheel_beryllium, 1), new Object[] { "BBB", "BTB", "BBB", 'B', "blockBeryllium", 'T', ModItems.bolt_compound })); ItemStack infinity = new ItemStack(Items.enchanted_book); EnchantmentUtil.addEnchantment(infinity, Enchantment.infinity, 1); @@ -680,6 +681,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.barrel_plastic, 1), new Object[] { "IPI", "I I", "IPI", 'I', ModItems.plate_polymer, 'P', "plateAluminum" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.barrel_iron, 1), new Object[] { "IPI", "I I", "IPI", 'I', "plateIron", 'P', "ingotIron" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.barrel_steel, 1), new Object[] { "IPI", "I I", "IPI", 'I', "plateSteel", 'P', "ingotSteel" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.barrel_tcalloy, 1), new Object[] { "IPI", "I I", "IPI", 'I', "ingotTcAlloy", 'P', "plateTitanium" })); GameRegistry.addRecipe(new ItemStack(ModBlocks.barrel_antimatter, 1), new Object[] { "IPI", "IPI", "IPI", 'I', ModItems.plate_saturnite, 'P', ModItems.coil_advanced_torus }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.tesla, 1), new Object[] { "CCC", "PIP", "WTW", 'C', ModItems.coil_copper, 'I', "ingotIron", 'P', "ingotPolymer", 'T', ModBlocks.machine_transformer, 'W', "plankWood" })); GameRegistry.addRecipe(new ItemStack(ModBlocks.struct_plasma_core, 1), new Object[] { "CBC", "BHB", "CBC", 'C', ModItems.circuit_gold, 'B', ModBlocks.machine_lithium_battery, 'H', ModBlocks.fusion_heater }); @@ -928,6 +930,7 @@ public class CraftingManager { GameRegistry.addSmelting(ModItems.powder_dineutronium, new ItemStack(ModItems.ingot_dineutronium), 5.0F); GameRegistry.addSmelting(ModItems.powder_asbestos, new ItemStack(ModItems.ingot_asbestos), 1.0F); GameRegistry.addSmelting(ModItems.powder_zirconium, new ItemStack(ModItems.ingot_zirconium), 1.0F); + GameRegistry.addSmelting(ModItems.powder_tcalloy, new ItemStack(ModItems.ingot_tcalloy), 1.0F); GameRegistry.addSmelting(ModItems.powder_coal, new ItemStack(ModItems.coke), 1.0F); GameRegistry.addSmelting(ModItems.briquette_lignite, new ItemStack(ModItems.coke), 1.0F); diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index 129e7bda6..801dc8dc4 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -1088,8 +1088,11 @@ public class MainRegistry { FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.particle_aschrab), new ItemStack(ModItems.particle_empty), FluidType.ASCHRAB, 1000)); for(int i = 1; i < FluidType.values().length; i++) { - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.fluid_tank_full, 1, i), new ItemStack(ModItems.fluid_tank_empty), FluidType.getEnum(i), 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.fluid_barrel_full, 1, i), new ItemStack(ModItems.fluid_barrel_empty), FluidType.getEnum(i), 16000)); + + if(!FluidType.values()[i].hasNoContainer()) { + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.fluid_tank_full, 1, i), new ItemStack(ModItems.fluid_tank_empty), FluidType.getEnum(i), 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.fluid_barrel_full, 1, i), new ItemStack(ModItems.fluid_barrel_empty), FluidType.getEnum(i), 16000)); + } } TileEntityMachineReactorLarge.registerFuelEntry(1, ReactorFuelType.URANIUM, ModItems.nugget_uranium_fuel); diff --git a/src/main/java/com/hbm/render/item/ItemRenderBase.java b/src/main/java/com/hbm/render/item/ItemRenderBase.java index 6894fb5b3..d1c8120f3 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderBase.java +++ b/src/main/java/com/hbm/render/item/ItemRenderBase.java @@ -47,7 +47,9 @@ public abstract class ItemRenderBase implements IItemRenderer { GL11.glScaled(1.5, 1.5, 1.5); GL11.glScaled(0.25, 0.25, 0.25); - GL11.glRotated(90, 0, 1, 0); + + if(type != ItemRenderType.EQUIPPED) + GL11.glRotated(90, 0, 1, 0); renderNonInv(); } renderCommon(); diff --git a/src/main/java/com/hbm/render/item/ItemRenderLibrary.java b/src/main/java/com/hbm/render/item/ItemRenderLibrary.java index 19b5db5b3..57acb3335 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderLibrary.java +++ b/src/main/java/com/hbm/render/item/ItemRenderLibrary.java @@ -962,6 +962,22 @@ public class ItemRenderLibrary { bindTexture(ResourceManager.waste_drum_tex); ResourceManager.waste_drum.renderAll(); }}); + + renderers.put(Item.getItemFromBlock(ModBlocks.machine_chungus), new ItemRenderBase() { + public void renderInventory() { + GL11.glTranslated(0.5, 0, 0); + GL11.glScaled(2.5, 2.5, 2.5); + } + public void renderCommon() { + GL11.glScaled(0.5, 0.5, 0.5); + GL11.glRotated(90, 0, 1, 0); + bindTexture(ResourceManager.chungus_tex); + GL11.glShadeModel(GL11.GL_SMOOTH); + ResourceManager.chungus.renderPart("Body"); + ResourceManager.chungus.renderPart("Lever"); + ResourceManager.chungus.renderPart("Blades"); + GL11.glShadeModel(GL11.GL_FLAT); + }}); } private static void bindTexture(ResourceLocation res) { diff --git a/src/main/java/com/hbm/render/tileentity/RenderChungus.java b/src/main/java/com/hbm/render/tileentity/RenderChungus.java index 1037606b7..4f55431e1 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderChungus.java +++ b/src/main/java/com/hbm/render/tileentity/RenderChungus.java @@ -17,7 +17,7 @@ public class RenderChungus extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslated(x + 0.5D, y, z + 0.5D); GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_CULL_FACE); + GL11.glEnable(GL11.GL_CULL_FACE); GL11.glRotatef(90, 0F, 1F, 0F); @@ -36,24 +36,29 @@ public class RenderChungus extends TileEntitySpecialRenderer { break; } + TileEntityChungus turbine = (TileEntityChungus) tile; + GL11.glTranslated(0, 0, -3); bindTexture(ResourceManager.chungus_tex); GL11.glShadeModel(GL11.GL_SMOOTH); ResourceManager.chungus.renderPart("Body"); + + GL11.glPushMatrix(); + GL11.glTranslated(0, 0, 4.5); + GL11.glRotatef(15 - (turbine.tanks[0].getTankType().ordinal() - 2) * 10, 1, 0, 0); + GL11.glTranslated(0, 0, -4.5); ResourceManager.chungus.renderPart("Lever"); - GL11.glShadeModel(GL11.GL_FLAT); + GL11.glPopMatrix(); - TileEntityChungus turbine = (TileEntityChungus) tile; - - GL11.glTranslated(0, 1, 0); - GL11.glRotatef(turbine.lastRotor + (turbine.rotor - turbine.lastRotor) * f, 0, 0, 1); - GL11.glTranslated(0, -1, 0); + GL11.glTranslated(0, 2.5, 0); + GL11.glRotatef(turbine.lastRotor + (turbine.rotor - turbine.lastRotor) * f, 0, 0, -1); + GL11.glTranslated(0, -2.5, 0); ResourceManager.chungus.renderPart("Blades"); - GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glShadeModel(GL11.GL_FLAT); GL11.glPopMatrix(); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityBarrel.java b/src/main/java/com/hbm/tileentity/machine/TileEntityBarrel.java index 1a5d0a37c..1ea62ba94 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityBarrel.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityBarrel.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import com.hbm.blocks.ModBlocks; +import com.hbm.handler.FluidTypeHandler.FluidTrait; import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; @@ -60,7 +61,7 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc Block b = this.getBlockType(); //for when you fill antimatter into a matter tank - if(b != ModBlocks.barrel_antimatter && tank.getTankType().isAntimatter()) { + if(b != ModBlocks.barrel_antimatter && tank.getTankType().traits.contains(FluidTrait.AMAT)) { worldObj.func_147480_a(xCoord, yCoord, zCoord, false); worldObj.newExplosion(null, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, 5, true, true); } @@ -72,7 +73,8 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc } //for when you fill corrosive liquid into an iron tank - if(b == ModBlocks.barrel_iron && tank.getTankType().isCorrosive()) { + if((b == ModBlocks.barrel_iron && tank.getTankType().isCorrosive()) || + (b == ModBlocks.barrel_steel && tank.getTankType().traits.contains(FluidTrait.CORROSIVE_2))) { ItemStack[] copy = this.slots.clone(); this.slots = new ItemStack[6]; worldObj.setBlock(xCoord, yCoord, zCoord, ModBlocks.barrel_corroded); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityChungus.java b/src/main/java/com/hbm/tileentity/machine/TileEntityChungus.java index c21809741..de8a8e5c3 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityChungus.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityChungus.java @@ -2,6 +2,7 @@ package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; +import java.util.Random; import com.hbm.blocks.BlockDummyable; import com.hbm.handler.FluidTypeHandler.FluidType; @@ -29,7 +30,7 @@ public class TileEntityChungus extends TileEntity implements IFluidAcceptor, IFl public long power; public static final long maxPower = 100000000000L; - private boolean shouldTurn; + private int turnTimer; public float rotor; public float lastRotor; @@ -69,25 +70,44 @@ public class TileEntityChungus extends TileEntity implements IFluidAcceptor, IFl if(power > maxPower) power = maxPower; - shouldTurn = cycles > 0; + turnTimer--; + + if(cycles > 0) + turnTimer = 25; + + this.fillFluidInit(tanks[1].getTankType()); + this.ffgeuaInit(); NBTTagCompound data = new NBTTagCompound(); data.setLong("power", power); - data.setBoolean("operational", shouldTurn); + data.setInteger("type", tanks[0].getTankType().ordinal()); + data.setInteger("operational", turnTimer); this.networkPack(data, 150); } else { this.lastRotor = this.rotor; - if(shouldTurn) { + if(turnTimer > 0) { - this.rotor += 30F; + this.rotor += 25F; if(this.rotor >= 360) { this.rotor -= 360; this.lastRotor -= 360; } + + Random rand = worldObj.rand; + ForgeDirection dir = ForgeDirection.getOrientation(this.getBlockMetadata() - BlockDummyable.offset); + ForgeDirection side = dir.getRotation(ForgeDirection.UP); + + for(int i = 0; i < 10; i++) { + worldObj.spawnParticle("cloud", + xCoord + 0.5 + dir.offsetX * (rand.nextDouble() + 1.25) + rand.nextGaussian() * side.offsetX * 0.65, + yCoord + 2.5 + rand.nextGaussian() * 0.65, + zCoord + 0.5 + dir.offsetZ * (rand.nextDouble() + 1.25) + rand.nextGaussian() * side.offsetZ * 0.65, + -dir.offsetX * 0.2, 0, -dir.offsetZ * 0.2); + } } } } @@ -99,7 +119,8 @@ public class TileEntityChungus extends TileEntity implements IFluidAcceptor, IFl @Override public void networkUnpack(NBTTagCompound data) { this.power = data.getLong("power"); - this.shouldTurn = data.getBoolean("operational"); + this.turnTimer = data.getInteger("operational"); + this.tanks[0].setTankType(FluidType.values()[data.getInteger("type")]); } @Override @@ -126,7 +147,7 @@ public class TileEntityChungus extends TileEntity implements IFluidAcceptor, IFl @Override public void ffgeuaInit() { ForgeDirection dir = ForgeDirection.getOrientation(this.getBlockMetadata() - BlockDummyable.offset); - ffgeua(xCoord + dir.offsetX * -4, yCoord, zCoord + dir.offsetZ * -4, getTact()); + ffgeua(xCoord - dir.offsetX * 11, yCoord, zCoord - dir.offsetZ * 11, getTact()); } @Override @@ -135,8 +156,8 @@ public class TileEntityChungus extends TileEntity implements IFluidAcceptor, IFl ForgeDirection dir = ForgeDirection.getOrientation(this.getBlockMetadata() - BlockDummyable.offset); dir = dir.getRotation(ForgeDirection.UP); - fillFluid(xCoord + dir.offsetX * 2, yCoord, zCoord + dir.offsetZ * 2, getTact(), type); - fillFluid(xCoord + dir.offsetX * -2, yCoord, zCoord + dir.offsetZ * -2, getTact(), type); + fillFluid(xCoord + dir.offsetX * 3, yCoord, zCoord + dir.offsetZ * 3, getTact(), type); + fillFluid(xCoord + dir.offsetX * -3, yCoord, zCoord + dir.offsetZ * -3, getTact(), type); } @Override diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/RBMKDials.java b/src/main/java/com/hbm/tileentity/machine/rbmk/RBMKDials.java index 335cdbee1..665d05f2b 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/RBMKDials.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/RBMKDials.java @@ -17,6 +17,7 @@ public class RBMKDials { public static final String KEY_REACTIVITY_MOD = "dialReactivityMod"; public static final String KEY_SAVE_DIALS = "dialSaveDials"; public static final String KEY_OUTGASSER_MOD = "dialOutgasserSpeedMod"; + public static final String KEV_SURGE_MOD = "dialControlSurgeMod"; public static void createDials(World world) { GameRules rules = world.getGameRules(); @@ -27,19 +28,20 @@ public class RBMKDials { rules.setOrCreateGameRule(KEY_FUEL_DIFFUSION_MOD, "1.0"); rules.setOrCreateGameRule(KEY_HEAT_PROVISION, "0.2"); rules.setOrCreateGameRule(KEY_COLUMN_HEIGHT, "4"); - rules.setOrCreateGameRule(KEY_PERMANENT_SCRAP, "false"); + rules.setOrCreateGameRule(KEY_PERMANENT_SCRAP, "true"); rules.setOrCreateGameRule(KEY_BOILER_HEAT_CONSUMPTION, "0.1"); rules.setOrCreateGameRule(KEY_CONTROL_SPEED_MOD, "1.0"); rules.setOrCreateGameRule(KEY_REACTIVITY_MOD, "1.0"); rules.setOrCreateGameRule(KEY_SAVE_DIALS, "true"); rules.setOrCreateGameRule(KEY_OUTGASSER_MOD, "1.0"); + rules.setOrCreateGameRule(KEV_SURGE_MOD, "1.0"); } } /** * Returns the amount of heat per tick removed from components passively * @param world - * @return + * @return >0 */ public static double getPassiveCooling(World world) { return Math.max(shittyWorkaroundParseDouble(world.getGameRules().getGameRuleStringValue(KEY_PASSIVE_COOLING), 5.0D), 0.0D); @@ -102,7 +104,7 @@ public class RBMKDials { /** * A multiplier for how quickly the control rods move. * @param world - * @return + * @return >0 */ public static double getControlSpeed(World world) { return Math.max(shittyWorkaroundParseDouble(world.getGameRules().getGameRuleStringValue(KEY_CONTROL_SPEED_MOD), 1.0D), 0.0D); @@ -111,7 +113,7 @@ public class RBMKDials { /** * A multiplier for how much flux the rods give out. * @param world - * @return + * @return >0 */ public static double getReactivityMod(World world) { return Math.max(shittyWorkaroundParseDouble(world.getGameRules().getGameRuleStringValue(KEY_REACTIVITY_MOD), 1.0D), 0.0D); @@ -120,12 +122,21 @@ public class RBMKDials { /** * A multiplier for how much flux the rods give out. * @param world - * @return + * @return >0 */ public static double getOutgasserMod(World world) { return Math.max(shittyWorkaroundParseDouble(world.getGameRules().getGameRuleStringValue(KEY_OUTGASSER_MOD), 1.0D), 0.0D); } + /** + * A multiplier for how high the power surge goes when inserting control rods + * @param world + * @return >0 + */ + public static double getSurgeMod(World world) { + return Math.max(shittyWorkaroundParseDouble(world.getGameRules().getGameRuleStringValue(KEV_SURGE_MOD), 1.0D), 0.0D); + } + //why make the double representation accessible in a game rule when you can just force me to add a second pointless parsing operation? public static double shittyWorkaroundParseDouble(String s, double def) { diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBase.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBase.java index fcb36e7e5..0c7b2b3cf 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBase.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBase.java @@ -46,8 +46,16 @@ public abstract class TileEntityRBMKBase extends TileEntity implements INBTPacke public double heat; public boolean hasLid() { + + if(!isLidRemovable()) + return true; + return this.getBlockMetadata() != RBMKBase.DIR_NO_LID.ordinal() + RBMKBase.offset; } + + public boolean isLidRemovable() { + return true; + } /** * Approx melting point of steel @@ -125,8 +133,9 @@ public abstract class TileEntityRBMKBase extends TileEntity implements INBTPacke for(TileEntityRBMKBase rbmk : rec) { double delta = targetHeat - rbmk.heat; rbmk.heat += delta * stepSize; - rbmk.markDirty(); } + + this.markDirty(); } } diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKConsole.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKConsole.java index c772fcf5c..655ebe4e8 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKConsole.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKConsole.java @@ -123,7 +123,9 @@ public class TileEntityRBMKConsole extends TileEntityMachineBase implements ICon TileEntity te = worldObj.getTileEntity(targetX + x, targetY, targetZ + z); if(te instanceof TileEntityRBMKControlManual) { - ((TileEntityRBMKControlManual)te).targetLevel = MathHelper.clamp_double(data.getDouble("level"), 0, 1); + TileEntityRBMKControlManual rod = (TileEntityRBMKControlManual) te; + rod.startingLevel = rod.level; + rod.setTarget(MathHelper.clamp_double(data.getDouble("level"), 0, 1)); te.markDirty(); } } diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControl.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControl.java index c5873648f..1aa902da2 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControl.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControl.java @@ -1,6 +1,7 @@ package com.hbm.tileentity.machine.rbmk; import com.hbm.blocks.ModBlocks; +import com.hbm.blocks.machine.rbmk.RBMKBase; import com.hbm.entity.projectile.EntityRBMKDebris.DebrisType; import cpw.mods.fml.relauncher.Side; @@ -20,9 +21,10 @@ public abstract class TileEntityRBMKControl extends TileEntityRBMKSlottedBase { public TileEntityRBMKControl() { super(0); } - - public boolean hasLid() { - return true; + + @Override + public boolean isLidRemovable() { + return false; } @Override @@ -54,6 +56,14 @@ public abstract class TileEntityRBMKControl extends TileEntityRBMKSlottedBase { super.updateEntity(); } + public void setTarget(double target) { + this.targetLevel = target; + } + + public double getMult() { + return this.level; + } + @Override public int trackingRange() { return 150; @@ -83,6 +93,8 @@ public abstract class TileEntityRBMKControl extends TileEntityRBMKSlottedBase { @Override public void onMelt(int reduce) { + + RBMKBase.dropLids = false; reduce = MathHelper.clamp_int(reduce, 1, 3); @@ -111,6 +123,8 @@ public abstract class TileEntityRBMKControl extends TileEntityRBMKSlottedBase { spawnDebris(DebrisType.ROD); } + RBMKBase.dropLids = true; + //control rods will not spawn lid projectiles since the lid is already part of the rod projectiles //super.onMelt(reduce); } diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControlManual.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControlManual.java index ca3428182..bf935f872 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControlManual.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControlManual.java @@ -10,12 +10,30 @@ import net.minecraft.util.Vec3; public class TileEntityRBMKControlManual extends TileEntityRBMKControl implements IControlReceiver { public RBMKColor color; + public double startingLevel; @Override public String getName() { return "container.rbmkControl"; } + @Override + public void setTarget(double target) { + this.targetLevel = target; + this.startingLevel = this.level; + } + + public double getMult() { + + double surge = 0; + + if(this.targetLevel < this.startingLevel && this.level != this.targetLevel) { + surge = Math.sin(Math.pow(this.level, 15) * Math.PI) * (this.startingLevel - this.targetLevel) * RBMKDials.getSurgeMod(worldObj); + } + + return this.level + surge; + } + @Override public boolean hasPermission(EntityPlayer player) { return Vec3.createVectorHelper(xCoord - player.posX, yCoord - player.posY, zCoord - player.posZ).lengthVector() < 20; @@ -25,7 +43,7 @@ public class TileEntityRBMKControlManual extends TileEntityRBMKControl implement public void receiveControl(NBTTagCompound data) { if(data.hasKey("level")) { - this.targetLevel = data.getDouble("level"); + this.setTarget(data.getDouble("level")); } if(data.hasKey("color")) { diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java index 84f0873d8..2d5095999 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java @@ -142,10 +142,10 @@ public class TileEntityRBMKRod extends TileEntityRBMKSlottedBase implements IRBM if(te instanceof TileEntityRBMKControl) { TileEntityRBMKControl control = (TileEntityRBMKControl)te; - if(control.level == 0.0D) + if(control.getMult() == 0.0D) break; - flux *= control.level; + flux *= control.getMult(); continue; } diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index 475a1a259..971408da8 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -704,6 +704,7 @@ item.billet_pu238.name=Plutonium-238-Billet item.billet_pu238be.name=Pu238Be-Billet item.billet_pu239.name=Plutonium-239-Billet item.billet_pu240.name=Plutonium-240-Billet +item.billet_pu241.name=Plutonium-241-Billet item.billet_plutonium.name=Plutoniumbillet item.billet_plutonium_fuel.name=Plutoniumkernbrennstoffbillet item.billet_schrabidium.name=Schrabidiumbillet @@ -1118,6 +1119,7 @@ item.fluid_identifier.name=Flüssigkeits-Kennzeichnung item.fluid_tank_empty.name=Leere universelle Flüssigkeitszelle item.fluid_tank_full.name=Universelle Flüssigkeitszelle: item.fluorite.name=Fluorit +item.flywheel_beryllium.name=Berylliumschwungscheibe item.fmn.name=Flunitrazepamtablette item.folly_bullet.name=12,8cm Sternenmetall-Hochenergiegeschoss item.folly_bullet_du.name=12,8cm DU-Geschoss @@ -1415,6 +1417,7 @@ item.ingot_solinium.name=Soliniumbarren item.ingot_starmetal.name=§9Sternenmetallbarren§r item.ingot_steel.name=Stahlbarren item.ingot_steel_dusted.name=Bestäubter Stahlbarren +item.ingot_tcalloy.name=Technetiumstahlbarren item.ingot_technetium.name=Technetium-99-Barren item.ingot_th232.name=Thorium-232-Barren item.ingot_thorium_fuel.name=Thoriumkernbrennstoffbarren @@ -1935,6 +1938,7 @@ item.powder_spark_mix.name=Sparkmischung item.powder_steel.name=Stahlstaub item.powder_steel_tiny.name=Kleiner Haufen Stahlstaub item.powder_strontium.name=Strontiumstaub +item.powder_tcalloy.name=Technetiumstahlstaub item.powder_tennessine.name=Tennessinstaub item.powder_thermite.name=Thermit item.powder_thorium.name=Thoriumstaub @@ -1966,11 +1970,13 @@ item.rbmk_fuel_drx.name=§cDigamma-RBMK-Kernbrennstoff item.rbmk_fuel_empty.name=Leere RBMK Kernbrennstoffstäbe item.rbmk_fuel_heaus.name=HEAus-RBMK-Kernbrennstoff item.rbmk_fuel_hes.name=HES-RBMK-Kernbrennstoff +item.rbmk_fuel_hep.name=HEP-239-RBMK-Kernbrennstoff +item.rbmk_fuel_hep241.name=HEP-241-RBMK-Kernbrennstoff item.rbmk_fuel_leaus.name=LEAus-RBMK-Kernbrennstoff -item.rbmk_fuel_lep.name=LEP-RBMK-Kernbrennstoff +item.rbmk_fuel_lep.name=LEP-239-RBMK-Kernbrennstoff item.rbmk_fuel_les.name=LES-RBMK-Kernbrennstoff item.rbmk_fuel_men.name=MEN-RBMK-Kernbrennstoff -item.rbmk_fuel_mep.name=MEP-RBMK-Kernbrennstoff +item.rbmk_fuel_mep.name=MEP-239-RBMK-Kernbrennstoff item.rbmk_fuel_mes.name=MES-RBMK-Kernbrennstoff item.rbmk_fuel_meu.name=MEU-RBMK-Kernbrennstoff item.rbmk_fuel_mox.name=MOX-RBMK-Kernbrennstoff @@ -2464,6 +2470,7 @@ tile.barrel_corroded.name=Verrostetes Fass tile.barrel_iron.name=Eisenfass tile.barrel_plastic.name=Sicheres Fass™ tile.barrel_steel.name=Stahlfass +tile.barrel_tcalloy.name=Technetiumstahlfass tile.barricade.name=Sandsäcke tile.blast_door.name=Abschluss-Sprengtür tile.block_actinium.name=Actiniumblock @@ -2769,6 +2776,7 @@ tile.machine_boiler_off.name=Dampfkessel tile.machine_boiler_on.name=Dampfkessel tile.machine_centrifuge.name=Zentrifuge tile.machine_chemplant.name=Chemiefabrik +tile.machine_chungus.name=Leviathan-Dampfturbine tile.machine_coal_off.name=Verbrennungsgenerator tile.machine_coal_on.name=Verbrennungsgenerator tile.machine_combine_factory.name=CMB-Stahl Hochofen @@ -3120,7 +3128,7 @@ trait.rbmx.skinTemp=Außenentropie: %s trait.rbmx.source=Selbstverbrennend trait.rbmx.splitsInto=Verlässt nach: %s trait.rbmx.splitsWith=Kommt von: %s -trait.rbmx.xenon=Belivergiftung: %s +trait.rbmx.xenon=Bleivergiftung: %s trait.rbmx.xenonBurn=Blei-Verbr.-Funkion: %s trait.rbmx.xenonGen=Blei-Erzg.-Funktion: %s diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index fd17ed64e..0ffde022f 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -772,6 +772,7 @@ item.billet_pu238.name=Plutonium-238 Billet item.billet_pu238be.name=Pu238Be Billet item.billet_pu239.name=Plutonium-239 Billet item.billet_pu240.name=Plutonium-240 Billet +item.billet_pu241.name=Plutonium-241 Billet item.billet_plutonium.name=Plutonium Billet item.billet_plutonium_fuel.name=Plutonium Fuel Billet item.billet_schrabidium.name=Schrabidium Billet @@ -1186,6 +1187,7 @@ item.fluid_identifier.name=Fluid Identifier item.fluid_tank_empty.name=Empty Universal Fluid Tank item.fluid_tank_full.name=Universal Fluid Tank: item.fluorite.name=Fluorite +item.flywheel_beryllium.name=Beryllium Flywheel item.fmn.name=Flunitrazepam Tablet item.folly_bullet.name=12.8cm Starmetal High-Energy Shell item.folly_bullet_du.name=12.8cm DU-Shell @@ -1483,6 +1485,7 @@ item.ingot_solinium.name=Solinium Ingot item.ingot_starmetal.name=§9Starmetal Ingot§r item.ingot_steel.name=Steel Ingot item.ingot_steel_dusted.name=Dusted Steel Ingot +item.ingot_tcalloy.name=Technetium Steel Ingot item.ingot_technetium.name=Technetium-99 Ingot item.ingot_th232.name=Thorium-232 Ingot item.ingot_thorium_fuel.name=Ingot of Thorium Fuel @@ -2003,6 +2006,7 @@ item.powder_spark_mix.name=Spark Blend item.powder_steel.name=Steel Powder item.powder_steel_tiny.name=Tiny Pile of Steel Powder item.powder_strontium.name=Strontium Powder +item.powder_tcalloy.name=Technetium Steel Powder item.powder_tennessine.name=Tennessine Powder item.powder_thermite.name=Thermite item.powder_thorium.name=Thorium Powder @@ -2034,11 +2038,13 @@ item.rbmk_fuel_drx.name=§cDigamma RBMK Fuel Rod§r item.rbmk_fuel_empty.name=Empty RBMK Fuel Rod item.rbmk_fuel_heaus.name=HEAus RBMK Fuel Rod item.rbmk_fuel_hes.name=HES RBMK Fuel Rod +item.rbmk_fuel_hep.name=HEP-239 RBMK Fuel Rod +item.rbmk_fuel_hep241.name=HEP-241 RBMK Fuel Rod item.rbmk_fuel_leaus.name=LEAus RBMK Fuel Rod -item.rbmk_fuel_lep.name=LEP RBMK Fuel Rod +item.rbmk_fuel_lep.name=LEP-239 RBMK Fuel Rod item.rbmk_fuel_les.name=LES RBMK Fuel Rod item.rbmk_fuel_men.name=MEN RBMK Fuel Rod -item.rbmk_fuel_mep.name=MEP RBMK Fuel Rod +item.rbmk_fuel_mep.name=MEP-239 RBMK Fuel Rod item.rbmk_fuel_mes.name=MES RBMK Fuel Rod item.rbmk_fuel_meu.name=MEU RBMK Fuel Rod item.rbmk_fuel_mox.name=MOX RBMK Fuel Rod @@ -2532,6 +2538,7 @@ tile.barrel_corroded.name=Corroded Barrel tile.barrel_iron.name=Iron Barrel tile.barrel_plastic.name=Safe Barrel™ tile.barrel_steel.name=Steel Barrel +tile.barrel_tcalloy.name=Technetium Steel Barrel tile.barricade.name=Sand Bags tile.blast_door.name=Sliding Blast Door tile.block_actinium.name=Block of Actinium @@ -2853,6 +2860,7 @@ tile.machine_boiler_off.name=Boiler tile.machine_boiler_on.name=Boiler tile.machine_centrifuge.name=Centrifuge tile.machine_chemplant.name=Chemical Plant +tile.machine_chungus.name=Leviathan Steam Turbine tile.machine_coal_off.name=Combustion Generator tile.machine_coal_on.name=Combustion Generator tile.machine_combine_factory.name=CMB Steel Furnace diff --git a/src/main/resources/assets/hbm/models/machines/chungus.obj b/src/main/resources/assets/hbm/models/machines/chungus.obj index d1d795ec5..9c4aaddb8 100644 --- a/src/main/resources/assets/hbm/models/machines/chungus.obj +++ b/src/main/resources/assets/hbm/models/machines/chungus.obj @@ -49,9 +49,75 @@ v 2.591854 1.725000 4.371209 v 2.658146 1.725000 4.371209 v 2.591854 1.850000 4.433709 v 2.658146 1.850000 4.433709 +v 2.558709 1.225000 4.433709 +v 2.625000 1.225000 4.406250 +v 2.531250 1.225000 4.500000 +v 2.558709 1.225000 4.566291 +v 2.625000 1.225000 4.593750 +v 2.691291 1.225000 4.566291 +v 2.718750 1.225000 4.500000 +v 2.691291 1.225000 4.433709 +v 2.558709 1.725000 4.433709 +v 2.625000 1.725000 4.406250 +v 2.531250 1.725000 4.500000 +v 2.558709 1.725000 4.566291 +v 2.625000 1.725000 4.593750 +v 2.691291 1.725000 4.566291 +v 2.718750 1.725000 4.500000 +v 2.691291 1.725000 4.433709 +v 2.591854 1.037500 4.464959 +v 2.658146 1.037500 4.464959 +v 2.591854 1.225000 4.339959 +v 2.658146 1.225000 4.339959 +v 2.591854 1.725000 4.339959 +v 2.658146 1.725000 4.339959 +v 2.591854 1.850000 4.402459 +v 2.658146 1.850000 4.402459 +v 2.591854 1.037500 4.496209 +v 2.658146 1.037500 4.496209 +v 2.591854 1.225000 4.371209 +v 2.658146 1.225000 4.371209 +v 2.591854 1.725000 4.371209 +v 2.658146 1.725000 4.371209 +v 2.591854 1.850000 4.433709 +v 2.658146 1.850000 4.433709 +vt 0.176596 0.128472 +vt 0.174468 0.142361 +vt 0.174468 0.128472 +vt 0.178723 0.177083 +vt 0.180851 0.170139 +vt 0.180851 0.177083 +vt 0.176596 0.180556 +vt 0.174468 0.177083 +vt 0.176596 0.177083 +vt 0.176596 0.170139 +vt 0.176596 0.142361 +vt 0.178723 0.128472 +vt 0.180851 0.142361 +vt 0.178723 0.142361 +vt 0.174468 0.170139 +vt 0.178723 0.170139 vt 0.161702 0.180556 vt 0.161702 0.187500 vt 0.157447 0.187500 +vt 0.161702 0.215278 +vt 0.161702 0.222222 +vt 0.157447 0.222222 +vt 0.174468 0.180556 +vt 0.180851 0.128472 +vt 0.157447 0.184028 +vt 0.157447 0.180556 +vt 0.159574 0.180556 +vt 0.161702 0.184028 +vt 0.159574 0.187500 +vt 0.157447 0.218750 +vt 0.157447 0.215278 +vt 0.159574 0.215278 +vt 0.161702 0.218750 +vt 0.159574 0.222222 +vt 0.178723 0.170139 +vt 0.176596 0.142361 +vt 0.178723 0.142361 vt 0.168085 0.128472 vt 0.165957 0.180556 vt 0.165957 0.128472 @@ -69,15 +135,17 @@ vt 0.163830 0.180556 vt 0.159574 0.180556 vt 0.174468 0.128472 vt 0.172340 0.180556 -vt 0.161702 0.215278 -vt 0.161702 0.222222 -vt 0.157447 0.222222 +vt 0.176596 0.128472 +vt 0.178723 0.128472 vt 0.168085 0.187500 vt 0.165957 0.215278 vt 0.165957 0.187500 vt 0.163830 0.187500 +vt 0.161702 0.215278 +vt 0.161702 0.187500 vt 0.159574 0.187500 vt 0.157447 0.215278 +vt 0.157447 0.187500 vt 0.172340 0.187500 vt 0.170213 0.215278 vt 0.170213 0.187500 @@ -86,11 +154,6 @@ vt 0.163830 0.215278 vt 0.159574 0.215278 vt 0.174468 0.187500 vt 0.172340 0.215278 -vt 0.178723 0.142361 -vt 0.176596 0.128472 -vt 0.178723 0.128472 -vt 0.178723 0.170139 -vt 0.176596 0.142361 vt 0.178723 0.177083 vt 0.176596 0.170139 vt 0.182979 0.128472 @@ -100,119 +163,107 @@ vt 0.182979 0.142361 vt 0.180851 0.170139 vt 0.182979 0.170139 vt 0.180851 0.177083 -vt 0.174468 0.142361 -vt 0.174468 0.128472 -vt 0.176596 0.180556 -vt 0.174468 0.177083 -vt 0.176596 0.177083 -vt 0.174468 0.170139 -vt 0.157447 0.184028 -vt 0.157447 0.180556 -vt 0.159574 0.180556 -vt 0.161702 0.184028 vt 0.174468 0.180556 -vt 0.157447 0.218750 -vt 0.161702 0.218750 -vt 0.159574 0.222222 vt 0.174468 0.215278 +vt 0.176596 0.177083 vt 0.182979 0.177083 -vt 0.174468 0.180556 -vn 0.0000 -1.0000 0.0000 -vn 0.9239 0.0000 -0.3827 -vn 0.3827 0.0000 0.9239 -vn -0.9239 0.0000 0.3827 -vn -0.3827 0.0000 -0.9239 -vn 0.3827 0.0000 -0.9239 -vn 0.9239 0.0000 0.3827 -vn -0.3827 0.0000 0.9239 -vn -0.9239 0.0000 -0.3827 -vn 0.0000 1.0000 0.0000 -vn 0.0000 -0.5547 -0.8321 -vn 0.0000 0.0000 -1.0000 -vn 0.0000 0.4472 -0.8944 -vn 0.0000 0.5547 0.8321 -vn 0.0000 0.0000 1.0000 -vn 0.0000 -0.4472 0.8944 vn 1.0000 0.0000 0.0000 vn -1.0000 0.0000 0.0000 +vn 0.0000 1.0000 0.0000 +vn 0.0000 -1.0000 0.0000 +vn 0.0000 0.2297 -0.9732 +vn 0.0000 -0.2898 -0.9571 +vn 0.7071 0.0000 -0.7071 +vn 0.7071 0.0000 0.7071 +vn 0.0000 0.0000 1.0000 +vn -0.7071 0.0000 0.7071 +vn -0.7071 0.0000 -0.7071 +vn 0.0000 0.0000 -1.0000 +vn 0.0000 -0.5547 -0.8320 +vn 0.0000 0.4472 -0.8944 +vn 0.0000 0.5547 0.8320 +vn 0.0000 0.2898 0.9571 +vn 0.0000 -0.2297 0.9732 +vn 0.0000 -0.4472 0.8944 s off -f 23/1/1 21/2/1 19/3/1 -f 8/4/2 15/5/2 7/6/2 -f 6/7/3 13/8/3 5/9/3 -f 4/10/4 11/11/4 3/12/4 -f 2/13/5 10/14/5 1/15/5 -f 1/15/6 16/16/6 8/4/6 -f 7/6/7 14/17/7 6/7/7 -f 5/9/8 12/18/8 4/10/8 -f 3/19/9 9/20/9 2/13/9 -f 29/21/10 31/22/10 26/23/10 -f 24/24/2 31/25/2 23/26/2 -f 22/27/3 29/21/3 21/2/3 -f 20/28/4 27/29/4 19/3/4 -f 17/30/5 26/31/5 18/32/5 -f 18/32/6 32/33/6 24/24/6 -f 23/26/7 30/34/7 22/27/7 -f 21/2/8 28/35/8 20/28/8 -f 19/36/9 25/37/9 17/30/9 -f 35/38/11 34/39/11 33/40/11 -f 37/41/12 36/42/12 35/38/12 -f 39/43/13 38/44/13 37/41/13 -f 42/45/14 43/46/14 41/47/14 -f 44/48/15 45/49/15 43/46/15 -f 46/50/16 47/51/16 45/49/16 -f 34/39/17 44/52/17 42/53/17 -f 39/43/18 45/49/18 47/51/18 -f 39/54/10 48/55/10 40/56/10 -f 38/44/17 44/52/17 36/42/17 -f 33/40/18 43/46/18 35/38/18 -f 40/56/17 46/57/17 38/44/17 -f 35/38/18 45/49/18 37/41/18 -f 19/3/1 17/58/1 18/59/1 -f 18/59/1 24/60/1 23/1/1 -f 23/1/1 22/61/1 21/2/1 -f 21/2/1 20/28/1 19/3/1 -f 19/3/1 18/59/1 23/1/1 -f 8/4/2 16/16/2 15/5/2 -f 6/7/3 14/17/3 13/8/3 -f 4/10/4 12/18/4 11/11/4 -f 2/13/5 9/20/5 10/14/5 -f 1/15/6 10/14/6 16/16/6 -f 7/6/7 15/5/7 14/17/7 -f 5/9/8 13/8/8 12/18/8 -f 3/19/9 11/62/9 9/20/9 -f 26/23/10 25/63/10 27/29/10 -f 27/29/10 28/35/10 29/21/10 -f 29/21/10 30/64/10 31/22/10 -f 31/22/10 32/65/10 26/23/10 -f 26/23/10 27/29/10 29/21/10 -f 24/24/2 32/33/2 31/25/2 -f 22/27/3 30/34/3 29/21/3 -f 20/28/4 28/35/4 27/29/4 -f 17/30/5 25/37/5 26/31/5 -f 18/32/6 26/31/6 32/33/6 -f 23/26/7 31/25/7 30/34/7 -f 21/2/8 29/21/8 28/35/8 -f 19/36/9 27/66/9 25/37/9 -f 35/38/11 36/42/11 34/39/11 -f 37/41/12 38/44/12 36/42/12 -f 39/43/13 40/56/13 38/44/13 -f 42/45/14 44/48/14 43/46/14 -f 44/48/15 46/50/15 45/49/15 -f 46/50/16 48/67/16 47/51/16 -f 34/39/17 36/42/17 44/52/17 -f 39/43/18 37/41/18 45/49/18 -f 39/54/10 47/68/10 48/55/10 -f 38/44/17 46/57/17 44/52/17 -f 33/40/18 41/47/18 43/46/18 -f 40/56/17 48/55/17 46/57/17 -f 35/38/18 43/46/18 45/49/18 +f 34/1/1 44/2/1 42/3/1 +f 39/4/2 45/5/2 47/6/2 +f 39/7/3 48/8/3 40/9/3 +f 38/10/1 44/2/1 36/11/1 +f 33/12/2 43/13/2 35/14/2 +f 40/9/1 46/15/1 38/10/1 +f 35/14/2 45/5/2 37/16/2 +f 55/17/4 53/18/4 51/19/4 +f 61/20/3 63/21/3 58/22/3 +f 34/1/1 36/11/1 44/2/1 +f 39/4/2 37/16/2 45/5/2 +f 39/7/3 47/23/3 48/8/3 +f 38/10/1 46/15/1 44/2/1 +f 33/12/2 41/24/2 43/13/2 +f 40/9/1 48/8/1 46/15/1 +f 35/14/2 43/13/2 45/5/2 +f 51/19/4 49/25/4 50/26/4 +f 50/26/4 56/27/4 55/17/4 +f 55/17/4 54/28/4 53/18/4 +f 53/18/4 52/29/4 51/19/4 +f 51/19/4 50/26/4 55/17/4 +f 58/22/3 57/30/3 59/31/3 +f 59/31/3 60/32/3 61/20/3 +f 61/20/3 62/33/3 63/21/3 +f 63/21/3 64/34/3 58/22/3 +f 58/22/3 59/31/3 61/20/3 +s 1 +f 69/35/5 68/36/6 67/37/6 +f 8/38/7 15/39/1 7/40/1 +f 6/41/8 13/42/9 5/43/9 +f 4/44/10 11/45/2 3/46/2 +f 2/47/11 10/48/12 1/49/12 +f 1/49/12 16/50/7 8/38/7 +f 7/40/1 14/51/8 6/41/8 +f 5/43/9 12/52/10 4/44/10 +f 3/53/2 9/54/11 2/47/11 +f 67/37/6 66/55/13 65/56/13 +f 24/57/7 31/58/1 23/59/1 +f 22/60/8 29/61/9 21/62/9 +f 20/63/10 27/64/2 19/65/2 +f 17/66/11 26/67/12 18/68/12 +f 18/68/12 32/69/7 24/57/7 +f 23/59/1 30/70/8 22/60/8 +f 21/62/9 28/71/10 20/63/10 +f 19/72/2 25/73/11 17/66/11 +f 71/74/14 70/75/5 69/35/5 +f 74/76/15 75/77/16 73/78/15 +f 76/79/16 77/80/17 75/77/16 +f 78/81/17 79/82/18 77/80/17 +f 69/35/5 70/75/5 68/36/6 +f 8/38/7 16/50/7 15/39/1 +f 6/41/8 14/51/8 13/42/9 +f 4/44/10 12/52/10 11/45/2 +f 2/47/11 9/54/11 10/48/12 +f 1/49/12 10/48/12 16/50/7 +f 7/40/1 15/39/1 14/51/8 +f 5/43/9 13/42/9 12/52/10 +f 3/53/2 11/83/2 9/54/11 +f 67/37/6 68/36/6 66/55/13 +f 24/57/7 32/69/7 31/58/1 +f 22/60/8 30/70/8 29/61/9 +f 20/63/10 28/71/10 27/64/2 +f 17/66/11 25/73/11 26/67/12 +f 18/68/12 26/67/12 32/69/7 +f 23/59/1 31/58/1 30/70/8 +f 21/62/9 29/61/9 28/71/10 +f 19/72/2 27/84/2 25/73/11 +f 71/74/14 72/85/14 70/75/5 +f 74/76/15 76/79/16 75/77/16 +f 76/79/16 78/81/17 77/80/17 +f 78/81/17 80/86/18 79/82/18 o Blades v -0.216506 2.500000 4.125000 v 0.216506 2.500000 3.875000 v -0.216506 4.750000 4.125000 v 0.216506 4.750000 3.875000 -v 0.216506 2.500000 4.375000 -v -0.216506 2.500000 4.625000 +v 0.216506 2.500000 4.625000 +v -0.216506 2.500000 4.875000 v 0.000000 2.750000 3.750000 v 0.000000 2.750000 5.250000 v 0.176777 2.676777 3.750000 @@ -229,8 +280,8 @@ v -0.250000 2.500000 3.750000 v -0.250000 2.500000 5.250000 v -0.176777 2.676777 3.750000 v -0.176777 2.676777 5.250000 -v -0.216506 4.250000 4.625000 -v 0.216506 4.250000 4.375000 +v -0.216506 4.250000 4.875000 +v 0.216506 4.250000 4.625000 v 0.216506 2.500000 4.875000 v -0.216506 2.500000 5.125000 v -0.216506 4.750000 5.125000 @@ -239,10 +290,10 @@ v 0.216506 2.500000 4.125000 v -0.216506 2.500000 3.875000 v 0.216506 0.250000 4.125000 v -0.216507 0.250000 3.875000 -v -0.216506 2.500000 4.375000 -v 0.216506 2.500000 4.625000 -v 0.216506 0.750000 4.625000 -v -0.216507 0.750000 4.375000 +v -0.216506 2.500000 4.625000 +v 0.216506 2.500000 4.875000 +v 0.216506 0.750000 4.875000 +v -0.216507 0.750000 4.625000 v -0.216506 2.500000 4.875000 v 0.216506 2.500000 5.125000 v 0.216506 0.250000 5.125000 @@ -251,10 +302,10 @@ v 0.000000 2.716506 4.125000 v 0.000000 2.283494 3.875000 v 2.250000 2.716506 4.125000 v 2.250000 2.283493 3.875000 -v 0.000000 2.283494 4.375000 -v 0.000000 2.716506 4.625000 -v 1.750000 2.716506 4.625000 -v 1.750000 2.283494 4.375000 +v 0.000000 2.283494 4.625000 +v 0.000000 2.716506 4.875000 +v 1.750000 2.716506 4.875000 +v 1.750000 2.283493 4.625000 v 0.000000 2.283494 4.875000 v 0.000000 2.716506 5.125000 v 2.250000 2.716506 5.125000 @@ -263,10 +314,10 @@ v 0.000000 2.283494 4.125000 v 0.000000 2.716506 3.875000 v -2.250000 2.283494 4.125000 v -2.250000 2.716507 3.875000 -v 0.000000 2.716506 4.375000 -v 0.000000 2.283494 4.625000 -v -1.750000 2.283494 4.625000 -v -1.750000 2.716506 4.375000 +v 0.000000 2.716506 4.625000 +v 0.000000 2.283494 4.875000 +v -1.750000 2.283494 4.875000 +v -1.750000 2.716507 4.625000 v 0.000000 2.716506 4.875000 v 0.000000 2.283494 5.125000 v -2.250000 2.283494 5.125000 @@ -275,10 +326,10 @@ v -0.153093 2.653093 4.125000 v 0.153093 2.346907 3.875000 v 1.437897 4.244083 4.125000 v 1.744083 3.937897 3.875000 -v 0.153093 2.346907 4.375000 -v -0.153093 2.653093 4.625000 -v 1.084344 3.890530 4.625000 -v 1.390530 3.584344 4.375000 +v 0.153093 2.346907 4.625000 +v -0.153093 2.653093 4.875000 +v 1.084344 3.890530 4.875000 +v 1.390530 3.584344 4.625000 v 0.153093 2.346907 4.875000 v -0.153093 2.653093 5.125000 v 1.437897 4.244083 5.125000 @@ -287,10 +338,10 @@ v 0.153093 2.346907 4.125000 v -0.153093 2.653093 3.875000 v -1.437897 0.755917 4.125000 v -1.744083 1.062103 3.875000 -v -0.153093 2.653093 4.375000 -v 0.153093 2.346907 4.625000 -v -1.084344 1.109470 4.625000 -v -1.390530 1.415656 4.375000 +v -0.153093 2.653093 4.625000 +v 0.153093 2.346907 4.875000 +v -1.084344 1.109470 4.875000 +v -1.390530 1.415656 4.625000 v -0.153093 2.653093 4.875000 v 0.153093 2.346907 5.125000 v -1.437897 0.755917 5.125000 @@ -299,10 +350,10 @@ v 0.153093 2.653093 4.125000 v -0.153093 2.346907 3.875000 v 1.744083 1.062103 4.125000 v 1.437897 0.755917 3.875000 -v -0.153093 2.346907 4.375000 -v 0.153093 2.653093 4.625000 -v 1.390530 1.415656 4.625000 -v 1.084344 1.109470 4.375000 +v -0.153093 2.346907 4.625000 +v 0.153093 2.653093 4.875000 +v 1.390530 1.415656 4.875000 +v 1.084344 1.109470 4.625000 v -0.153093 2.346907 4.875000 v 0.153093 2.653093 5.125000 v 1.744083 1.062103 5.125000 @@ -311,10 +362,10 @@ v -0.153093 2.346907 4.125000 v 0.153093 2.653093 3.875000 v -1.744083 3.937897 4.125000 v -1.437897 4.244083 3.875000 -v 0.153093 2.653093 4.375000 -v -0.153093 2.346907 4.625000 -v -1.390530 3.584344 4.625000 -v -1.084344 3.890530 4.375000 +v 0.153093 2.653093 4.625000 +v -0.153093 2.346907 4.875000 +v -1.390530 3.584344 4.875000 +v -1.084344 3.890530 4.625000 v 0.153093 2.653093 4.875000 v -0.153093 2.346907 5.125000 v -1.744083 3.937897 5.125000 @@ -323,10 +374,10 @@ v -0.200026 2.582853 4.125000 v 0.200026 2.417147 3.875000 v 0.661012 4.661582 4.125000 v 1.061064 4.495875 3.875000 -v 0.200026 2.417147 4.375000 -v -0.200026 2.582853 4.625000 -v 0.469670 4.199642 4.625000 -v 0.869722 4.033936 4.375000 +v 0.200026 2.417147 4.625000 +v -0.200026 2.582853 4.875000 +v 0.469670 4.199642 4.875000 +v 0.869722 4.033936 4.625000 v 0.200026 2.417147 4.875000 v -0.200026 2.582853 5.125000 v 0.661012 4.661582 5.125000 @@ -335,10 +386,10 @@ v 0.200026 2.417147 4.125000 v -0.200026 2.582853 3.875000 v -0.661013 0.338418 4.125000 v -1.061064 0.504125 3.875000 -v -0.200026 2.582853 4.375000 -v 0.200026 2.417147 4.625000 -v -0.469670 0.800358 4.625000 -v -0.869722 0.966064 4.375000 +v -0.200026 2.582853 4.625000 +v 0.200026 2.417147 4.875000 +v -0.469670 0.800358 4.875000 +v -0.869722 0.966064 4.625000 v -0.200026 2.582853 4.875000 v 0.200026 2.417147 5.125000 v -0.661013 0.338418 5.125000 @@ -347,10 +398,10 @@ v 0.082853 2.700026 4.125000 v -0.082853 2.299974 3.875000 v 2.161582 1.838987 4.125000 v 1.995875 1.438936 3.875000 -v -0.082853 2.299974 4.375000 -v 0.082853 2.700026 4.625000 -v 1.699642 2.030330 4.625000 -v 1.533936 1.630278 4.375000 +v -0.082853 2.299974 4.625000 +v 0.082853 2.700026 4.875000 +v 1.699642 2.030330 4.875000 +v 1.533936 1.630278 4.625000 v -0.082853 2.299974 4.875000 v 0.082853 2.700026 5.125000 v 2.161582 1.838987 5.125000 @@ -359,10 +410,10 @@ v -0.082853 2.299974 4.125000 v 0.082853 2.700026 3.875000 v -2.161582 3.161013 4.125000 v -1.995875 3.561064 3.875000 -v 0.082853 2.700026 4.375000 -v -0.082853 2.299974 4.625000 -v -1.699642 2.969670 4.625000 -v -1.533936 3.369722 4.375000 +v 0.082853 2.700026 4.625000 +v -0.082853 2.299974 4.875000 +v -1.699642 2.969670 4.875000 +v -1.533936 3.369722 4.625000 v 0.082853 2.700026 4.875000 v -0.082853 2.299974 5.125000 v -2.161582 3.161013 5.125000 @@ -371,10 +422,10 @@ v -0.082853 2.700026 4.125000 v 0.082853 2.299974 3.875000 v 1.995875 3.561064 4.125000 v 2.161582 3.161012 3.875000 -v 0.082853 2.299974 4.375000 -v -0.082853 2.700026 4.625000 -v 1.533936 3.369722 4.625000 -v 1.699642 2.969670 4.375000 +v 0.082853 2.299974 4.625000 +v -0.082853 2.700026 4.875000 +v 1.533936 3.369722 4.875000 +v 1.699642 2.969670 4.625000 v 0.082853 2.299974 4.875000 v -0.082853 2.700026 5.125000 v 1.995875 3.561064 5.125000 @@ -383,10 +434,10 @@ v 0.082853 2.299974 4.125000 v -0.082853 2.700026 3.875000 v -1.995875 1.438937 4.125000 v -2.161582 1.838988 3.875000 -v -0.082853 2.700026 4.375000 -v 0.082853 2.299974 4.625000 -v -1.533936 1.630279 4.625000 -v -1.699642 2.030330 4.375000 +v -0.082853 2.700026 4.625000 +v 0.082853 2.299974 4.875000 +v -1.533936 1.630279 4.875000 +v -1.699642 2.030330 4.625000 v -0.082853 2.700026 4.875000 v 0.082853 2.299974 5.125000 v -1.995875 1.438937 5.125000 @@ -395,10 +446,10 @@ v 0.200026 2.582853 4.125000 v -0.200026 2.417147 3.875000 v 1.061063 0.504125 4.125000 v 0.661012 0.338418 3.875000 -v -0.200026 2.417147 4.375000 -v 0.200026 2.582853 4.625000 -v 0.869721 0.966064 4.625000 -v 0.469670 0.800357 4.375000 +v -0.200026 2.417147 4.625000 +v 0.200026 2.582853 4.875000 +v 0.869721 0.966064 4.875000 +v 0.469670 0.800358 4.625000 v -0.200026 2.417147 4.875000 v 0.200026 2.582853 5.125000 v 1.061063 0.504125 5.125000 @@ -407,10 +458,10 @@ v -0.200026 2.417147 4.125000 v 0.200026 2.582853 3.875000 v -1.061063 4.495875 4.125000 v -0.661012 4.661582 3.875000 -v 0.200026 2.582853 4.375000 -v -0.200026 2.417147 4.625000 -v -0.869721 4.033936 4.625000 -v -0.469670 4.199642 4.375000 +v 0.200026 2.582853 4.625000 +v -0.200026 2.417147 4.875000 +v -0.869721 4.033936 4.875000 +v -0.469670 4.199642 4.625000 v 0.200026 2.582853 4.875000 v -0.200026 2.417147 5.125000 v -1.061063 4.495875 5.125000 @@ -419,10 +470,10 @@ v -0.212346 2.542238 4.125000 v 0.212346 2.457762 3.875000 v 0.226607 4.749004 4.125000 v 0.651299 4.664528 3.875000 -v 0.212346 2.457762 4.375000 -v -0.212346 2.542238 4.625000 -v 0.129062 4.258613 4.625000 -v 0.553755 4.174135 4.375000 +v 0.212346 2.457762 4.625000 +v -0.212346 2.542238 4.875000 +v 0.129062 4.258613 4.875000 +v 0.553755 4.174135 4.625000 v 0.212346 2.457762 4.875000 v -0.212346 2.542238 5.125000 v 0.226607 4.749004 5.125000 @@ -431,10 +482,10 @@ v 0.212346 2.457762 4.125000 v -0.212346 2.542238 3.875000 v -0.226607 0.250995 4.125000 v -0.651299 0.335471 3.875000 -v -0.212346 2.542238 4.375000 -v 0.212346 2.457762 4.625000 -v -0.129062 0.741387 4.625000 -v -0.553755 0.825864 4.375000 +v -0.212346 2.542238 4.625000 +v 0.212346 2.457762 4.875000 +v -0.129062 0.741387 4.875000 +v -0.553755 0.825865 4.625000 v -0.212346 2.542238 4.875000 v 0.212346 2.457762 5.125000 v -0.226607 0.250995 5.125000 @@ -443,10 +494,10 @@ v 0.042238 2.712346 4.125000 v -0.042238 2.287654 3.875000 v 2.249005 2.273393 4.125000 v 2.164529 1.848701 3.875000 -v -0.042238 2.287654 4.375000 -v 0.042238 2.712346 4.625000 -v 1.758613 2.370938 4.625000 -v 1.674136 1.946246 4.375000 +v -0.042238 2.287654 4.625000 +v 0.042238 2.712346 4.875000 +v 1.758613 2.370938 4.875000 +v 1.674136 1.946245 4.625000 v -0.042238 2.287654 4.875000 v 0.042238 2.712346 5.125000 v 2.249005 2.273393 5.125000 @@ -455,10 +506,10 @@ v -0.042238 2.287654 4.125000 v 0.042238 2.712346 3.875000 v -2.249005 2.726607 4.125000 v -2.164528 3.151299 3.875000 -v 0.042238 2.712346 4.375000 -v -0.042238 2.287654 4.625000 -v -1.758613 2.629062 4.625000 -v -1.674136 3.053755 4.375000 +v 0.042238 2.712346 4.625000 +v -0.042238 2.287654 4.875000 +v -1.758613 2.629063 4.875000 +v -1.674136 3.053755 4.625000 v 0.042238 2.712346 4.875000 v -0.042238 2.287654 5.125000 v -2.249005 2.726607 5.125000 @@ -467,10 +518,10 @@ v -0.120284 2.680018 4.125000 v 0.120284 2.319982 3.875000 v 1.750523 3.930052 4.125000 v 1.991091 3.570015 3.875000 -v 0.120284 2.319982 4.375000 -v -0.120284 2.680018 4.625000 -v 1.334787 3.652267 4.625000 -v 1.575356 3.292230 4.375000 +v 0.120284 2.319982 4.625000 +v -0.120284 2.680018 4.875000 +v 1.334787 3.652267 4.875000 +v 1.575356 3.292230 4.625000 v 0.120284 2.319982 4.875000 v -0.120284 2.680018 5.125000 v 1.750523 3.930052 5.125000 @@ -479,10 +530,10 @@ v 0.120284 2.319982 4.125000 v -0.120284 2.680018 3.875000 v -1.750523 1.069949 4.125000 v -1.991091 1.429986 3.875000 -v -0.120284 2.680018 4.375000 -v 0.120284 2.319982 4.625000 -v -1.334787 1.347734 4.625000 -v -1.575356 1.707771 4.375000 +v -0.120284 2.680018 4.625000 +v 0.120284 2.319982 4.875000 +v -1.334787 1.347734 4.875000 +v -1.575356 1.707771 4.625000 v -0.120284 2.680018 4.875000 v 0.120284 2.319982 5.125000 v -1.750523 1.069949 5.125000 @@ -491,10 +542,10 @@ v 0.180018 2.620284 4.125000 v -0.180018 2.379716 3.875000 v 1.430051 0.749477 4.125000 v 1.070014 0.508909 3.875000 -v -0.180018 2.379716 4.375000 -v 0.180018 2.620284 4.625000 -v 1.152267 1.165213 4.625000 -v 0.792230 0.924644 4.375000 +v -0.180018 2.379716 4.625000 +v 0.180018 2.620284 4.875000 +v 1.152267 1.165213 4.875000 +v 0.792230 0.924644 4.625000 v -0.180018 2.379716 4.875000 v 0.180018 2.620284 5.125000 v 1.430051 0.749477 5.125000 @@ -503,10 +554,10 @@ v -0.180018 2.379716 4.125000 v 0.180018 2.620284 3.875000 v -1.430051 4.250523 4.125000 v -1.070014 4.491091 3.875000 -v 0.180018 2.620284 4.375000 -v -0.180018 2.379716 4.625000 -v -1.152266 3.834787 4.625000 -v -0.792230 4.075356 4.375000 +v 0.180018 2.620284 4.625000 +v -0.180018 2.379716 4.875000 +v -1.152266 3.834787 4.875000 +v -0.792230 4.075356 4.625000 v 0.180018 2.620284 4.875000 v -0.180018 2.379716 5.125000 v -1.430051 4.250523 5.125000 @@ -515,10 +566,10 @@ v -0.180018 2.620284 4.125000 v 0.180018 2.379716 3.875000 v 1.070015 4.491091 4.125000 v 1.430052 4.250522 3.875000 -v 0.180018 2.379716 4.375000 -v -0.180018 2.620284 4.625000 -v 0.792230 4.075356 4.625000 -v 1.152267 3.834787 4.375000 +v 0.180018 2.379716 4.625000 +v -0.180018 2.620284 4.875000 +v 0.792230 4.075356 4.875000 +v 1.152267 3.834787 4.625000 v 0.180018 2.379716 4.875000 v -0.180018 2.620284 5.125000 v 1.070015 4.491091 5.125000 @@ -527,10 +578,10 @@ v 0.180018 2.379716 4.125000 v -0.180018 2.620284 3.875000 v -1.070015 0.508909 4.125000 v -1.430052 0.749478 3.875000 -v -0.180018 2.620284 4.375000 -v 0.180018 2.379716 4.625000 -v -0.792230 0.924644 4.625000 -v -1.152267 1.165213 4.375000 +v -0.180018 2.620284 4.625000 +v 0.180018 2.379716 4.875000 +v -0.792230 0.924644 4.875000 +v -1.152267 1.165213 4.625000 v -0.180018 2.620284 4.875000 v 0.180018 2.379716 5.125000 v -1.070015 0.508909 5.125000 @@ -539,10 +590,10 @@ v 0.120284 2.680018 4.125000 v -0.120284 2.319982 3.875000 v 1.991091 1.429985 4.125000 v 1.750523 1.069948 3.875000 -v -0.120284 2.319982 4.375000 -v 0.120284 2.680018 4.625000 -v 1.575356 1.707770 4.625000 -v 1.334787 1.347733 4.375000 +v -0.120284 2.319982 4.625000 +v 0.120284 2.680018 4.875000 +v 1.575356 1.707770 4.875000 +v 1.334787 1.347733 4.625000 v -0.120284 2.319982 4.875000 v 0.120284 2.680018 5.125000 v 1.991091 1.429985 5.125000 @@ -551,10 +602,10 @@ v -0.120284 2.319982 4.125000 v 0.120284 2.680018 3.875000 v -1.991091 3.570015 4.125000 v -1.750522 3.930052 3.875000 -v 0.120284 2.680018 4.375000 -v -0.120284 2.319982 4.625000 -v -1.575356 3.292230 4.625000 -v -1.334787 3.652267 4.375000 +v 0.120284 2.680018 4.625000 +v -0.120284 2.319982 4.875000 +v -1.575356 3.292230 4.875000 +v -1.334787 3.652267 4.625000 v 0.120284 2.680018 4.875000 v -0.120284 2.319982 5.125000 v -1.991091 3.570015 5.125000 @@ -563,10 +614,10 @@ v -0.042238 2.712346 4.125000 v 0.042238 2.287654 3.875000 v 2.164529 3.151299 4.125000 v 2.249005 2.726606 3.875000 -v 0.042238 2.287654 4.375000 -v -0.042238 2.712346 4.625000 -v 1.674136 3.053755 4.625000 -v 1.758613 2.629062 4.375000 +v 0.042238 2.287654 4.625000 +v -0.042238 2.712346 4.875000 +v 1.674136 3.053755 4.875000 +v 1.758613 2.629062 4.625000 v 0.042238 2.287654 4.875000 v -0.042238 2.712346 5.125000 v 2.164529 3.151299 5.125000 @@ -575,10 +626,10 @@ v 0.042238 2.287654 4.125000 v -0.042238 2.712346 3.875000 v -2.164529 1.848701 4.125000 v -2.249005 2.273394 3.875000 -v -0.042238 2.712346 4.375000 -v 0.042238 2.287654 4.625000 -v -1.674136 1.946246 4.625000 -v -1.758613 2.370938 4.375000 +v -0.042238 2.712346 4.625000 +v 0.042238 2.287654 4.875000 +v -1.674136 1.946246 4.875000 +v -1.758613 2.370938 4.625000 v -0.042238 2.712346 4.875000 v 0.042238 2.287654 5.125000 v -2.164529 1.848701 5.125000 @@ -587,10 +638,10 @@ v 0.212346 2.542238 4.125000 v -0.212346 2.457762 3.875000 v 0.651299 0.335471 4.125000 v 0.226606 0.250996 3.875000 -v -0.212346 2.457762 4.375000 -v 0.212346 2.542238 4.625000 -v 0.553754 0.825864 4.625000 -v 0.129062 0.741387 4.375000 +v -0.212346 2.457762 4.625000 +v 0.212346 2.542238 4.875000 +v 0.553754 0.825864 4.875000 +v 0.129062 0.741387 4.625000 v -0.212346 2.457762 4.875000 v 0.212346 2.542238 5.125000 v 0.651299 0.335471 5.125000 @@ -599,14 +650,910 @@ v -0.212346 2.457762 4.125000 v 0.212346 2.542238 3.875000 v -0.651299 4.664528 4.125000 v -0.226606 4.749004 3.875000 -v 0.212346 2.542238 4.375000 -v -0.212346 2.457762 4.625000 -v -0.553754 4.174136 4.625000 -v -0.129062 4.258613 4.375000 +v 0.212346 2.542238 4.625000 +v -0.212346 2.457762 4.875000 +v -0.553754 4.174136 4.875000 +v -0.129062 4.258613 4.625000 v 0.212346 2.542238 4.875000 v -0.212346 2.457762 5.125000 v -0.651299 4.664528 5.125000 v -0.226606 4.749004 4.875000 +v -0.216506 2.500000 4.125000 +v 0.216506 2.500000 3.875000 +v -0.216506 4.750000 4.125000 +v 0.216506 4.750000 3.875000 +v 0.216506 2.500000 4.625000 +v -0.216506 2.500000 4.875000 +v -0.216506 4.250000 4.875000 +v 0.216506 4.250000 4.625000 +v 0.216506 2.500000 4.875000 +v -0.216506 2.500000 5.125000 +v -0.216506 4.750000 5.125000 +v 0.216506 4.750000 4.875000 +v 0.216506 2.500000 4.125000 +v -0.216506 2.500000 3.875000 +v 0.216506 0.250000 4.125000 +v -0.216507 0.250000 3.875000 +v -0.216506 2.500000 4.625000 +v 0.216506 2.500000 4.875000 +v 0.216506 0.750000 4.875000 +v -0.216507 0.750000 4.625000 +v -0.216506 2.500000 4.875000 +v 0.216506 2.500000 5.125000 +v 0.216506 0.250000 5.125000 +v -0.216507 0.250000 4.875000 +v 0.000000 2.716506 4.125000 +v 0.000000 2.283494 3.875000 +v 2.250000 2.716506 4.125000 +v 2.250000 2.283493 3.875000 +v 0.000000 2.283494 4.625000 +v 0.000000 2.716506 4.875000 +v 1.750000 2.716506 4.875000 +v 1.750000 2.283493 4.625000 +v 0.000000 2.283494 4.875000 +v 0.000000 2.716506 5.125000 +v 2.250000 2.716506 5.125000 +v 2.250000 2.283493 4.875000 +v 0.000000 2.283494 4.125000 +v 0.000000 2.716506 3.875000 +v -2.250000 2.283494 4.125000 +v -2.250000 2.716507 3.875000 +v 0.000000 2.716506 4.625000 +v 0.000000 2.283494 4.875000 +v -1.750000 2.283494 4.875000 +v -1.750000 2.716507 4.625000 +v 0.000000 2.716506 4.875000 +v 0.000000 2.283494 5.125000 +v -2.250000 2.283494 5.125000 +v -2.250000 2.716507 4.875000 +v -0.153093 2.653093 4.125000 +v 0.153093 2.346907 3.875000 +v 1.437897 4.244083 4.125000 +v 1.744083 3.937897 3.875000 +v 0.153093 2.346907 4.625000 +v -0.153093 2.653093 4.875000 +v 1.084344 3.890530 4.875000 +v 1.390530 3.584344 4.625000 +v 0.153093 2.346907 4.875000 +v -0.153093 2.653093 5.125000 +v 1.437897 4.244083 5.125000 +v 1.744083 3.937897 4.875000 +v 0.153093 2.346907 4.125000 +v -0.153093 2.653093 3.875000 +v -1.437897 0.755917 4.125000 +v -1.744083 1.062103 3.875000 +v -0.153093 2.653093 4.625000 +v 0.153093 2.346907 4.875000 +v -1.084344 1.109470 4.875000 +v -1.390530 1.415656 4.625000 +v -0.153093 2.653093 4.875000 +v 0.153093 2.346907 5.125000 +v -1.437897 0.755917 5.125000 +v -1.744083 1.062103 4.875000 +v 0.153093 2.653093 4.125000 +v -0.153093 2.346907 3.875000 +v 1.744083 1.062103 4.125000 +v 1.437897 0.755917 3.875000 +v -0.153093 2.346907 4.625000 +v 0.153093 2.653093 4.875000 +v 1.390530 1.415656 4.875000 +v 1.084344 1.109470 4.625000 +v -0.153093 2.346907 4.875000 +v 0.153093 2.653093 5.125000 +v 1.744083 1.062103 5.125000 +v 1.437897 0.755917 4.875000 +v -0.153093 2.346907 4.125000 +v 0.153093 2.653093 3.875000 +v -1.744083 3.937897 4.125000 +v -1.437897 4.244083 3.875000 +v 0.153093 2.653093 4.625000 +v -0.153093 2.346907 4.875000 +v -1.390530 3.584344 4.875000 +v -1.084344 3.890530 4.625000 +v 0.153093 2.653093 4.875000 +v -0.153093 2.346907 5.125000 +v -1.744083 3.937897 5.125000 +v -1.437897 4.244083 4.875000 +v -0.200026 2.582853 4.125000 +v 0.200026 2.417147 3.875000 +v 0.661012 4.661582 4.125000 +v 1.061064 4.495875 3.875000 +v 0.200026 2.417147 4.625000 +v -0.200026 2.582853 4.875000 +v 0.469670 4.199642 4.875000 +v 0.869722 4.033936 4.625000 +v 0.200026 2.417147 4.875000 +v -0.200026 2.582853 5.125000 +v 0.661012 4.661582 5.125000 +v 1.061064 4.495875 4.875000 +v 0.200026 2.417147 4.125000 +v -0.200026 2.582853 3.875000 +v -0.661013 0.338418 4.125000 +v -1.061064 0.504125 3.875000 +v -0.200026 2.582853 4.625000 +v 0.200026 2.417147 4.875000 +v -0.469670 0.800358 4.875000 +v -0.869722 0.966064 4.625000 +v -0.200026 2.582853 4.875000 +v 0.200026 2.417147 5.125000 +v -0.661013 0.338418 5.125000 +v -1.061064 0.504125 4.875000 +v 0.082853 2.700026 4.125000 +v -0.082853 2.299974 3.875000 +v 2.161582 1.838987 4.125000 +v 1.995875 1.438936 3.875000 +v -0.082853 2.299974 4.625000 +v 0.082853 2.700026 4.875000 +v 1.699642 2.030330 4.875000 +v 1.533936 1.630278 4.625000 +v -0.082853 2.299974 4.875000 +v 0.082853 2.700026 5.125000 +v 2.161582 1.838987 5.125000 +v 1.995875 1.438936 4.875000 +v -0.082853 2.299974 4.125000 +v 0.082853 2.700026 3.875000 +v -2.161582 3.161013 4.125000 +v -1.995875 3.561064 3.875000 +v 0.082853 2.700026 4.625000 +v -0.082853 2.299974 4.875000 +v -1.699642 2.969670 4.875000 +v -1.533936 3.369722 4.625000 +v 0.082853 2.700026 4.875000 +v -0.082853 2.299974 5.125000 +v -2.161582 3.161013 5.125000 +v -1.995875 3.561064 4.875000 +v -0.082853 2.700026 4.125000 +v 0.082853 2.299974 3.875000 +v 1.995875 3.561064 4.125000 +v 2.161582 3.161012 3.875000 +v 0.082853 2.299974 4.625000 +v -0.082853 2.700026 4.875000 +v 1.533936 3.369722 4.875000 +v 1.699642 2.969670 4.625000 +v 0.082853 2.299974 4.875000 +v -0.082853 2.700026 5.125000 +v 1.995875 3.561064 5.125000 +v 2.161582 3.161012 4.875000 +v 0.082853 2.299974 4.125000 +v -0.082853 2.700026 3.875000 +v -1.995875 1.438937 4.125000 +v -2.161582 1.838988 3.875000 +v -0.082853 2.700026 4.625000 +v 0.082853 2.299974 4.875000 +v -1.533936 1.630279 4.875000 +v -1.699642 2.030330 4.625000 +v -0.082853 2.700026 4.875000 +v 0.082853 2.299974 5.125000 +v -1.995875 1.438937 5.125000 +v -2.161582 1.838988 4.875000 +v 0.200026 2.582853 4.125000 +v -0.200026 2.417147 3.875000 +v 1.061063 0.504125 4.125000 +v 0.661012 0.338418 3.875000 +v -0.200026 2.417147 4.625000 +v 0.200026 2.582853 4.875000 +v 0.869721 0.966064 4.875000 +v 0.469670 0.800358 4.625000 +v -0.200026 2.417147 4.875000 +v 0.200026 2.582853 5.125000 +v 1.061063 0.504125 5.125000 +v 0.661012 0.338418 4.875000 +v -0.200026 2.417147 4.125000 +v 0.200026 2.582853 3.875000 +v -1.061063 4.495875 4.125000 +v -0.661012 4.661582 3.875000 +v 0.200026 2.582853 4.625000 +v -0.200026 2.417147 4.875000 +v -0.869721 4.033936 4.875000 +v -0.469670 4.199642 4.625000 +v 0.200026 2.582853 4.875000 +v -0.200026 2.417147 5.125000 +v -1.061063 4.495875 5.125000 +v -0.661012 4.661582 4.875000 +v -0.212346 2.542238 4.125000 +v 0.212346 2.457762 3.875000 +v 0.226607 4.749004 4.125000 +v 0.651299 4.664528 3.875000 +v 0.212346 2.457762 4.625000 +v -0.212346 2.542238 4.875000 +v 0.129062 4.258613 4.875000 +v 0.553755 4.174135 4.625000 +v 0.212346 2.457762 4.875000 +v -0.212346 2.542238 5.125000 +v 0.226607 4.749004 5.125000 +v 0.651299 4.664528 4.875000 +v 0.212346 2.457762 4.125000 +v -0.212346 2.542238 3.875000 +v -0.226607 0.250995 4.125000 +v -0.651299 0.335471 3.875000 +v -0.212346 2.542238 4.625000 +v 0.212346 2.457762 4.875000 +v -0.129062 0.741387 4.875000 +v -0.553755 0.825865 4.625000 +v -0.212346 2.542238 4.875000 +v 0.212346 2.457762 5.125000 +v -0.226607 0.250995 5.125000 +v -0.651299 0.335471 4.875000 +v 0.042238 2.712346 4.125000 +v -0.042238 2.287654 3.875000 +v 2.249005 2.273393 4.125000 +v 2.164529 1.848701 3.875000 +v -0.042238 2.287654 4.625000 +v 0.042238 2.712346 4.875000 +v 1.758613 2.370938 4.875000 +v 1.674136 1.946245 4.625000 +v -0.042238 2.287654 4.875000 +v 0.042238 2.712346 5.125000 +v 2.249005 2.273393 5.125000 +v 2.164529 1.848701 4.875000 +v -0.042238 2.287654 4.125000 +v 0.042238 2.712346 3.875000 +v -2.249005 2.726607 4.125000 +v -2.164528 3.151299 3.875000 +v 0.042238 2.712346 4.625000 +v -0.042238 2.287654 4.875000 +v -1.758613 2.629063 4.875000 +v -1.674136 3.053755 4.625000 +v 0.042238 2.712346 4.875000 +v -0.042238 2.287654 5.125000 +v -2.249005 2.726607 5.125000 +v -2.164528 3.151299 4.875000 +v -0.120284 2.680018 4.125000 +v 0.120284 2.319982 3.875000 +v 1.750523 3.930052 4.125000 +v 1.991091 3.570015 3.875000 +v 0.120284 2.319982 4.625000 +v -0.120284 2.680018 4.875000 +v 1.334787 3.652267 4.875000 +v 1.575356 3.292230 4.625000 +v 0.120284 2.319982 4.875000 +v -0.120284 2.680018 5.125000 +v 1.750523 3.930052 5.125000 +v 1.991091 3.570015 4.875000 +v 0.120284 2.319982 4.125000 +v -0.120284 2.680018 3.875000 +v -1.750523 1.069949 4.125000 +v -1.991091 1.429986 3.875000 +v -0.120284 2.680018 4.625000 +v 0.120284 2.319982 4.875000 +v -1.334787 1.347734 4.875000 +v -1.575356 1.707771 4.625000 +v -0.120284 2.680018 4.875000 +v 0.120284 2.319982 5.125000 +v -1.750523 1.069949 5.125000 +v -1.991091 1.429986 4.875000 +v 0.180018 2.620284 4.125000 +v -0.180018 2.379716 3.875000 +v 1.430051 0.749477 4.125000 +v 1.070014 0.508909 3.875000 +v -0.180018 2.379716 4.625000 +v 0.180018 2.620284 4.875000 +v 1.152267 1.165213 4.875000 +v 0.792230 0.924644 4.625000 +v -0.180018 2.379716 4.875000 +v 0.180018 2.620284 5.125000 +v 1.430051 0.749477 5.125000 +v 1.070014 0.508909 4.875000 +v -0.180018 2.379716 4.125000 +v 0.180018 2.620284 3.875000 +v -1.430051 4.250523 4.125000 +v -1.070014 4.491091 3.875000 +v 0.180018 2.620284 4.625000 +v -0.180018 2.379716 4.875000 +v -1.152266 3.834787 4.875000 +v -0.792230 4.075356 4.625000 +v 0.180018 2.620284 4.875000 +v -0.180018 2.379716 5.125000 +v -1.430051 4.250523 5.125000 +v -1.070014 4.491091 4.875000 +v -0.180018 2.620284 4.125000 +v 0.180018 2.379716 3.875000 +v 1.070015 4.491091 4.125000 +v 1.430052 4.250522 3.875000 +v 0.180018 2.379716 4.625000 +v -0.180018 2.620284 4.875000 +v 0.792230 4.075356 4.875000 +v 1.152267 3.834787 4.625000 +v 0.180018 2.379716 4.875000 +v -0.180018 2.620284 5.125000 +v 1.070015 4.491091 5.125000 +v 1.430052 4.250522 4.875000 +v 0.180018 2.379716 4.125000 +v -0.180018 2.620284 3.875000 +v -1.070015 0.508909 4.125000 +v -1.430052 0.749478 3.875000 +v -0.180018 2.620284 4.625000 +v 0.180018 2.379716 4.875000 +v -0.792230 0.924644 4.875000 +v -1.152267 1.165213 4.625000 +v -0.180018 2.620284 4.875000 +v 0.180018 2.379716 5.125000 +v -1.070015 0.508909 5.125000 +v -1.430052 0.749478 4.875000 +v 0.120284 2.680018 4.125000 +v -0.120284 2.319982 3.875000 +v 1.991091 1.429985 4.125000 +v 1.750523 1.069948 3.875000 +v -0.120284 2.319982 4.625000 +v 0.120284 2.680018 4.875000 +v 1.575356 1.707770 4.875000 +v 1.334787 1.347733 4.625000 +v -0.120284 2.319982 4.875000 +v 0.120284 2.680018 5.125000 +v 1.991091 1.429985 5.125000 +v 1.750523 1.069948 4.875000 +v -0.120284 2.319982 4.125000 +v 0.120284 2.680018 3.875000 +v -1.991091 3.570015 4.125000 +v -1.750522 3.930052 3.875000 +v 0.120284 2.680018 4.625000 +v -0.120284 2.319982 4.875000 +v -1.575356 3.292230 4.875000 +v -1.334787 3.652267 4.625000 +v 0.120284 2.680018 4.875000 +v -0.120284 2.319982 5.125000 +v -1.991091 3.570015 5.125000 +v -1.750522 3.930052 4.875000 +v -0.042238 2.712346 4.125000 +v 0.042238 2.287654 3.875000 +v 2.164529 3.151299 4.125000 +v 2.249005 2.726606 3.875000 +v 0.042238 2.287654 4.625000 +v -0.042238 2.712346 4.875000 +v 1.674136 3.053755 4.875000 +v 1.758613 2.629062 4.625000 +v 0.042238 2.287654 4.875000 +v -0.042238 2.712346 5.125000 +v 2.164529 3.151299 5.125000 +v 2.249005 2.726606 4.875000 +v 0.042238 2.287654 4.125000 +v -0.042238 2.712346 3.875000 +v -2.164529 1.848701 4.125000 +v -2.249005 2.273394 3.875000 +v -0.042238 2.712346 4.625000 +v 0.042238 2.287654 4.875000 +v -1.674136 1.946246 4.875000 +v -1.758613 2.370938 4.625000 +v -0.042238 2.712346 4.875000 +v 0.042238 2.287654 5.125000 +v -2.164529 1.848701 5.125000 +v -2.249005 2.273394 4.875000 +v 0.212346 2.542238 4.125000 +v -0.212346 2.457762 3.875000 +v 0.651299 0.335471 4.125000 +v 0.226606 0.250996 3.875000 +v -0.212346 2.457762 4.625000 +v 0.212346 2.542238 4.875000 +v 0.553754 0.825864 4.875000 +v 0.129062 0.741387 4.625000 +v -0.212346 2.457762 4.875000 +v 0.212346 2.542238 5.125000 +v 0.651299 0.335471 5.125000 +v 0.226606 0.250996 4.875000 +v -0.212346 2.457762 4.125000 +v 0.212346 2.542238 3.875000 +v -0.651299 4.664528 4.125000 +v -0.226606 4.749004 3.875000 +v 0.212346 2.542238 4.625000 +v -0.212346 2.457762 4.875000 +v -0.553754 4.174136 4.875000 +v -0.129062 4.258613 4.625000 +v 0.212346 2.542238 4.875000 +v -0.212346 2.457762 5.125000 +v -0.651299 4.664528 5.125000 +v -0.226606 4.749004 4.875000 +v 0.216506 2.500000 4.125000 +v -0.216506 2.500000 4.375000 +v -0.216506 4.250000 4.375000 +v 0.216506 4.250000 4.125000 +v -0.216506 2.500000 4.125000 +v 0.216506 2.500000 4.375000 +v 0.216506 0.750000 4.375000 +v -0.216507 0.750000 4.125000 +v 0.000000 2.283494 4.125000 +v 0.000000 2.716506 4.375000 +v 1.750000 2.716506 4.375000 +v 1.750000 2.283493 4.125000 +v 0.000000 2.716506 4.125000 +v 0.000000 2.283494 4.375000 +v -1.750000 2.283494 4.375000 +v -1.750000 2.716507 4.125000 +v 0.153093 2.346907 4.125000 +v -0.153093 2.653093 4.375000 +v 1.084344 3.890530 4.375000 +v 1.390530 3.584344 4.125000 +v -0.153093 2.653093 4.125000 +v 0.153093 2.346907 4.375000 +v -1.084344 1.109470 4.375000 +v -1.390530 1.415656 4.125000 +v -0.153093 2.346907 4.125000 +v 0.153093 2.653093 4.375000 +v 1.390530 1.415656 4.375000 +v 1.084344 1.109470 4.125000 +v 0.153093 2.653093 4.125000 +v -0.153093 2.346907 4.375000 +v -1.390530 3.584344 4.375000 +v -1.084344 3.890530 4.125000 +v 0.200026 2.417147 4.125000 +v -0.200026 2.582853 4.375000 +v 0.469670 4.199642 4.375000 +v 0.869722 4.033936 4.125000 +v -0.200026 2.582853 4.125000 +v 0.200026 2.417147 4.375000 +v -0.469670 0.800358 4.375000 +v -0.869722 0.966064 4.125000 +v -0.082853 2.299974 4.125000 +v 0.082853 2.700026 4.375000 +v 1.699642 2.030330 4.375000 +v 1.533936 1.630278 4.125000 +v 0.082853 2.700026 4.125000 +v -0.082853 2.299974 4.375000 +v -1.699642 2.969670 4.375000 +v -1.533936 3.369722 4.125000 +v 0.082853 2.299974 4.125000 +v -0.082853 2.700026 4.375000 +v 1.533936 3.369722 4.375000 +v 1.699642 2.969670 4.125000 +v -0.082853 2.700026 4.125000 +v 0.082853 2.299974 4.375000 +v -1.533936 1.630279 4.375000 +v -1.699642 2.030330 4.125000 +v -0.200026 2.417147 4.125000 +v 0.200026 2.582853 4.375000 +v 0.869721 0.966064 4.375000 +v 0.469670 0.800358 4.125000 +v 0.200026 2.582853 4.125000 +v -0.200026 2.417147 4.375000 +v -0.869721 4.033936 4.375000 +v -0.469670 4.199642 4.125000 +v 0.212346 2.457762 4.125000 +v -0.212346 2.542238 4.375000 +v 0.129062 4.258613 4.375000 +v 0.553755 4.174135 4.125000 +v -0.212346 2.542238 4.125000 +v 0.212346 2.457762 4.375000 +v -0.129062 0.741387 4.375000 +v -0.553755 0.825865 4.125000 +v -0.042238 2.287654 4.125000 +v 0.042238 2.712346 4.375000 +v 1.758613 2.370938 4.375000 +v 1.674136 1.946245 4.125000 +v 0.042238 2.712346 4.125000 +v -0.042238 2.287654 4.375000 +v -1.758613 2.629063 4.375000 +v -1.674136 3.053755 4.125000 +v 0.120284 2.319982 4.125000 +v -0.120284 2.680018 4.375000 +v 1.334787 3.652267 4.375000 +v 1.575356 3.292230 4.125000 +v -0.120284 2.680018 4.125000 +v 0.120284 2.319982 4.375000 +v -1.334787 1.347734 4.375000 +v -1.575356 1.707771 4.125000 +v -0.180018 2.379716 4.125000 +v 0.180018 2.620284 4.375000 +v 1.152267 1.165213 4.375000 +v 0.792230 0.924644 4.125000 +v 0.180018 2.620284 4.125000 +v -0.180018 2.379716 4.375000 +v -1.152266 3.834787 4.375000 +v -0.792230 4.075356 4.125000 +v 0.180018 2.379716 4.125000 +v -0.180018 2.620284 4.375000 +v 0.792230 4.075356 4.375000 +v 1.152267 3.834787 4.125000 +v -0.180018 2.620284 4.125000 +v 0.180018 2.379716 4.375000 +v -0.792230 0.924644 4.375000 +v -1.152267 1.165213 4.125000 +v -0.120284 2.319982 4.125000 +v 0.120284 2.680018 4.375000 +v 1.575356 1.707770 4.375000 +v 1.334787 1.347733 4.125000 +v 0.120284 2.680018 4.125000 +v -0.120284 2.319982 4.375000 +v -1.575356 3.292230 4.375000 +v -1.334787 3.652267 4.125000 +v 0.042238 2.287654 4.125000 +v -0.042238 2.712346 4.375000 +v 1.674136 3.053755 4.375000 +v 1.758613 2.629062 4.125000 +v -0.042238 2.712346 4.125000 +v 0.042238 2.287654 4.375000 +v -1.674136 1.946246 4.375000 +v -1.758613 2.370938 4.125000 +v -0.212346 2.457762 4.125000 +v 0.212346 2.542238 4.375000 +v 0.553754 0.825864 4.375000 +v 0.129062 0.741387 4.125000 +v 0.212346 2.542238 4.125000 +v -0.212346 2.457762 4.375000 +v -0.553754 4.174136 4.375000 +v -0.129062 4.258613 4.125000 +v 0.216506 2.500000 4.125000 +v -0.216506 2.500000 4.375000 +v -0.216506 4.250000 4.375000 +v 0.216506 4.250000 4.125000 +v -0.216506 2.500000 4.125000 +v 0.216506 2.500000 4.375000 +v 0.216506 0.750000 4.375000 +v -0.216507 0.750000 4.125000 +v 0.000000 2.283494 4.125000 +v 0.000000 2.716506 4.375000 +v 1.750000 2.716506 4.375000 +v 1.750000 2.283493 4.125000 +v 0.000000 2.716506 4.125000 +v 0.000000 2.283494 4.375000 +v -1.750000 2.283494 4.375000 +v -1.750000 2.716507 4.125000 +v 0.153093 2.346907 4.125000 +v -0.153093 2.653093 4.375000 +v 1.084344 3.890530 4.375000 +v 1.390530 3.584344 4.125000 +v -0.153093 2.653093 4.125000 +v 0.153093 2.346907 4.375000 +v -1.084344 1.109470 4.375000 +v -1.390530 1.415656 4.125000 +v -0.153093 2.346907 4.125000 +v 0.153093 2.653093 4.375000 +v 1.390530 1.415656 4.375000 +v 1.084344 1.109470 4.125000 +v 0.153093 2.653093 4.125000 +v -0.153093 2.346907 4.375000 +v -1.390530 3.584344 4.375000 +v -1.084344 3.890530 4.125000 +v 0.200026 2.417147 4.125000 +v -0.200026 2.582853 4.375000 +v 0.469670 4.199642 4.375000 +v 0.869722 4.033936 4.125000 +v -0.200026 2.582853 4.125000 +v 0.200026 2.417147 4.375000 +v -0.469670 0.800358 4.375000 +v -0.869722 0.966064 4.125000 +v -0.082853 2.299974 4.125000 +v 0.082853 2.700026 4.375000 +v 1.699642 2.030330 4.375000 +v 1.533936 1.630278 4.125000 +v 0.082853 2.700026 4.125000 +v -0.082853 2.299974 4.375000 +v -1.699642 2.969670 4.375000 +v -1.533936 3.369722 4.125000 +v 0.082853 2.299974 4.125000 +v -0.082853 2.700026 4.375000 +v 1.533936 3.369722 4.375000 +v 1.699642 2.969670 4.125000 +v -0.082853 2.700026 4.125000 +v 0.082853 2.299974 4.375000 +v -1.533936 1.630279 4.375000 +v -1.699642 2.030330 4.125000 +v -0.200026 2.417147 4.125000 +v 0.200026 2.582853 4.375000 +v 0.869721 0.966064 4.375000 +v 0.469670 0.800358 4.125000 +v 0.200026 2.582853 4.125000 +v -0.200026 2.417147 4.375000 +v -0.869721 4.033936 4.375000 +v -0.469670 4.199642 4.125000 +v 0.212346 2.457762 4.125000 +v -0.212346 2.542238 4.375000 +v 0.129062 4.258613 4.375000 +v 0.553755 4.174135 4.125000 +v -0.212346 2.542238 4.125000 +v 0.212346 2.457762 4.375000 +v -0.129062 0.741387 4.375000 +v -0.553755 0.825865 4.125000 +v -0.042238 2.287654 4.125000 +v 0.042238 2.712346 4.375000 +v 1.758613 2.370938 4.375000 +v 1.674136 1.946245 4.125000 +v 0.042238 2.712346 4.125000 +v -0.042238 2.287654 4.375000 +v -1.758613 2.629063 4.375000 +v -1.674136 3.053755 4.125000 +v 0.120284 2.319982 4.125000 +v -0.120284 2.680018 4.375000 +v 1.334787 3.652267 4.375000 +v 1.575356 3.292230 4.125000 +v -0.120284 2.680018 4.125000 +v 0.120284 2.319982 4.375000 +v -1.334787 1.347734 4.375000 +v -1.575356 1.707771 4.125000 +v -0.180018 2.379716 4.125000 +v 0.180018 2.620284 4.375000 +v 1.152267 1.165213 4.375000 +v 0.792230 0.924644 4.125000 +v 0.180018 2.620284 4.125000 +v -0.180018 2.379716 4.375000 +v -1.152266 3.834787 4.375000 +v -0.792230 4.075356 4.125000 +v 0.180018 2.379716 4.125000 +v -0.180018 2.620284 4.375000 +v 0.792230 4.075356 4.375000 +v 1.152267 3.834787 4.125000 +v -0.180018 2.620284 4.125000 +v 0.180018 2.379716 4.375000 +v -0.792230 0.924644 4.375000 +v -1.152267 1.165213 4.125000 +v -0.120284 2.319982 4.125000 +v 0.120284 2.680018 4.375000 +v 1.575356 1.707770 4.375000 +v 1.334787 1.347733 4.125000 +v 0.120284 2.680018 4.125000 +v -0.120284 2.319982 4.375000 +v -1.575356 3.292230 4.375000 +v -1.334787 3.652267 4.125000 +v 0.042238 2.287654 4.125000 +v -0.042238 2.712346 4.375000 +v 1.674136 3.053755 4.375000 +v 1.758613 2.629062 4.125000 +v -0.042238 2.712346 4.125000 +v 0.042238 2.287654 4.375000 +v -1.674136 1.946246 4.375000 +v -1.758613 2.370938 4.125000 +v -0.212346 2.457762 4.125000 +v 0.212346 2.542238 4.375000 +v 0.553754 0.825864 4.375000 +v 0.129062 0.741387 4.125000 +v 0.212346 2.542238 4.125000 +v -0.212346 2.457762 4.375000 +v -0.553754 4.174136 4.375000 +v -0.129062 4.258613 4.125000 +v -0.216506 2.500000 4.625000 +v 0.216506 2.500000 4.375000 +v -0.216506 4.750000 4.625000 +v 0.216506 4.750000 4.375000 +v 0.216506 2.500000 4.625000 +v -0.216506 2.500000 4.375000 +v 0.216506 0.250000 4.625000 +v -0.216507 0.250000 4.375000 +v 0.000000 2.716506 4.625000 +v 0.000000 2.283494 4.375000 +v 2.250000 2.716506 4.625000 +v 2.250000 2.283493 4.375000 +v 0.000000 2.283494 4.625000 +v 0.000000 2.716506 4.375000 +v -2.250000 2.283494 4.625000 +v -2.250000 2.716507 4.375000 +v -0.153093 2.653093 4.625000 +v 0.153093 2.346907 4.375000 +v 1.437897 4.244083 4.625000 +v 1.744083 3.937897 4.375000 +v 0.153093 2.346907 4.625000 +v -0.153093 2.653093 4.375000 +v -1.437897 0.755917 4.625000 +v -1.744083 1.062103 4.375000 +v 0.153093 2.653093 4.625000 +v -0.153093 2.346907 4.375000 +v 1.744083 1.062103 4.625000 +v 1.437897 0.755917 4.375000 +v -0.153093 2.346907 4.625000 +v 0.153093 2.653093 4.375000 +v -1.744083 3.937897 4.625000 +v -1.437897 4.244083 4.375000 +v -0.200026 2.582853 4.625000 +v 0.200026 2.417147 4.375000 +v 0.661012 4.661582 4.625000 +v 1.061064 4.495875 4.375000 +v 0.200026 2.417147 4.625000 +v -0.200026 2.582853 4.375000 +v -0.661013 0.338418 4.625000 +v -1.061064 0.504125 4.375000 +v 0.082853 2.700026 4.625000 +v -0.082853 2.299974 4.375000 +v 2.161582 1.838987 4.625000 +v 1.995875 1.438936 4.375000 +v -0.082853 2.299974 4.625000 +v 0.082853 2.700026 4.375000 +v -2.161582 3.161013 4.625000 +v -1.995875 3.561064 4.375000 +v -0.082853 2.700026 4.625000 +v 0.082853 2.299974 4.375000 +v 1.995875 3.561064 4.625000 +v 2.161582 3.161012 4.375000 +v 0.082853 2.299974 4.625000 +v -0.082853 2.700026 4.375000 +v -1.995875 1.438937 4.625000 +v -2.161582 1.838988 4.375000 +v 0.200026 2.582853 4.625000 +v -0.200026 2.417147 4.375000 +v 1.061063 0.504125 4.625000 +v 0.661012 0.338418 4.375000 +v -0.200026 2.417147 4.625000 +v 0.200026 2.582853 4.375000 +v -1.061063 4.495875 4.625000 +v -0.661012 4.661582 4.375000 +v -0.212346 2.542238 4.625000 +v 0.212346 2.457762 4.375000 +v 0.226607 4.749004 4.625000 +v 0.651299 4.664528 4.375000 +v 0.212346 2.457762 4.625000 +v -0.212346 2.542238 4.375000 +v -0.226607 0.250995 4.625000 +v -0.651299 0.335471 4.375000 +v 0.042238 2.712346 4.625000 +v -0.042238 2.287654 4.375000 +v 2.249005 2.273393 4.625000 +v 2.164529 1.848701 4.375000 +v -0.042238 2.287654 4.625000 +v 0.042238 2.712346 4.375000 +v -2.249005 2.726607 4.625000 +v -2.164528 3.151299 4.375000 +v -0.120284 2.680018 4.625000 +v 0.120284 2.319982 4.375000 +v 1.750523 3.930052 4.625000 +v 1.991091 3.570015 4.375000 +v 0.120284 2.319982 4.625000 +v -0.120284 2.680018 4.375000 +v -1.750523 1.069949 4.625000 +v -1.991091 1.429986 4.375000 +v 0.180018 2.620284 4.625000 +v -0.180018 2.379716 4.375000 +v 1.430051 0.749477 4.625000 +v 1.070014 0.508909 4.375000 +v -0.180018 2.379716 4.625000 +v 0.180018 2.620284 4.375000 +v -1.430051 4.250523 4.625000 +v -1.070014 4.491091 4.375000 +v -0.180018 2.620284 4.625000 +v 0.180018 2.379716 4.375000 +v 1.070015 4.491091 4.625000 +v 1.430052 4.250522 4.375000 +v 0.180018 2.379716 4.625000 +v -0.180018 2.620284 4.375000 +v -1.070015 0.508909 4.625000 +v -1.430052 0.749478 4.375000 +v 0.120284 2.680018 4.625000 +v -0.120284 2.319982 4.375000 +v 1.991091 1.429985 4.625000 +v 1.750523 1.069948 4.375000 +v -0.120284 2.319982 4.625000 +v 0.120284 2.680018 4.375000 +v -1.991091 3.570015 4.625000 +v -1.750522 3.930052 4.375000 +v -0.042238 2.712346 4.625000 +v 0.042238 2.287654 4.375000 +v 2.164529 3.151299 4.625000 +v 2.249005 2.726606 4.375000 +v 0.042238 2.287654 4.625000 +v -0.042238 2.712346 4.375000 +v -2.164529 1.848701 4.625000 +v -2.249005 2.273394 4.375000 +v 0.212346 2.542238 4.625000 +v -0.212346 2.457762 4.375000 +v 0.651299 0.335471 4.625000 +v 0.226606 0.250996 4.375000 +v -0.212346 2.457762 4.625000 +v 0.212346 2.542238 4.375000 +v -0.651299 4.664528 4.625000 +v -0.226606 4.749004 4.375000 +v -0.216506 2.500000 4.625000 +v 0.216506 2.500000 4.375000 +v -0.216506 4.750000 4.625000 +v 0.216506 4.750000 4.375000 +v 0.216506 2.500000 4.625000 +v -0.216506 2.500000 4.375000 +v 0.216506 0.250000 4.625000 +v -0.216507 0.250000 4.375000 +v 0.000000 2.716506 4.625000 +v 0.000000 2.283494 4.375000 +v 2.250000 2.716506 4.625000 +v 2.250000 2.283493 4.375000 +v 0.000000 2.283494 4.625000 +v 0.000000 2.716506 4.375000 +v -2.250000 2.283494 4.625000 +v -2.250000 2.716507 4.375000 +v -0.153093 2.653093 4.625000 +v 0.153093 2.346907 4.375000 +v 1.437897 4.244083 4.625000 +v 1.744083 3.937897 4.375000 +v 0.153093 2.346907 4.625000 +v -0.153093 2.653093 4.375000 +v -1.437897 0.755917 4.625000 +v -1.744083 1.062103 4.375000 +v 0.153093 2.653093 4.625000 +v -0.153093 2.346907 4.375000 +v 1.744083 1.062103 4.625000 +v 1.437897 0.755917 4.375000 +v -0.153093 2.346907 4.625000 +v 0.153093 2.653093 4.375000 +v -1.744083 3.937897 4.625000 +v -1.437897 4.244083 4.375000 +v -0.200026 2.582853 4.625000 +v 0.200026 2.417147 4.375000 +v 0.661012 4.661582 4.625000 +v 1.061064 4.495875 4.375000 +v 0.200026 2.417147 4.625000 +v -0.200026 2.582853 4.375000 +v -0.661013 0.338418 4.625000 +v -1.061064 0.504125 4.375000 +v 0.082853 2.700026 4.625000 +v -0.082853 2.299974 4.375000 +v 2.161582 1.838987 4.625000 +v 1.995875 1.438936 4.375000 +v -0.082853 2.299974 4.625000 +v 0.082853 2.700026 4.375000 +v -2.161582 3.161013 4.625000 +v -1.995875 3.561064 4.375000 +v -0.082853 2.700026 4.625000 +v 0.082853 2.299974 4.375000 +v 1.995875 3.561064 4.625000 +v 2.161582 3.161012 4.375000 +v 0.082853 2.299974 4.625000 +v -0.082853 2.700026 4.375000 +v -1.995875 1.438937 4.625000 +v -2.161582 1.838988 4.375000 +v 0.200026 2.582853 4.625000 +v -0.200026 2.417147 4.375000 +v 1.061063 0.504125 4.625000 +v 0.661012 0.338418 4.375000 +v -0.200026 2.417147 4.625000 +v 0.200026 2.582853 4.375000 +v -1.061063 4.495875 4.625000 +v -0.661012 4.661582 4.375000 +v -0.212346 2.542238 4.625000 +v 0.212346 2.457762 4.375000 +v 0.226607 4.749004 4.625000 +v 0.651299 4.664528 4.375000 +v 0.212346 2.457762 4.625000 +v -0.212346 2.542238 4.375000 +v -0.226607 0.250995 4.625000 +v -0.651299 0.335471 4.375000 +v 0.042238 2.712346 4.625000 +v -0.042238 2.287654 4.375000 +v 2.249005 2.273393 4.625000 +v 2.164529 1.848701 4.375000 +v -0.042238 2.287654 4.625000 +v 0.042238 2.712346 4.375000 +v -2.249005 2.726607 4.625000 +v -2.164528 3.151299 4.375000 +v -0.120284 2.680018 4.625000 +v 0.120284 2.319982 4.375000 +v 1.750523 3.930052 4.625000 +v 1.991091 3.570015 4.375000 +v 0.120284 2.319982 4.625000 +v -0.120284 2.680018 4.375000 +v -1.750523 1.069949 4.625000 +v -1.991091 1.429986 4.375000 +v 0.180018 2.620284 4.625000 +v -0.180018 2.379716 4.375000 +v 1.430051 0.749477 4.625000 +v 1.070014 0.508909 4.375000 +v -0.180018 2.379716 4.625000 +v 0.180018 2.620284 4.375000 +v -1.430051 4.250523 4.625000 +v -1.070014 4.491091 4.375000 +v -0.180018 2.620284 4.625000 +v 0.180018 2.379716 4.375000 +v 1.070015 4.491091 4.625000 +v 1.430052 4.250522 4.375000 +v 0.180018 2.379716 4.625000 +v -0.180018 2.620284 4.375000 +v -1.070015 0.508909 4.625000 +v -1.430052 0.749478 4.375000 +v 0.120284 2.680018 4.625000 +v -0.120284 2.319982 4.375000 +v 1.991091 1.429985 4.625000 +v 1.750523 1.069948 4.375000 +v -0.120284 2.319982 4.625000 +v 0.120284 2.680018 4.375000 +v -1.991091 3.570015 4.625000 +v -1.750522 3.930052 4.375000 +v -0.042238 2.712346 4.625000 +v 0.042238 2.287654 4.375000 +v 2.164529 3.151299 4.625000 +v 2.249005 2.726606 4.375000 +v 0.042238 2.287654 4.625000 +v -0.042238 2.712346 4.375000 +v -2.164529 1.848701 4.625000 +v -2.249005 2.273394 4.375000 +v 0.212346 2.542238 4.625000 +v -0.212346 2.457762 4.375000 +v 0.651299 0.335471 4.625000 +v 0.226606 0.250996 4.375000 +v -0.212346 2.457762 4.625000 +v 0.212346 2.542238 4.375000 +v -0.651299 4.664528 4.625000 +v -0.226606 4.749004 4.375000 vt 0.727660 0.416667 vt 0.710638 0.541667 vt 0.710638 0.416667 @@ -628,9 +1575,9 @@ vt 0.693617 0.416667 vt 0.727660 0.416667 vt 0.710638 0.541667 vt 0.710638 0.416667 -vt 0.710638 0.416667 -vt 0.693617 0.513889 vt 0.693617 0.416667 +vt 0.710638 0.513889 +vt 0.693617 0.513889 vt 0.727660 0.416667 vt 0.710638 0.541667 vt 0.710638 0.416667 @@ -694,9 +1641,9 @@ vt 0.710638 0.416667 vt 0.710638 0.416667 vt 0.693617 0.513889 vt 0.693617 0.416667 -vt 0.710638 0.416667 -vt 0.693617 0.513889 vt 0.693617 0.416667 +vt 0.710638 0.513889 +vt 0.693617 0.513889 vt 0.727660 0.416667 vt 0.710638 0.541667 vt 0.710638 0.416667 @@ -718,9 +1665,9 @@ vt 0.710638 0.416667 vt 0.710638 0.416667 vt 0.693617 0.513889 vt 0.693617 0.416667 -vt 0.710638 0.416667 -vt 0.693617 0.513889 vt 0.693617 0.416667 +vt 0.710638 0.513889 +vt 0.693617 0.513889 vt 0.710638 0.416667 vt 0.727660 0.541667 vt 0.710638 0.541667 @@ -736,9 +1683,9 @@ vt 0.710638 0.416667 vt 0.727660 0.416667 vt 0.710638 0.541667 vt 0.710638 0.416667 -vt 0.710638 0.416667 -vt 0.693617 0.513889 vt 0.693617 0.416667 +vt 0.710638 0.513889 +vt 0.693617 0.513889 vt 0.693617 0.416667 vt 0.710638 0.513889 vt 0.693617 0.513889 @@ -787,9 +1734,9 @@ vt 0.710638 0.416667 vt 0.710638 0.416667 vt 0.727660 0.541667 vt 0.710638 0.541667 -vt 0.710638 0.416667 -vt 0.693617 0.513889 vt 0.693617 0.416667 +vt 0.710638 0.513889 +vt 0.693617 0.513889 vt 0.693617 0.416667 vt 0.710638 0.513889 vt 0.693617 0.513889 @@ -811,9 +1758,9 @@ vt 0.710638 0.416667 vt 0.693617 0.416667 vt 0.710638 0.513889 vt 0.693617 0.513889 -vt 0.693617 0.416667 -vt 0.710638 0.513889 +vt 0.710638 0.416667 vt 0.693617 0.513889 +vt 0.693617 0.416667 vt 0.710638 0.416667 vt 0.727660 0.541667 vt 0.710638 0.541667 @@ -895,6 +1842,678 @@ vt 0.710638 0.416667 vt 0.727660 0.416667 vt 0.710638 0.541667 vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.416667 +vt 0.727660 0.541667 +vt 0.727660 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.710638 0.513889 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.710638 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.693617 0.416667 +vt 0.710638 0.513889 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.416667 +vt 0.727660 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.693617 0.416667 +vt 0.710638 0.513889 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.416667 +vt 0.727660 0.541667 +vt 0.727660 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.710638 0.416667 +vt 0.727660 0.541667 +vt 0.727660 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.710638 0.416667 +vt 0.727660 0.541667 +vt 0.727660 0.416667 +vt 0.693617 0.416667 +vt 0.710638 0.513889 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.416667 +vt 0.727660 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.710638 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.416667 +vt 0.727660 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.416667 +vt 0.727660 0.541667 +vt 0.727660 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.710638 0.416667 +vt 0.727660 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.727660 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.727660 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.727660 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.727660 0.541667 +vt 0.727660 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.416667 +vt 0.727660 0.541667 +vt 0.727660 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.693617 0.416667 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.693617 0.416667 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.693617 0.416667 +vt 0.693617 0.416667 +vt 0.710638 0.513889 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.693617 0.416667 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.693617 0.416667 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.693617 0.416667 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.693617 0.416667 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.693617 0.416667 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.693617 0.416667 +vt 0.693617 0.416667 +vt 0.710638 0.513889 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.693617 0.416667 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.693617 0.416667 +vt 0.693617 0.416667 +vt 0.710638 0.513889 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.693617 0.416667 +vt 0.693617 0.416667 +vt 0.710638 0.513889 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.693617 0.416667 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.693617 0.416667 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.693617 0.416667 +vt 0.693617 0.416667 +vt 0.710638 0.513889 +vt 0.693617 0.513889 +vt 0.693617 0.416667 +vt 0.710638 0.513889 +vt 0.693617 0.513889 +vt 0.693617 0.416667 +vt 0.710638 0.513889 +vt 0.693617 0.513889 +vt 0.693617 0.416667 +vt 0.710638 0.513889 +vt 0.693617 0.513889 +vt 0.693617 0.416667 +vt 0.710638 0.513889 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.693617 0.416667 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.693617 0.416667 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.693617 0.416667 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.693617 0.416667 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.693617 0.416667 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.693617 0.416667 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.693617 0.416667 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.693617 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.693617 0.416667 +vt 0.710638 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.693617 0.416667 +vt 0.710638 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.693617 0.416667 +vt 0.710638 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.693617 0.416667 +vt 0.710638 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.710638 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.710638 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.693617 0.416667 +vt 0.710638 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.693617 0.513889 +vt 0.710638 0.416667 +vt 0.693617 0.416667 +vt 0.693617 0.416667 +vt 0.710638 0.513889 +vt 0.710638 0.416667 +vt 0.727660 0.416667 +vt 0.710638 0.541667 +vt 0.710638 0.416667 +vt 0.727660 0.416667 +vt 0.710638 0.541667 +vt 0.710638 0.416667 +vt 0.727660 0.416667 +vt 0.710638 0.541667 +vt 0.710638 0.416667 +vt 0.727660 0.416667 +vt 0.710638 0.541667 +vt 0.710638 0.416667 +vt 0.727660 0.416667 +vt 0.710638 0.541667 +vt 0.710638 0.416667 +vt 0.727660 0.416667 +vt 0.710638 0.541667 +vt 0.710638 0.416667 +vt 0.710638 0.416667 +vt 0.727660 0.541667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.541667 +vt 0.710638 0.416667 +vt 0.727660 0.416667 +vt 0.710638 0.541667 +vt 0.710638 0.416667 +vt 0.727660 0.416667 +vt 0.710638 0.541667 +vt 0.710638 0.416667 +vt 0.727660 0.416667 +vt 0.710638 0.541667 +vt 0.710638 0.416667 +vt 0.710638 0.416667 +vt 0.727660 0.541667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.541667 +vt 0.710638 0.416667 +vt 0.727660 0.416667 +vt 0.710638 0.541667 +vt 0.710638 0.416667 +vt 0.727660 0.416667 +vt 0.710638 0.541667 +vt 0.710638 0.416667 +vt 0.727660 0.416667 +vt 0.710638 0.541667 +vt 0.710638 0.416667 +vt 0.710638 0.416667 +vt 0.727660 0.541667 +vt 0.710638 0.541667 +vt 0.710638 0.416667 +vt 0.727660 0.541667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.541667 +vt 0.710638 0.416667 +vt 0.710638 0.416667 +vt 0.727660 0.541667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.541667 +vt 0.710638 0.416667 +vt 0.710638 0.416667 +vt 0.727660 0.541667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.541667 +vt 0.710638 0.416667 +vt 0.710638 0.416667 +vt 0.727660 0.541667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.541667 +vt 0.710638 0.416667 +vt 0.710638 0.416667 +vt 0.727660 0.541667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.541667 +vt 0.710638 0.416667 +vt 0.727660 0.416667 +vt 0.710638 0.541667 +vt 0.710638 0.416667 +vt 0.727660 0.416667 +vt 0.710638 0.541667 +vt 0.710638 0.416667 +vt 0.727660 0.416667 +vt 0.710638 0.541667 +vt 0.710638 0.416667 +vt 0.727660 0.416667 +vt 0.710638 0.541667 +vt 0.710638 0.416667 +vt 0.727660 0.416667 +vt 0.710638 0.541667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.416667 +vt 0.727660 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.416667 +vt 0.727660 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.416667 +vt 0.727660 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.727660 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.416667 +vt 0.727660 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.416667 +vt 0.727660 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.416667 +vt 0.727660 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.416667 +vt 0.727660 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.727660 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.727660 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.416667 +vt 0.727660 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.541667 +vt 0.727660 0.416667 +vt 0.710638 0.416667 vt 0.727660 0.541667 vt 0.727660 0.541667 vt 0.710638 0.513889 @@ -902,7 +2521,7 @@ vt 0.727660 0.416667 vt 0.710638 0.513889 vt 0.710638 0.513889 vt 0.727660 0.541667 -vt 0.710638 0.513889 +vt 0.710638 0.416667 vt 0.727660 0.541667 vt 0.727660 0.541667 vt 0.727660 0.541667 @@ -924,7 +2543,7 @@ vt 0.727660 0.416667 vt 0.710638 0.513889 vt 0.727660 0.541667 vt 0.710638 0.513889 -vt 0.710638 0.513889 +vt 0.710638 0.416667 vt 0.727660 0.541667 vt 0.710638 0.513889 vt 0.727660 0.541667 @@ -932,13 +2551,13 @@ vt 0.727660 0.416667 vt 0.727660 0.541667 vt 0.727660 0.541667 vt 0.710638 0.513889 -vt 0.710638 0.513889 +vt 0.710638 0.416667 vt 0.727660 0.416667 vt 0.727660 0.541667 vt 0.727660 0.541667 vt 0.727660 0.541667 vt 0.727660 0.541667 -vt 0.710638 0.513889 +vt 0.710638 0.416667 vt 0.710638 0.416667 vt 0.727660 0.541667 vt 0.727660 0.416667 @@ -955,15 +2574,15 @@ vt 0.727660 0.416667 vt 0.727660 0.416667 vt 0.727660 0.541667 vt 0.727660 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.416667 +vt 0.727660 0.541667 +vt 0.727660 0.416667 +vt 0.727660 0.416667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.710638 0.416667 vt 0.710638 0.513889 -vt 0.710638 0.416667 -vt 0.727660 0.541667 -vt 0.727660 0.416667 -vt 0.727660 0.416667 -vt 0.727660 0.541667 -vt 0.727660 0.541667 -vt 0.710638 0.416667 -vt 0.710638 0.416667 vt 0.727660 0.416667 vt 0.727660 0.416667 vt 0.727660 0.416667 @@ -991,6 +2610,230 @@ vt 0.710638 0.416667 vt 0.727660 0.416667 vt 0.727660 0.541667 vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.710638 0.541667 +vt 0.710638 0.513889 +vt 0.727660 0.541667 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.727660 0.541667 +vt 0.693617 0.513889 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.693617 0.513889 +vt 0.710638 0.513889 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.710638 0.513889 +vt 0.727660 0.541667 +vt 0.710638 0.513889 +vt 0.693617 0.513889 +vt 0.727660 0.541667 +vt 0.710638 0.513889 +vt 0.727660 0.541667 +vt 0.710638 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.710638 0.513889 +vt 0.693617 0.513889 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.710638 0.541667 +vt 0.710638 0.513889 +vt 0.710638 0.541667 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.541667 +vt 0.693617 0.513889 +vt 0.727660 0.541667 +vt 0.710638 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.693617 0.513889 +vt 0.710638 0.513889 +vt 0.727660 0.541667 +vt 0.710638 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.710638 0.541667 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.541667 +vt 0.710638 0.541667 +vt 0.710638 0.541667 +vt 0.710638 0.541667 +vt 0.710638 0.541667 +vt 0.710638 0.513889 +vt 0.727660 0.541667 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.727660 0.541667 +vt 0.710638 0.513889 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.710638 0.541667 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.416667 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.416667 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.416667 +vt 0.710638 0.513889 +vt 0.710638 0.416667 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.416667 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.693617 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.693617 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.693617 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.693617 0.513889 +vt 0.693617 0.513889 +vt 0.693617 0.513889 +vt 0.710638 0.513889 +vt 0.693617 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.710638 0.513889 +vt 0.693617 0.513889 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.416667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.416667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.416667 +vt 0.727660 0.416667 +vt 0.727660 0.541667 +vt 0.727660 0.416667 +vt 0.727660 0.541667 +vt 0.727660 0.416667 +vt 0.727660 0.541667 +vt 0.727660 0.416667 +vt 0.727660 0.541667 +vt 0.727660 0.416667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.710638 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.710638 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.710638 0.541667 +vt 0.710638 0.541667 +vt 0.727660 0.541667 +vt 0.710638 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.710638 0.541667 +vt 0.727660 0.541667 +vt 0.710638 0.541667 +vt 0.727660 0.541667 +vt 0.710638 0.541667 +vt 0.710638 0.541667 +vt 0.710638 0.541667 +vt 0.727660 0.541667 +vt 0.710638 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 +vt 0.727660 0.541667 vt 0.727660 0.847222 vt 0.778723 0.836806 vt 0.778723 0.847222 @@ -1041,6 +2884,38 @@ vn 0.2778 0.4157 0.8660 vn 0.4904 0.0975 0.8660 vn 0.0975 -0.4904 0.8660 vn -0.4157 0.2778 0.8660 +vn -0.5000 0.0000 -0.8660 +vn 0.3536 0.3536 -0.8660 +vn 0.0000 0.5000 -0.8660 +vn 0.3536 -0.3536 -0.8660 +vn 0.0000 -0.5000 -0.8660 +vn -0.3536 -0.3536 -0.8660 +vn -0.3536 0.3536 -0.8660 +vn 0.5000 0.0000 -0.8660 +vn -0.4619 0.1913 -0.8660 +vn 0.4619 0.1913 -0.8660 +vn 0.1913 0.4619 -0.8660 +vn 0.1913 -0.4619 -0.8660 +vn -0.1913 -0.4619 -0.8660 +vn -0.4619 -0.1913 -0.8660 +vn -0.1913 0.4619 -0.8660 +vn 0.4619 -0.1913 -0.8660 +vn -0.4904 0.0975 -0.8660 +vn 0.4157 0.2778 -0.8660 +vn 0.0975 0.4904 -0.8660 +vn 0.2778 -0.4157 -0.8660 +vn -0.0975 -0.4904 -0.8660 +vn -0.4157 -0.2778 -0.8660 +vn -0.2778 0.4157 -0.8660 +vn 0.4904 -0.0975 -0.8660 +vn -0.4157 0.2778 -0.8660 +vn 0.4904 0.0975 -0.8660 +vn 0.2778 0.4157 -0.8660 +vn 0.0975 -0.4904 -0.8660 +vn -0.2778 -0.4157 -0.8660 +vn -0.4904 -0.0975 -0.8660 +vn -0.0975 0.4904 -0.8660 +vn 0.4157 -0.2778 -0.8660 vn 0.0000 1.0000 0.0000 vn 0.7071 0.7071 0.0000 vn 1.0000 0.0000 0.0000 @@ -1050,215 +2925,663 @@ vn -0.7071 -0.7071 0.0000 vn -1.0000 0.0000 0.0000 vn -0.7071 0.7071 0.0000 s off -f 50/69/19 51/70/19 49/71/19 -f 138/72/20 139/73/20 137/74/20 -f 93/75/21 95/76/21 94/77/21 -f 134/78/22 136/79/22 135/80/22 -f 105/81/23 107/82/23 106/83/23 -f 153/84/24 155/85/24 154/86/24 -f 109/87/23 111/88/23 110/89/23 -f 141/90/20 143/91/20 142/92/20 -f 90/93/21 91/94/21 89/95/21 -f 114/96/25 115/97/25 113/98/25 -f 85/99/26 87/100/26 86/101/26 -f 97/102/21 99/103/21 98/104/21 -f 81/105/26 83/106/26 82/107/26 -f 53/108/19 71/109/19 54/110/19 -f 78/111/26 79/112/26 77/113/26 -f 157/114/24 159/115/24 158/116/24 -f 102/117/23 103/118/23 101/119/23 -f 73/120/19 75/121/19 74/122/19 -f 145/123/20 147/124/20 146/125/20 -f 129/126/22 131/127/22 130/128/22 -f 117/129/25 119/130/25 118/131/25 -f 125/132/22 128/133/22 127/134/22 -f 150/135/24 151/136/24 149/137/24 -f 122/138/25 124/139/25 123/140/25 -f 162/141/27 163/142/27 161/143/27 -f 233/144/28 236/145/28 235/146/28 -f 189/147/29 191/148/29 190/149/29 -f 229/150/30 231/151/30 230/152/30 -f 201/153/31 203/154/31 202/155/31 -f 249/156/32 251/157/32 250/158/32 -f 205/159/31 207/160/31 206/161/31 -f 237/162/28 239/163/28 238/164/28 -f 186/165/29 187/166/29 185/167/29 -f 209/168/33 212/169/33 211/170/33 -f 181/171/34 183/172/34 182/173/34 -f 193/174/29 195/175/29 194/176/29 -f 177/177/34 179/178/34 178/179/34 -f 165/180/27 167/181/27 166/182/27 -f 173/183/34 176/184/34 175/185/34 -f 253/186/32 255/187/32 254/188/32 -f 198/189/31 199/190/31 197/191/31 -f 169/192/27 171/193/27 170/194/27 -f 241/195/28 243/196/28 242/197/28 -f 225/198/30 227/199/30 226/200/30 -f 214/201/33 216/202/33 215/203/33 -f 222/204/30 223/205/30 221/206/30 -f 245/207/32 248/208/32 247/209/32 -f 217/210/33 219/211/33 218/212/33 -f 258/213/35 259/214/35 257/215/35 -f 329/216/36 332/217/36 331/218/36 -f 285/219/37 287/220/37 286/221/37 -f 326/222/38 328/223/38 327/224/38 -f 297/225/39 299/226/39 298/227/39 -f 345/228/40 347/229/40 346/230/40 -f 301/231/39 303/232/39 302/233/39 -f 334/234/36 336/235/36 335/236/36 -f 281/237/37 284/238/37 283/239/37 -f 305/240/41 308/241/41 307/242/41 -f 277/243/42 279/244/42 278/245/42 -f 290/246/37 292/247/37 291/248/37 -f 273/249/42 275/250/42 274/251/42 -f 262/252/35 264/253/35 263/254/35 -f 270/255/42 271/256/42 269/257/42 -f 350/258/40 352/259/40 351/260/40 -f 293/261/39 296/262/39 295/263/39 -f 265/264/35 267/265/35 266/266/35 -f 337/267/36 339/268/36 338/269/36 -f 322/270/38 324/271/38 323/272/38 -f 310/273/41 312/274/41 311/275/41 -f 317/276/38 320/277/38 319/278/38 -f 341/279/40 344/280/40 343/281/40 -f 314/282/41 316/283/41 315/284/41 -f 354/285/43 355/286/43 353/287/43 -f 425/288/44 428/289/44 427/290/44 -f 381/291/45 383/292/45 382/293/45 -f 421/294/46 423/295/46 422/296/46 -f 393/297/47 395/298/47 394/299/47 -f 441/300/48 443/301/48 442/302/48 -f 397/303/47 399/304/47 398/305/47 -f 429/306/44 431/307/44 430/308/44 -f 378/309/45 379/310/45 377/311/45 -f 401/312/49 404/313/49 403/314/49 -f 373/315/50 375/316/50 374/317/50 -f 385/318/45 387/319/45 386/320/45 -f 369/321/50 371/322/50 370/323/50 -f 357/324/43 359/325/43 358/326/43 -f 366/327/50 367/328/50 365/329/50 -f 445/330/48 447/331/48 446/332/48 -f 390/333/47 391/334/47 389/335/47 -f 361/336/43 363/337/43 362/338/43 -f 434/339/44 436/340/44 435/341/44 -f 417/342/46 419/343/46 418/344/46 -f 406/345/49 408/346/49 407/347/49 -f 413/348/46 416/349/46 415/350/46 -f 438/351/48 439/352/48 437/353/48 -f 409/354/49 411/355/49 410/356/49 -f 50/69/19 52/357/19 51/70/19 -f 138/72/20 140/358/20 139/73/20 -f 93/75/21 96/359/21 95/76/21 -f 134/78/22 133/360/22 136/79/22 -f 105/81/23 108/361/23 107/82/23 -f 153/84/24 156/362/24 155/85/24 -f 109/87/23 112/363/23 111/88/23 -f 141/90/20 144/364/20 143/91/20 -f 90/93/21 92/365/21 91/94/21 -f 114/96/25 116/366/25 115/97/25 -f 85/99/26 88/367/26 87/100/26 -f 97/102/21 100/368/21 99/103/21 -f 81/105/26 84/369/26 83/106/26 -f 53/108/19 72/370/19 71/109/19 -f 78/111/26 80/371/26 79/112/26 -f 157/114/24 160/372/24 159/115/24 -f 102/117/23 104/373/23 103/118/23 -f 73/120/19 76/374/19 75/121/19 -f 145/123/20 148/375/20 147/124/20 -f 129/126/22 132/376/22 131/127/22 -f 117/129/25 120/377/25 119/130/25 -f 125/132/22 126/378/22 128/133/22 -f 150/135/24 152/379/24 151/136/24 -f 122/138/25 121/380/25 124/139/25 -f 162/141/27 164/381/27 163/142/27 -f 233/144/28 234/382/28 236/145/28 -f 189/147/29 192/383/29 191/148/29 -f 229/150/30 232/384/30 231/151/30 -f 201/153/31 204/385/31 203/154/31 -f 249/156/32 252/386/32 251/157/32 -f 205/159/31 208/387/31 207/160/31 -f 237/162/28 240/388/28 239/163/28 -f 186/165/29 188/389/29 187/166/29 -f 209/168/33 210/390/33 212/169/33 -f 181/171/34 184/391/34 183/172/34 -f 193/174/29 196/392/29 195/175/29 -f 177/177/34 180/393/34 179/178/34 -f 165/180/27 168/394/27 167/181/27 -f 173/183/34 174/395/34 176/184/34 -f 253/186/32 256/396/32 255/187/32 -f 198/189/31 200/397/31 199/190/31 -f 169/192/27 172/398/27 171/193/27 -f 241/195/28 244/399/28 243/196/28 -f 225/198/30 228/400/30 227/199/30 -f 214/201/33 213/401/33 216/202/33 -f 222/204/30 224/402/30 223/205/30 -f 245/207/32 246/403/32 248/208/32 -f 217/210/33 220/404/33 219/211/33 -f 258/213/35 260/405/35 259/214/35 -f 329/216/36 330/406/36 332/217/36 -f 285/219/37 288/407/37 287/220/37 -f 326/222/38 325/408/38 328/223/38 -f 297/225/39 300/409/39 299/226/39 -f 345/228/40 348/410/40 347/229/40 -f 301/231/39 304/411/39 303/232/39 -f 334/234/36 333/412/36 336/235/36 -f 281/237/37 282/413/37 284/238/37 -f 305/240/41 306/414/41 308/241/41 -f 277/243/42 280/415/42 279/244/42 -f 290/246/37 289/416/37 292/247/37 -f 273/249/42 276/417/42 275/250/42 -f 262/252/35 261/418/35 264/253/35 -f 270/255/42 272/419/42 271/256/42 -f 350/258/40 349/420/40 352/259/40 -f 293/261/39 294/421/39 296/262/39 -f 265/264/35 268/422/35 267/265/35 -f 337/267/36 340/423/36 339/268/36 -f 322/270/38 321/424/38 324/271/38 -f 310/273/41 309/425/41 312/274/41 -f 317/276/38 318/426/38 320/277/38 -f 341/279/40 342/427/40 344/280/40 -f 314/282/41 313/428/41 316/283/41 -f 354/285/43 356/429/43 355/286/43 -f 425/288/44 426/430/44 428/289/44 -f 381/291/45 384/431/45 383/292/45 -f 421/294/46 424/432/46 423/295/46 -f 393/297/47 396/433/47 395/298/47 -f 441/300/48 444/434/48 443/301/48 -f 397/303/47 400/435/47 399/304/47 -f 429/306/44 432/436/44 431/307/44 -f 378/309/45 380/437/45 379/310/45 -f 401/312/49 402/438/49 404/313/49 -f 373/315/50 376/439/50 375/316/50 -f 385/318/45 388/440/45 387/319/45 -f 369/321/50 372/441/50 371/322/50 -f 357/324/43 360/442/43 359/325/43 -f 366/327/50 368/443/50 367/328/50 -f 445/330/48 448/444/48 447/331/48 -f 390/333/47 392/445/47 391/334/47 -f 361/336/43 364/446/43 363/337/43 -f 434/339/44 433/447/44 436/340/44 -f 417/342/46 420/448/46 419/343/46 -f 406/345/49 405/449/49 408/346/49 -f 413/348/46 414/450/46 416/349/46 -f 438/351/48 440/451/48 439/352/48 -f 409/354/49 412/452/49 411/355/49 +f 82/87/19 83/88/19 81/89/19 +f 170/90/20 171/91/20 169/92/20 +f 125/93/21 127/94/21 126/95/21 +f 166/96/22 168/97/22 167/98/22 +f 137/99/23 139/100/23 138/101/23 +f 185/102/24 187/103/24 186/104/24 +f 141/105/23 143/106/23 142/107/23 +f 174/108/20 176/109/20 175/110/20 +f 122/111/21 123/112/21 121/113/21 +f 146/114/25 147/115/25 145/116/25 +f 117/117/26 119/118/26 118/119/26 +f 129/120/21 131/121/21 130/122/21 +f 113/123/26 115/124/26 114/125/26 +f 85/126/19 103/127/19 86/128/19 +f 110/129/26 111/130/26 109/131/26 +f 189/132/24 191/133/24 190/134/24 +f 134/135/23 135/136/23 133/137/23 +f 105/138/19 107/139/19 106/140/19 +f 177/141/20 179/142/20 178/143/20 +f 161/144/22 163/145/22 162/146/22 +f 149/147/25 151/148/25 150/149/25 +f 157/150/22 160/151/22 159/152/22 +f 182/153/24 183/154/24 181/155/24 +f 154/156/25 156/157/25 155/158/25 +f 194/159/27 195/160/27 193/161/27 +f 265/162/28 268/163/28 267/164/28 +f 221/165/29 223/166/29 222/167/29 +f 261/168/30 263/169/30 262/170/30 +f 233/171/31 235/172/31 234/173/31 +f 282/174/32 284/175/32 283/176/32 +f 237/177/31 239/178/31 238/179/31 +f 269/180/28 271/181/28 270/182/28 +f 218/183/29 219/184/29 217/185/29 +f 241/186/33 244/187/33 243/188/33 +f 213/189/34 215/190/34 214/191/34 +f 225/192/29 227/193/29 226/194/29 +f 209/195/34 211/196/34 210/197/34 +f 198/198/27 200/199/27 199/200/27 +f 205/201/34 208/202/34 207/203/34 +f 285/204/32 287/205/32 286/206/32 +f 230/207/31 231/208/31 229/209/31 +f 201/210/27 203/211/27 202/212/27 +f 273/213/28 275/214/28 274/215/28 +f 258/216/30 260/217/30 259/218/30 +f 246/219/33 248/220/33 247/221/33 +f 254/222/30 255/223/30 253/224/30 +f 277/225/32 280/226/32 279/227/32 +f 249/228/33 251/229/33 250/230/33 +f 290/231/35 291/232/35 289/233/35 +f 361/234/36 364/235/36 363/236/36 +f 317/237/37 319/238/37 318/239/37 +f 358/240/38 360/241/38 359/242/38 +f 329/243/39 331/244/39 330/245/39 +f 377/246/40 379/247/40 378/248/40 +f 333/249/39 335/250/39 334/251/39 +f 366/252/36 368/253/36 367/254/36 +f 313/255/37 316/256/37 315/257/37 +f 337/258/41 340/259/41 339/260/41 +f 309/261/42 311/262/42 310/263/42 +f 322/264/37 324/265/37 323/266/37 +f 306/267/42 308/268/42 307/269/42 +f 294/270/35 296/271/35 295/272/35 +f 302/273/42 303/274/42 301/275/42 +f 382/276/40 384/277/40 383/278/40 +f 325/279/39 328/280/39 327/281/39 +f 297/282/35 299/283/35 298/284/35 +f 369/285/36 371/286/36 370/287/36 +f 354/288/38 356/289/38 355/290/38 +f 341/291/41 343/292/41 342/293/41 +f 349/294/38 352/295/38 351/296/38 +f 373/297/40 376/298/40 375/299/40 +f 346/300/41 348/301/41 347/302/41 +f 386/303/43 387/304/43 385/305/43 +f 457/306/44 460/307/44 459/308/44 +f 413/309/45 415/310/45 414/311/45 +f 453/312/46 455/313/46 454/314/46 +f 425/315/47 427/316/47 426/317/47 +f 473/318/48 475/319/48 474/320/48 +f 429/321/47 431/322/47 430/323/47 +f 461/324/44 463/325/44 462/326/44 +f 410/327/45 411/328/45 409/329/45 +f 433/330/49 436/331/49 435/332/49 +f 405/333/50 407/334/50 406/335/50 +f 417/336/45 419/337/45 418/338/45 +f 401/339/50 403/340/50 402/341/50 +f 389/342/43 391/343/43 390/344/43 +f 398/345/50 399/346/50 397/347/50 +f 477/348/48 479/349/48 478/350/48 +f 422/351/47 423/352/47 421/353/47 +f 393/354/43 395/355/43 394/356/43 +f 466/357/44 468/358/44 467/359/44 +f 449/360/46 451/361/46 450/362/46 +f 438/363/49 440/364/49 439/365/49 +f 445/366/46 448/367/46 447/368/46 +f 470/369/48 471/370/48 469/371/48 +f 441/372/49 443/373/49 442/374/49 +f 483/375/51 482/376/51 481/377/51 +f 553/378/52 556/379/52 554/380/52 +f 511/381/53 509/382/53 510/383/53 +f 551/384/54 549/385/54 550/386/54 +f 523/387/55 521/388/55 522/389/55 +f 571/390/56 569/391/56 570/392/56 +f 527/393/55 525/394/55 526/395/55 +f 558/396/52 560/397/52 557/398/52 +f 507/399/53 506/400/53 505/401/53 +f 531/402/57 530/403/57 529/404/57 +f 503/405/58 501/406/58 502/407/58 +f 515/408/53 513/409/53 514/410/53 +f 499/411/58 497/412/58 498/413/58 +f 487/414/51 485/415/51 486/416/51 +f 495/417/58 494/418/58 493/419/58 +f 575/420/56 573/421/56 574/422/56 +f 519/423/55 518/424/55 517/425/55 +f 491/426/51 489/427/51 490/428/51 +f 563/429/52 561/430/52 562/431/52 +f 546/432/54 548/433/54 545/434/54 +f 535/435/57 533/436/57 534/437/57 +f 543/438/54 542/439/54 541/440/54 +f 567/441/56 566/442/56 565/443/56 +f 539/444/57 537/445/57 538/446/57 +f 579/447/59 578/448/59 577/449/59 +f 651/450/60 650/451/60 649/452/60 +f 607/453/61 605/454/61 606/455/61 +f 647/456/62 645/457/62 646/458/62 +f 619/459/63 617/460/63 618/461/63 +f 666/462/64 668/463/64 665/464/64 +f 623/465/63 621/466/63 622/467/63 +f 655/468/60 653/469/60 654/470/60 +f 603/471/61 602/472/61 601/473/61 +f 625/474/65 628/475/65 626/476/65 +f 599/477/66 597/478/66 598/479/66 +f 611/480/61 609/481/61 610/482/61 +f 595/483/66 593/484/66 594/485/66 +f 583/486/59 581/487/59 582/488/59 +f 591/489/66 590/490/66 589/491/66 +f 671/492/64 669/493/64 670/494/64 +f 615/495/63 614/496/63 613/497/63 +f 587/498/59 585/499/59 586/500/59 +f 659/501/60 657/502/60 658/503/60 +f 643/504/62 641/505/62 642/506/62 +f 630/507/65 632/508/65 629/509/65 +f 639/510/62 638/511/62 637/512/62 +f 663/513/64 662/514/64 661/515/64 +f 635/516/65 633/517/65 634/518/65 +f 675/519/67 674/520/67 673/521/67 +f 745/522/68 748/523/68 746/524/68 +f 703/525/69 701/526/69 702/527/69 +f 742/528/70 744/529/70 741/530/70 +f 715/531/71 713/532/71 714/533/71 +f 763/534/72 761/535/72 762/536/72 +f 718/537/71 720/538/71 717/539/71 +f 750/540/68 752/541/68 749/542/68 +f 699/543/69 698/544/69 697/545/69 +f 721/546/73 724/547/73 722/548/73 +f 695/549/74 693/550/74 694/551/74 +f 707/552/69 705/553/69 706/554/69 +f 690/555/74 692/556/74 689/557/74 +f 679/558/67 677/559/67 678/560/67 +f 687/561/74 686/562/74 685/563/74 +f 766/564/72 768/565/72 765/566/72 +f 711/567/71 710/568/71 709/569/71 +f 683/570/67 681/571/67 682/572/67 +f 754/573/68 756/574/68 753/575/68 +f 739/576/70 737/577/70 738/578/70 +f 727/579/73 725/580/73 726/581/73 +f 733/582/70 736/583/70 734/584/70 +f 757/585/72 760/586/72 758/587/72 +f 730/588/73 732/589/73 729/590/73 +f 769/591/75 772/592/75 770/593/75 +f 841/594/76 844/595/76 842/596/76 +f 799/597/77 797/598/77 798/599/77 +f 839/600/78 837/601/78 838/602/78 +f 811/603/79 809/604/79 810/605/79 +f 859/606/80 857/607/80 858/608/80 +f 815/609/79 813/610/79 814/611/79 +f 847/612/76 845/613/76 846/614/76 +f 795/615/77 794/616/77 793/617/77 +f 819/618/81 818/619/81 817/620/81 +f 791/621/82 789/622/82 790/623/82 +f 803/624/77 801/625/77 802/626/77 +f 787/627/82 785/628/82 786/629/82 +f 775/630/75 773/631/75 774/632/75 +f 783/633/82 782/634/82 781/635/82 +f 863/636/80 861/637/80 862/638/80 +f 807/639/79 806/640/79 805/641/79 +f 779/642/75 777/643/75 778/644/75 +f 850/645/76 852/646/76 849/647/76 +f 835/648/78 833/649/78 834/650/78 +f 823/651/81 821/652/81 822/653/81 +f 831/654/78 830/655/78 829/656/78 +f 855/657/80 854/658/80 853/659/80 +f 827/660/81 825/661/81 826/662/81 +f 873/663/21 875/664/21 874/665/21 +f 877/666/23 879/667/23 878/668/23 +f 893/669/24 895/670/24 894/671/24 +f 890/672/20 892/673/20 891/674/20 +f 869/675/26 871/676/26 870/677/26 +f 865/678/19 867/679/19 866/680/19 +f 885/681/22 887/682/22 886/683/22 +f 881/684/25 883/685/25 882/686/25 +f 905/687/29 907/688/29 906/689/29 +f 909/690/31 911/691/31 910/692/31 +f 926/693/32 928/694/32 927/695/32 +f 921/696/28 923/697/28 922/698/28 +f 901/699/34 903/700/34 902/701/34 +f 898/702/27 900/703/27 899/704/27 +f 917/705/30 919/706/30 918/707/30 +f 914/708/33 916/709/33 915/710/33 +f 937/711/37 939/712/37 938/713/37 +f 941/714/39 943/715/39 942/716/39 +f 957/717/40 959/718/40 958/719/40 +f 954/720/36 956/721/36 955/722/36 +f 934/723/42 936/724/42 935/725/42 +f 930/726/35 932/727/35 931/728/35 +f 950/729/38 952/730/38 951/731/38 +f 946/732/41 948/733/41 947/734/41 +f 969/735/45 971/736/45 970/737/45 +f 973/738/47 975/739/47 974/740/47 +f 989/741/48 991/742/48 990/743/48 +f 985/744/44 987/745/44 986/746/44 +f 965/747/50 967/748/50 966/749/50 +f 961/750/43 963/751/43 962/752/43 +f 981/753/46 983/754/46 982/755/46 +f 977/756/49 979/757/49 978/758/49 +f 1003/759/53 1001/760/53 1002/761/53 +f 1007/762/55 1005/763/55 1006/764/55 +f 1023/765/56 1021/766/56 1022/767/56 +f 1018/768/52 1020/769/52 1017/770/52 +f 999/771/58 997/772/58 998/773/58 +f 995/774/51 993/775/51 994/776/51 +f 1014/777/54 1016/778/54 1013/779/54 +f 1011/780/57 1009/781/57 1010/782/57 +f 1035/783/61 1033/784/61 1034/785/61 +f 1039/786/63 1037/787/63 1038/788/63 +f 1055/789/64 1053/790/64 1054/791/64 +f 1051/792/60 1049/793/60 1050/794/60 +f 1031/795/66 1029/796/66 1030/797/66 +f 1027/798/59 1025/799/59 1026/800/59 +f 1047/801/62 1045/802/62 1046/803/62 +f 1042/804/65 1044/805/65 1041/806/65 +f 1067/807/69 1065/808/69 1066/809/69 +f 1071/810/71 1069/811/71 1070/812/71 +f 1087/813/72 1085/814/72 1086/815/72 +f 1082/816/68 1084/817/68 1081/818/68 +f 1062/819/74 1064/820/74 1061/821/74 +f 1058/822/67 1060/823/67 1057/824/67 +f 1079/825/70 1077/826/70 1078/827/70 +f 1074/828/73 1076/829/73 1073/830/73 +f 1099/831/77 1097/832/77 1098/833/77 +f 1103/834/79 1101/835/79 1102/836/79 +f 1119/837/80 1117/838/80 1118/839/80 +f 1115/840/76 1113/841/76 1114/842/76 +f 1095/843/82 1093/844/82 1094/845/82 +f 1091/846/75 1089/847/75 1090/848/75 +f 1111/849/78 1109/850/78 1110/851/78 +f 1106/852/81 1108/853/81 1105/854/81 +f 1122/855/19 1123/856/19 1121/857/19 +f 1146/858/20 1147/859/20 1145/860/20 +f 1130/861/21 1131/862/21 1129/863/21 +f 1138/864/25 1139/865/25 1137/866/25 +f 1126/867/26 1127/868/26 1125/869/26 +f 1134/870/23 1135/871/23 1133/872/23 +f 1141/873/22 1144/874/22 1143/875/22 +f 1150/876/24 1151/877/24 1149/878/24 +f 1154/879/27 1155/880/27 1153/881/27 +f 1178/882/28 1179/883/28 1177/884/28 +f 1162/885/29 1163/886/29 1161/887/29 +f 1169/888/33 1172/889/33 1171/890/33 +f 1158/891/34 1159/892/34 1157/893/34 +f 1166/894/31 1167/895/31 1165/896/31 +f 1174/897/30 1175/898/30 1173/899/30 +f 1182/900/32 1183/901/32 1181/902/32 +f 1185/903/35 1188/904/35 1187/905/35 +f 1209/906/36 1212/907/36 1211/908/36 +f 1194/909/37 1195/910/37 1193/911/37 +f 1201/912/41 1204/913/41 1203/914/41 +f 1190/915/42 1191/916/42 1189/917/42 +f 1197/918/39 1200/919/39 1199/920/39 +f 1206/921/38 1207/922/38 1205/923/38 +f 1213/924/40 1216/925/40 1215/926/40 +f 1218/927/43 1219/928/43 1217/929/43 +f 1241/930/44 1244/931/44 1243/932/44 +f 1226/933/45 1227/934/45 1225/935/45 +f 1234/936/49 1235/937/49 1233/938/49 +f 1222/939/50 1223/940/50 1221/941/50 +f 1230/942/47 1231/943/47 1229/944/47 +f 1238/945/46 1239/946/46 1237/947/46 +f 1246/948/48 1247/949/48 1245/950/48 +f 1251/951/51 1250/952/51 1249/953/51 +f 1273/954/52 1276/955/52 1274/956/52 +f 1259/957/53 1258/958/53 1257/959/53 +f 1267/960/57 1266/961/57 1265/962/57 +f 1255/963/58 1254/964/58 1253/965/58 +f 1263/966/55 1262/967/55 1261/968/55 +f 1271/969/54 1270/970/54 1269/971/54 +f 1277/972/56 1280/973/56 1278/974/56 +f 1283/975/59 1282/976/59 1281/977/59 +f 1307/978/60 1306/979/60 1305/980/60 +f 1289/981/61 1292/982/61 1290/983/61 +f 1297/984/65 1300/985/65 1298/986/65 +f 1287/987/66 1286/988/66 1285/989/66 +f 1293/990/63 1296/991/63 1294/992/63 +f 1303/993/62 1302/994/62 1301/995/62 +f 1311/996/64 1310/997/64 1309/998/64 +f 1315/999/67 1314/1000/67 1313/1001/67 +f 1337/1002/68 1340/1003/68 1338/1004/68 +f 1323/1005/69 1322/1006/69 1321/1007/69 +f 1329/1008/73 1332/1009/73 1330/1010/73 +f 1319/1011/74 1318/1012/74 1317/1013/74 +f 1325/1014/71 1328/1015/71 1326/1016/71 +f 1333/1017/70 1336/1018/70 1334/1019/70 +f 1341/1020/72 1344/1021/72 1342/1022/72 +f 1347/1023/75 1346/1024/75 1345/1025/75 +f 1369/1026/76 1372/1027/76 1370/1028/76 +f 1355/1029/77 1354/1030/77 1353/1031/77 +f 1363/1032/81 1362/1033/81 1361/1034/81 +f 1351/1035/82 1350/1036/82 1349/1037/82 +f 1359/1038/79 1358/1039/79 1357/1040/79 +f 1367/1041/78 1366/1042/78 1365/1043/78 +f 1375/1044/80 1374/1045/80 1373/1046/80 +f 82/87/19 84/1047/19 83/88/19 +f 170/90/20 172/1048/20 171/91/20 +f 125/93/21 128/1049/21 127/94/21 +f 166/96/22 165/1050/22 168/97/22 +f 137/99/23 140/1051/23 139/100/23 +f 185/102/24 188/1052/24 187/103/24 +f 141/105/23 144/1053/23 143/106/23 +f 174/108/20 173/1054/20 176/109/20 +f 122/111/21 124/1055/21 123/112/21 +f 146/114/25 148/1056/25 147/115/25 +f 117/117/26 120/1057/26 119/118/26 +f 129/120/21 132/1058/21 131/121/21 +f 113/123/26 116/1059/26 115/124/26 +f 85/126/19 104/1060/19 103/127/19 +f 110/129/26 112/1061/26 111/130/26 +f 189/132/24 192/1062/24 191/133/24 +f 134/135/23 136/1063/23 135/136/23 +f 105/138/19 108/1064/19 107/139/19 +f 177/141/20 180/1065/20 179/142/20 +f 161/144/22 164/1066/22 163/145/22 +f 149/147/25 152/1067/25 151/148/25 +f 157/150/22 158/1068/22 160/151/22 +f 182/153/24 184/1069/24 183/154/24 +f 154/156/25 153/1070/25 156/157/25 +f 194/159/27 196/1071/27 195/160/27 +f 265/162/28 266/1072/28 268/163/28 +f 221/165/29 224/1073/29 223/166/29 +f 261/168/30 264/1074/30 263/169/30 +f 233/171/31 236/1075/31 235/172/31 +f 282/174/32 281/1076/32 284/175/32 +f 237/177/31 240/1077/31 239/178/31 +f 269/180/28 272/1078/28 271/181/28 +f 218/183/29 220/1079/29 219/184/29 +f 241/186/33 242/1080/33 244/187/33 +f 213/189/34 216/1081/34 215/190/34 +f 225/192/29 228/1082/29 227/193/29 +f 209/195/34 212/1083/34 211/196/34 +f 198/198/27 197/1084/27 200/199/27 +f 205/201/34 206/1085/34 208/202/34 +f 285/204/32 288/1086/32 287/205/32 +f 230/207/31 232/1087/31 231/208/31 +f 201/210/27 204/1088/27 203/211/27 +f 273/213/28 276/1089/28 275/214/28 +f 258/216/30 257/1090/30 260/217/30 +f 246/219/33 245/1091/33 248/220/33 +f 254/222/30 256/1092/30 255/223/30 +f 277/225/32 278/1093/32 280/226/32 +f 249/228/33 252/1094/33 251/229/33 +f 290/231/35 292/1095/35 291/232/35 +f 361/234/36 362/1096/36 364/235/36 +f 317/237/37 320/1097/37 319/238/37 +f 358/240/38 357/1098/38 360/241/38 +f 329/243/39 332/1099/39 331/244/39 +f 377/246/40 380/1100/40 379/247/40 +f 333/249/39 336/1101/39 335/250/39 +f 366/252/36 365/1102/36 368/253/36 +f 313/255/37 314/1103/37 316/256/37 +f 337/258/41 338/1104/41 340/259/41 +f 309/261/42 312/1105/42 311/262/42 +f 322/264/37 321/1106/37 324/265/37 +f 306/267/42 305/1107/42 308/268/42 +f 294/270/35 293/1108/35 296/271/35 +f 302/273/42 304/1109/42 303/274/42 +f 382/276/40 381/1110/40 384/277/40 +f 325/279/39 326/1111/39 328/280/39 +f 297/282/35 300/1112/35 299/283/35 +f 369/285/36 372/1113/36 371/286/36 +f 354/288/38 353/1114/38 356/289/38 +f 341/291/41 344/1115/41 343/292/41 +f 349/294/38 350/1116/38 352/295/38 +f 373/297/40 374/1117/40 376/298/40 +f 346/300/41 345/1118/41 348/301/41 +f 386/303/43 388/1119/43 387/304/43 +f 457/306/44 458/1120/44 460/307/44 +f 413/309/45 416/1121/45 415/310/45 +f 453/312/46 456/1122/46 455/313/46 +f 425/315/47 428/1123/47 427/316/47 +f 473/318/48 476/1124/48 475/319/48 +f 429/321/47 432/1125/47 431/322/47 +f 461/324/44 464/1126/44 463/325/44 +f 410/327/45 412/1127/45 411/328/45 +f 433/330/49 434/1128/49 436/331/49 +f 405/333/50 408/1129/50 407/334/50 +f 417/336/45 420/1130/45 419/337/45 +f 401/339/50 404/1131/50 403/340/50 +f 389/342/43 392/1132/43 391/343/43 +f 398/345/50 400/1133/50 399/346/50 +f 477/348/48 480/1134/48 479/349/48 +f 422/351/47 424/1135/47 423/352/47 +f 393/354/43 396/1136/43 395/355/43 +f 466/357/44 465/1137/44 468/358/44 +f 449/360/46 452/1138/46 451/361/46 +f 438/363/49 437/1139/49 440/364/49 +f 445/366/46 446/1140/46 448/367/46 +f 470/369/48 472/1141/48 471/370/48 +f 441/372/49 444/1142/49 443/373/49 +f 483/375/51 484/1143/51 482/376/51 +f 553/378/52 555/1144/52 556/379/52 +f 511/381/53 512/1145/53 509/382/53 +f 551/384/54 552/1146/54 549/385/54 +f 523/387/55 524/1147/55 521/388/55 +f 571/390/56 572/1148/56 569/391/56 +f 527/393/55 528/1149/55 525/394/55 +f 558/396/52 559/1150/52 560/397/52 +f 507/399/53 508/1151/53 506/400/53 +f 531/402/57 532/1152/57 530/403/57 +f 503/405/58 504/1153/58 501/406/58 +f 515/408/53 516/1154/53 513/409/53 +f 499/411/58 500/1155/58 497/412/58 +f 487/414/51 488/1156/51 485/415/51 +f 495/417/58 496/1157/58 494/418/58 +f 575/420/56 576/1158/56 573/421/56 +f 519/423/55 520/1159/55 518/424/55 +f 491/426/51 492/1160/51 489/427/51 +f 563/429/52 564/1161/52 561/430/52 +f 546/432/54 547/1162/54 548/433/54 +f 535/435/57 536/1163/57 533/436/57 +f 543/438/54 544/1164/54 542/439/54 +f 567/441/56 568/1165/56 566/442/56 +f 539/444/57 540/1166/57 537/445/57 +f 579/447/59 580/1167/59 578/448/59 +f 651/450/60 652/1168/60 650/451/60 +f 607/453/61 608/1169/61 605/454/61 +f 647/456/62 648/1170/62 645/457/62 +f 619/459/63 620/1171/63 617/460/63 +f 666/462/64 667/1172/64 668/463/64 +f 623/465/63 624/1173/63 621/466/63 +f 655/468/60 656/1174/60 653/469/60 +f 603/471/61 604/1175/61 602/472/61 +f 625/474/65 627/1176/65 628/475/65 +f 599/477/66 600/1177/66 597/478/66 +f 611/480/61 612/1178/61 609/481/61 +f 595/483/66 596/1179/66 593/484/66 +f 583/486/59 584/1180/59 581/487/59 +f 591/489/66 592/1181/66 590/490/66 +f 671/492/64 672/1182/64 669/493/64 +f 615/495/63 616/1183/63 614/496/63 +f 587/498/59 588/1184/59 585/499/59 +f 659/501/60 660/1185/60 657/502/60 +f 643/504/62 644/1186/62 641/505/62 +f 630/507/65 631/1187/65 632/508/65 +f 639/510/62 640/1188/62 638/511/62 +f 663/513/64 664/1189/64 662/514/64 +f 635/516/65 636/1190/65 633/517/65 +f 675/519/67 676/1191/67 674/520/67 +f 745/522/68 747/1192/68 748/523/68 +f 703/525/69 704/1193/69 701/526/69 +f 742/528/70 743/1194/70 744/529/70 +f 715/531/71 716/1195/71 713/532/71 +f 763/534/72 764/1196/72 761/535/72 +f 718/537/71 719/1197/71 720/538/71 +f 750/540/68 751/1198/68 752/541/68 +f 699/543/69 700/1199/69 698/544/69 +f 721/546/73 723/1200/73 724/547/73 +f 695/549/74 696/1201/74 693/550/74 +f 707/552/69 708/1202/69 705/553/69 +f 690/555/74 691/1203/74 692/556/74 +f 679/558/67 680/1204/67 677/559/67 +f 687/561/74 688/1205/74 686/562/74 +f 766/564/72 767/1206/72 768/565/72 +f 711/567/71 712/1207/71 710/568/71 +f 683/570/67 684/1208/67 681/571/67 +f 754/573/68 755/1209/68 756/574/68 +f 739/576/70 740/1210/70 737/577/70 +f 727/579/73 728/1211/73 725/580/73 +f 733/582/70 735/1212/70 736/583/70 +f 757/585/72 759/1213/72 760/586/72 +f 730/588/73 731/1214/73 732/589/73 +f 769/591/75 771/1215/75 772/592/75 +f 841/594/76 843/1216/76 844/595/76 +f 799/597/77 800/1217/77 797/598/77 +f 839/600/78 840/1218/78 837/601/78 +f 811/603/79 812/1219/79 809/604/79 +f 859/606/80 860/1220/80 857/607/80 +f 815/609/79 816/1221/79 813/610/79 +f 847/612/76 848/1222/76 845/613/76 +f 795/615/77 796/1223/77 794/616/77 +f 819/618/81 820/1224/81 818/619/81 +f 791/621/82 792/1225/82 789/622/82 +f 803/624/77 804/1226/77 801/625/77 +f 787/627/82 788/1227/82 785/628/82 +f 775/630/75 776/1228/75 773/631/75 +f 783/633/82 784/1229/82 782/634/82 +f 863/636/80 864/1230/80 861/637/80 +f 807/639/79 808/1231/79 806/640/79 +f 779/642/75 780/1232/75 777/643/75 +f 850/645/76 851/1233/76 852/646/76 +f 835/648/78 836/1234/78 833/649/78 +f 823/651/81 824/1235/81 821/652/81 +f 831/654/78 832/1236/78 830/655/78 +f 855/657/80 856/1237/80 854/658/80 +f 827/660/81 828/1238/81 825/661/81 +f 873/663/21 876/1239/21 875/664/21 +f 877/666/23 880/1240/23 879/667/23 +f 893/669/24 896/1241/24 895/670/24 +f 890/672/20 889/1242/20 892/673/20 +f 869/675/26 872/1243/26 871/676/26 +f 865/678/19 868/1244/19 867/679/19 +f 885/681/22 888/1245/22 887/682/22 +f 881/684/25 884/1246/25 883/685/25 +f 905/687/29 908/1247/29 907/688/29 +f 909/690/31 912/1248/31 911/691/31 +f 926/693/32 925/1249/32 928/694/32 +f 921/696/28 924/1250/28 923/697/28 +f 901/699/34 904/1251/34 903/700/34 +f 898/702/27 897/1252/27 900/703/27 +f 917/705/30 920/1253/30 919/706/30 +f 914/708/33 913/1254/33 916/709/33 +f 937/711/37 940/1255/37 939/712/37 +f 941/714/39 944/1256/39 943/715/39 +f 957/717/40 960/1257/40 959/718/40 +f 954/720/36 953/1258/36 956/721/36 +f 934/723/42 933/1259/42 936/724/42 +f 930/726/35 929/1260/35 932/727/35 +f 950/729/38 949/1261/38 952/730/38 +f 946/732/41 945/1262/41 948/733/41 +f 969/735/45 972/1263/45 971/736/45 +f 973/738/47 976/1264/47 975/739/47 +f 989/741/48 992/1265/48 991/742/48 +f 985/744/44 988/1266/44 987/745/44 +f 965/747/50 968/1267/50 967/748/50 +f 961/750/43 964/1268/43 963/751/43 +f 981/753/46 984/1269/46 983/754/46 +f 977/756/49 980/1270/49 979/757/49 +f 1003/759/53 1004/1271/53 1001/760/53 +f 1007/762/55 1008/1272/55 1005/763/55 +f 1023/765/56 1024/1273/56 1021/766/56 +f 1018/768/52 1019/1274/52 1020/769/52 +f 999/771/58 1000/1275/58 997/772/58 +f 995/774/51 996/1276/51 993/775/51 +f 1014/777/54 1015/1277/54 1016/778/54 +f 1011/780/57 1012/1278/57 1009/781/57 +f 1035/783/61 1036/1279/61 1033/784/61 +f 1039/786/63 1040/1280/63 1037/787/63 +f 1055/789/64 1056/1281/64 1053/790/64 +f 1051/792/60 1052/1282/60 1049/793/60 +f 1031/795/66 1032/1283/66 1029/796/66 +f 1027/798/59 1028/1284/59 1025/799/59 +f 1047/801/62 1048/1285/62 1045/802/62 +f 1042/804/65 1043/1286/65 1044/805/65 +f 1067/807/69 1068/1287/69 1065/808/69 +f 1071/810/71 1072/1288/71 1069/811/71 +f 1087/813/72 1088/1289/72 1085/814/72 +f 1082/816/68 1083/1290/68 1084/817/68 +f 1062/819/74 1063/1291/74 1064/820/74 +f 1058/822/67 1059/1292/67 1060/823/67 +f 1079/825/70 1080/1293/70 1077/826/70 +f 1074/828/73 1075/1294/73 1076/829/73 +f 1099/831/77 1100/1295/77 1097/832/77 +f 1103/834/79 1104/1296/79 1101/835/79 +f 1119/837/80 1120/1297/80 1117/838/80 +f 1115/840/76 1116/1298/76 1113/841/76 +f 1095/843/82 1096/1299/82 1093/844/82 +f 1091/846/75 1092/1300/75 1089/847/75 +f 1111/849/78 1112/1301/78 1109/850/78 +f 1106/852/81 1107/1302/81 1108/853/81 +f 1122/855/19 1124/1303/19 1123/856/19 +f 1146/858/20 1148/1304/20 1147/859/20 +f 1130/861/21 1132/1305/21 1131/862/21 +f 1138/864/25 1140/1306/25 1139/865/25 +f 1126/867/26 1128/1307/26 1127/868/26 +f 1134/870/23 1136/1308/23 1135/871/23 +f 1141/873/22 1142/1309/22 1144/874/22 +f 1150/876/24 1152/1310/24 1151/877/24 +f 1154/879/27 1156/1311/27 1155/880/27 +f 1178/882/28 1180/1312/28 1179/883/28 +f 1162/885/29 1164/1313/29 1163/886/29 +f 1169/888/33 1170/1314/33 1172/889/33 +f 1158/891/34 1160/1315/34 1159/892/34 +f 1166/894/31 1168/1316/31 1167/895/31 +f 1174/897/30 1176/1317/30 1175/898/30 +f 1182/900/32 1184/1318/32 1183/901/32 +f 1185/903/35 1186/1319/35 1188/904/35 +f 1209/906/36 1210/1320/36 1212/907/36 +f 1194/909/37 1196/1321/37 1195/910/37 +f 1201/912/41 1202/1322/41 1204/913/41 +f 1190/915/42 1192/1323/42 1191/916/42 +f 1197/918/39 1198/1324/39 1200/919/39 +f 1206/921/38 1208/1325/38 1207/922/38 +f 1213/924/40 1214/1326/40 1216/925/40 +f 1218/927/43 1220/1327/43 1219/928/43 +f 1241/930/44 1242/1328/44 1244/931/44 +f 1226/933/45 1228/1329/45 1227/934/45 +f 1234/936/49 1236/1330/49 1235/937/49 +f 1222/939/50 1224/1331/50 1223/940/50 +f 1230/942/47 1232/1332/47 1231/943/47 +f 1238/945/46 1240/1333/46 1239/946/46 +f 1246/948/48 1248/1334/48 1247/949/48 +f 1251/951/51 1252/1335/51 1250/952/51 +f 1273/954/52 1275/1336/52 1276/955/52 +f 1259/957/53 1260/1337/53 1258/958/53 +f 1267/960/57 1268/1338/57 1266/961/57 +f 1255/963/58 1256/1339/58 1254/964/58 +f 1263/966/55 1264/1340/55 1262/967/55 +f 1271/969/54 1272/1341/54 1270/970/54 +f 1277/972/56 1279/1342/56 1280/973/56 +f 1283/975/59 1284/1343/59 1282/976/59 +f 1307/978/60 1308/1344/60 1306/979/60 +f 1289/981/61 1291/1345/61 1292/982/61 +f 1297/984/65 1299/1346/65 1300/985/65 +f 1287/987/66 1288/1347/66 1286/988/66 +f 1293/990/63 1295/1348/63 1296/991/63 +f 1303/993/62 1304/1349/62 1302/994/62 +f 1311/996/64 1312/1350/64 1310/997/64 +f 1315/999/67 1316/1351/67 1314/1000/67 +f 1337/1002/68 1339/1352/68 1340/1003/68 +f 1323/1005/69 1324/1353/69 1322/1006/69 +f 1329/1008/73 1331/1354/73 1332/1009/73 +f 1319/1011/74 1320/1355/74 1318/1012/74 +f 1325/1014/71 1327/1356/71 1328/1015/71 +f 1333/1017/70 1335/1357/70 1336/1018/70 +f 1341/1020/72 1343/1358/72 1344/1021/72 +f 1347/1023/75 1348/1359/75 1346/1024/75 +f 1369/1026/76 1371/1360/76 1372/1027/76 +f 1355/1029/77 1356/1361/77 1354/1030/77 +f 1363/1032/81 1364/1362/81 1362/1033/81 +f 1351/1035/82 1352/1363/82 1350/1036/82 +f 1359/1038/79 1360/1364/79 1358/1039/79 +f 1367/1041/78 1368/1365/78 1366/1042/78 +f 1375/1044/80 1376/1366/80 1374/1045/80 s 1 -f 56/453/51 57/454/52 55/455/51 -f 58/456/52 59/457/53 57/454/52 -f 60/458/53 61/459/54 59/457/53 -f 62/460/54 63/461/55 61/459/54 -f 64/462/55 65/463/56 63/464/55 -f 66/465/56 67/466/57 65/463/56 -f 68/467/57 69/468/58 67/466/57 -f 70/469/58 55/455/51 69/468/58 -f 56/453/51 58/456/52 57/454/52 -f 58/456/52 60/458/53 59/457/53 -f 60/458/53 62/460/54 61/459/54 -f 62/460/54 64/470/55 63/461/55 -f 64/462/55 66/465/56 65/463/56 -f 66/465/56 68/467/57 67/466/57 -f 68/467/57 70/469/58 69/468/58 -f 70/469/58 56/453/51 55/455/51 +f 88/1367/83 89/1368/84 87/1369/83 +f 90/1370/84 91/1371/85 89/1368/84 +f 92/1372/85 93/1373/86 91/1371/85 +f 94/1374/86 95/1375/87 93/1373/86 +f 96/1376/87 97/1377/88 95/1378/87 +f 98/1379/88 99/1380/89 97/1377/88 +f 100/1381/89 101/1382/90 99/1380/89 +f 102/1383/90 87/1369/83 101/1382/90 +f 88/1367/83 90/1370/84 89/1368/84 +f 90/1370/84 92/1372/85 91/1371/85 +f 92/1372/85 94/1374/86 93/1373/86 +f 94/1374/86 96/1384/87 95/1375/87 +f 96/1376/87 98/1379/88 97/1377/88 +f 98/1379/88 100/1381/89 99/1380/89 +f 100/1381/89 102/1383/90 101/1382/90 +f 102/1383/90 88/1367/83 87/1369/83 o Body v -2.500000 0.000000 5.500000 v 2.500000 0.000000 5.500000 @@ -1794,6 +4117,24 @@ v 0.375000 2.500000 6.994000 v 0.346455 2.643506 6.994000 v 0.265165 2.765165 6.994000 v 0.143506 2.846455 6.994000 +v -0.000000 5.000000 5.250000 +v -0.956709 4.809699 5.250000 +v -1.767767 4.267767 5.250000 +v -2.309699 3.456709 5.250000 +v -2.500000 2.500000 5.250000 +v 2.500000 2.500000 5.250000 +v 2.309698 3.456709 5.250000 +v 1.767766 4.267767 5.250000 +v 0.956707 4.809699 5.250000 +v -0.000000 5.000000 3.750000 +v -0.956709 4.809699 3.750000 +v -1.767767 4.267767 3.750000 +v -2.309699 3.456709 3.750000 +v -2.500000 2.500000 3.750000 +v 2.500000 2.500000 3.750000 +v 2.309698 3.456709 3.750000 +v 1.767766 4.267767 3.750000 +v 0.956707 4.809699 3.750000 vt 0.293617 0.416667 vt 0.285106 0.277778 vt 0.293617 0.277778 @@ -1882,7 +4223,7 @@ vt 0.557447 0.416667 vt 0.557447 0.277778 vt 0.319149 0.055556 vt 0.319149 0.222222 -vt 0.285106 0.250000 +vt 0.285106 0.263889 vt 0.778723 0.694444 vt 0.897872 0.861111 vt 0.778723 0.861111 @@ -2079,9 +4420,9 @@ vt 0.353191 0.569444 vt 0.353191 0.482639 vt 0.353191 0.458333 vt 0.565957 0.416667 -vt 0.319149 0.250000 -vt 0.285106 0.027778 -vt 0.319149 0.027778 +vt 0.319149 0.263889 +vt 0.285106 0.013889 +vt 0.319149 0.013889 vt 0.285106 0.000000 vt 0.770213 0.416667 vt 0.676596 0.402778 @@ -2506,6 +4847,23 @@ vt 0.619149 0.718750 vt 0.619149 0.562500 vt 0.610638 0.552083 vt 0.619149 0.552083 +vt 0.017021 0.500000 +vt 0.068085 0.444444 +vt 0.017021 0.444444 +vt 0.017021 0.388889 +vt 0.068085 0.333333 +vt 0.017021 0.333333 +vt 0.017021 0.722222 +vt 0.068085 0.666667 +vt 0.017021 0.666667 +vt 0.017021 0.611111 +vt 0.068085 0.555556 +vt 0.017021 0.555556 +vt 0.068085 0.388889 +vt 0.068085 0.277778 +vt 0.017021 0.277778 +vt 0.068085 0.611111 +vt 0.068085 0.500000 vt 0.217021 0.416667 vt 0.217021 0.527778 vt 0.170213 0.680556 @@ -2578,6 +4936,7 @@ vt 0.610638 0.708333 vt 0.610638 0.541667 vt 0.610638 0.729167 vt 0.610638 0.562500 +vt 0.068085 0.722222 vn 0.0000 0.0000 -1.0000 vn 0.0000 -1.0000 0.0000 vn 0.0000 0.0000 1.0000 @@ -2633,549 +4992,567 @@ vn 0.0000 0.4472 0.8944 vn 0.9808 0.1951 0.0000 vn -0.9808 0.1951 0.0000 vn -0.9979 0.0653 0.0000 +vn 0.9808 -0.1951 0.0000 +vn -0.9808 -0.1951 0.0000 vn 0.7055 0.0666 0.7055 vn -0.7052 0.0728 0.7052 s off -f 494/471/59 452/472/59 492/473/59 -f 454/474/60 449/475/60 450/476/60 -f 475/477/61 477/478/61 478/479/61 -f 893/480/61 910/481/61 909/482/61 -f 900/483/61 917/484/61 916/485/61 -f 893/486/61 908/487/61 892/488/61 -f 899/489/61 916/490/61 915/491/61 -f 892/492/61 907/493/61 891/494/61 -f 899/495/61 914/496/61 898/497/61 -f 890/498/61 907/499/61 906/500/61 -f 898/501/61 913/502/61 897/503/61 -f 494/504/59 461/505/59 460/506/59 -f 495/507/59 462/508/59 461/505/59 -f 496/509/59 463/510/59 462/508/59 -f 497/511/59 455/512/59 463/510/59 -f 482/513/59 456/514/59 455/512/59 -f 483/515/59 457/516/59 456/514/59 -f 457/516/59 485/517/59 458/518/59 -f 486/519/59 458/518/59 485/520/59 -f 451/521/59 486/522/59 493/523/59 -f 500/524/59 505/525/59 511/526/59 -f 510/527/59 499/528/59 487/529/59 -f 509/530/59 487/531/59 488/532/59 -f 508/533/59 488/534/59 489/535/59 -f 507/536/59 489/537/59 490/538/59 -f 506/539/59 490/540/59 491/541/59 -f 514/542/59 491/543/59 503/544/59 -f 513/545/59 503/546/59 502/547/59 -f 501/548/59 513/549/59 502/550/59 -f 511/551/59 501/552/59 500/553/59 -f 559/554/59 522/555/59 516/556/59 -f 504/557/60 505/558/60 492/559/60 -f 492/559/60 450/476/60 449/475/60 -f 526/560/60 529/561/60 527/562/60 -f 530/563/62 536/564/62 532/565/62 -f 526/560/63 532/565/63 528/566/63 -f 527/567/61 534/568/61 526/569/61 -f 529/570/64 531/571/64 527/567/64 -f 537/572/65 534/573/65 535/574/65 -f 533/575/66 535/574/66 531/571/66 -f 539/576/64 543/577/64 538/578/64 -f 538/579/60 544/580/60 540/581/60 -f 540/581/63 545/582/63 541/583/63 -f 541/583/65 542/584/65 539/576/65 -f 550/585/59 552/586/59 551/587/59 -f 547/588/64 553/589/64 549/590/64 -f 548/591/63 551/587/63 546/592/63 -f 549/593/65 550/585/65 548/594/65 -f 546/595/60 552/586/60 547/596/60 -f 522/555/59 562/597/59 523/598/59 -f 523/598/59 563/599/59 524/600/59 -f 563/601/59 525/602/59 524/600/59 -f 525/602/59 554/603/59 518/604/59 -f 518/604/59 555/605/59 517/606/59 -f 555/607/59 519/608/59 517/606/59 -f 519/608/59 557/609/59 520/610/59 -f 520/610/59 558/611/59 521/612/59 -f 560/613/59 521/612/59 558/614/59 -f 566/615/59 568/616/59 571/617/59 -f 504/557/60 565/618/60 572/619/60 -f 622/620/61 609/621/61 616/622/61 -f 630/623/61 628/624/61 629/625/61 -f 626/626/65 631/627/65 627/628/65 -f 625/629/60 629/625/60 624/630/60 -f 627/631/64 630/623/64 625/632/64 -f 624/633/63 628/624/63 626/634/63 -f 676/635/63 678/636/63 677/637/63 -f 670/638/64 668/639/64 669/640/64 -f 667/641/60 670/638/60 665/642/60 -f 664/643/65 668/639/65 666/644/65 -f 666/645/59 671/646/59 667/647/59 -f 665/648/61 669/640/61 664/649/61 -f 675/650/59 676/635/59 674/651/59 -f 672/652/61 678/636/61 673/653/61 -f 673/654/60 679/655/60 675/656/60 -f 674/657/65 677/637/65 672/658/65 -f 890/659/61 905/660/61 889/661/61 -f 896/662/61 913/663/61 912/664/61 -f 889/665/61 903/666/61 887/667/61 -f 895/668/61 912/669/61 911/670/61 -f 902/671/61 904/672/61 918/673/61 -f 887/674/61 904/675/61 888/676/61 -f 895/677/61 910/678/61 894/679/61 -f 901/680/61 918/681/61 917/682/61 -f 685/683/65 715/684/65 694/685/65 -f 707/686/65 684/687/65 693/688/65 -f 700/689/61 704/690/61 706/691/61 -f 709/692/59 707/693/59 712/694/59 -f 686/695/61 687/696/61 706/691/61 -f 691/697/59 690/698/59 707/693/59 -f 735/699/60 736/700/60 734/701/60 -f 739/702/67 745/703/67 741/704/67 -f 735/705/59 741/704/59 737/706/59 -f 744/707/64 740/708/64 736/700/64 -f 736/709/61 738/710/61 734/711/61 -f 744/707/65 743/712/65 742/713/65 -f 740/714/68 742/713/68 738/710/68 -f 749/715/64 746/716/64 747/717/64 -f 528/718/59 537/719/59 529/570/59 -f 494/471/59 460/506/59 452/472/59 -f 454/474/60 453/720/60 449/475/60 -f 453/721/61 454/722/61 478/479/61 -f 478/479/61 479/723/61 480/724/61 -f 480/724/61 481/725/61 478/479/61 -f 481/725/61 473/726/61 478/479/61 -f 473/726/61 474/727/61 475/477/61 -f 475/477/61 476/728/61 477/478/61 -f 477/478/61 453/721/61 478/479/61 -f 473/726/61 475/477/61 478/479/61 -f 893/480/61 894/729/61 910/481/61 -f 900/483/61 901/730/61 917/484/61 -f 893/486/61 909/731/61 908/487/61 -f 899/489/61 900/732/61 916/490/61 -f 892/492/61 908/733/61 907/493/61 -f 899/495/61 915/734/61 914/496/61 -f 890/498/61 891/735/61 907/499/61 -f 898/501/61 914/736/61 913/502/61 -f 494/504/59 495/737/59 461/505/59 -f 495/507/59 496/738/59 462/508/59 -f 496/509/59 497/739/59 463/510/59 -f 497/511/59 482/740/59 455/512/59 -f 482/513/59 483/741/59 456/514/59 -f 483/515/59 484/742/59 457/516/59 -f 457/516/59 484/743/59 485/517/59 -f 486/519/59 459/744/59 458/518/59 -f 451/521/59 459/744/59 486/522/59 -f 500/524/59 498/745/59 505/525/59 -f 510/527/59 504/746/59 499/528/59 -f 509/530/59 510/747/59 487/531/59 -f 508/533/59 509/748/59 488/534/59 -f 507/536/59 508/749/59 489/537/59 -f 506/539/59 507/750/59 490/540/59 -f 514/542/59 506/751/59 491/543/59 -f 513/545/59 514/752/59 503/546/59 -f 501/548/59 512/753/59 513/549/59 -f 511/551/59 512/754/59 501/552/59 -f 559/554/59 561/755/59 522/555/59 -f 505/558/60 498/756/60 492/559/60 -f 492/559/60 493/757/60 504/557/60 -f 493/757/60 499/758/60 504/557/60 -f 449/475/60 451/759/60 493/757/60 -f 492/559/60 452/472/60 450/476/60 -f 449/475/60 493/757/60 492/559/60 -f 526/560/60 528/566/60 529/561/60 -f 530/563/62 534/573/62 536/564/62 -f 526/560/63 530/563/63 532/565/63 -f 527/567/61 531/571/61 535/760/61 -f 535/760/61 534/568/61 527/567/61 -f 534/568/61 530/761/61 526/569/61 -f 529/570/64 533/575/64 531/571/64 -f 537/572/65 536/564/65 534/573/65 -f 533/575/66 537/572/66 535/574/66 -f 539/576/64 542/584/64 543/577/64 -f 538/579/60 543/762/60 544/580/60 -f 540/581/63 544/580/63 545/582/63 -f 541/583/65 545/582/65 542/584/65 -f 550/585/59 553/589/59 552/586/59 -f 547/588/64 552/586/64 553/589/64 -f 548/591/63 550/585/63 551/587/63 -f 549/593/65 553/589/65 550/585/65 -f 546/595/60 551/587/60 552/586/60 -f 522/555/59 561/755/59 562/597/59 -f 523/598/59 562/763/59 563/599/59 -f 563/601/59 564/764/59 525/602/59 -f 525/602/59 564/765/59 554/603/59 -f 518/604/59 554/766/59 555/605/59 -f 555/607/59 556/767/59 519/608/59 -f 519/608/59 556/768/59 557/609/59 -f 520/610/59 557/769/59 558/611/59 -f 560/613/59 515/770/59 521/612/59 -f 572/771/59 565/772/59 566/615/59 -f 566/615/59 570/773/59 568/616/59 -f 570/773/59 569/774/59 568/616/59 -f 569/774/59 567/775/59 568/616/59 -f 568/616/59 575/776/59 574/777/59 -f 574/777/59 573/778/59 568/616/59 -f 573/778/59 571/617/59 568/616/59 -f 571/617/59 572/771/59 566/615/59 -f 516/779/60 505/558/60 572/619/60 -f 505/558/60 504/557/60 572/619/60 -f 504/557/60 515/780/60 565/618/60 -f 515/780/60 560/781/60 565/618/60 -f 572/619/60 559/782/60 516/779/60 -f 609/621/61 608/783/61 610/784/61 -f 610/784/61 611/785/61 612/786/61 -f 612/786/61 613/787/61 614/788/61 -f 614/788/61 615/789/61 616/622/61 -f 616/622/61 617/790/61 620/791/61 -f 617/790/61 618/792/61 620/791/61 -f 618/792/61 619/793/61 620/791/61 -f 620/791/61 621/794/61 622/620/61 -f 622/620/61 623/795/61 609/621/61 -f 609/621/61 610/784/61 616/622/61 -f 610/784/61 612/786/61 616/622/61 -f 612/786/61 614/788/61 616/622/61 -f 620/791/61 622/620/61 616/622/61 -f 630/623/61 631/627/61 628/624/61 -f 626/626/65 628/624/65 631/627/65 -f 625/629/60 630/623/60 629/625/60 -f 627/631/64 631/627/64 630/623/64 -f 624/633/63 629/625/63 628/624/63 -f 676/635/63 679/655/63 678/636/63 -f 670/638/64 671/646/64 668/639/64 -f 667/641/60 671/646/60 670/638/60 -f 664/643/65 669/640/65 668/639/65 -f 666/645/59 668/639/59 671/646/59 -f 665/648/61 670/638/61 669/640/61 -f 675/650/59 679/655/59 676/635/59 -f 672/652/61 677/637/61 678/636/61 -f 673/654/60 678/636/60 679/655/60 -f 674/657/65 676/635/65 677/637/65 -f 890/659/61 906/796/61 905/660/61 -f 896/662/61 897/797/61 913/663/61 -f 889/665/61 905/798/61 903/666/61 -f 895/668/61 896/799/61 912/669/61 -f 902/671/61 888/800/61 904/672/61 -f 887/674/61 903/801/61 904/675/61 -f 895/677/61 911/802/61 910/678/61 -f 901/680/61 902/803/61 918/681/61 -f 685/683/65 706/804/65 715/684/65 -f 707/686/65 698/805/65 684/687/65 -f 698/806/61 699/807/61 706/691/61 -f 699/807/61 700/689/61 706/691/61 -f 700/689/61 701/808/61 702/809/61 -f 702/809/61 703/810/61 700/689/61 -f 703/810/61 704/690/61 700/689/61 -f 704/690/61 705/811/61 706/691/61 -f 709/692/59 708/812/59 707/693/59 -f 707/693/59 715/813/59 714/814/59 -f 714/814/59 713/815/59 707/693/59 -f 713/815/59 712/694/59 707/693/59 -f 712/694/59 711/816/59 710/817/59 -f 710/817/59 709/692/59 712/694/59 -f 687/696/61 688/818/61 706/691/61 -f 688/818/61 680/819/61 706/691/61 -f 680/819/61 681/820/61 698/806/61 -f 681/820/61 682/821/61 698/806/61 -f 682/821/61 683/822/61 698/806/61 -f 683/822/61 684/823/61 698/806/61 -f 698/806/61 706/691/61 680/819/61 -f 706/691/61 685/824/61 686/695/61 -f 690/698/59 689/825/59 707/693/59 -f 689/825/59 697/826/59 715/813/59 -f 697/826/59 696/827/59 715/813/59 -f 696/827/59 695/828/59 715/813/59 -f 695/828/59 694/829/59 715/813/59 -f 707/693/59 693/830/59 692/831/59 -f 715/813/59 707/693/59 689/825/59 -f 692/831/59 691/697/59 707/693/59 -f 735/699/60 737/832/60 736/700/60 -f 739/702/67 743/712/67 745/703/67 -f 735/705/59 739/702/59 741/704/59 -f 736/700/64 737/832/64 744/707/64 -f 737/832/64 741/833/64 745/703/64 -f 744/707/64 737/832/64 745/703/64 -f 736/709/61 740/714/61 738/710/61 -f 744/707/65 745/703/65 743/712/65 -f 740/714/68 744/707/68 742/713/68 -f 749/715/64 748/834/64 746/716/64 -f 528/718/59 532/835/59 536/836/59 -f 536/836/59 537/719/59 528/718/59 -f 537/719/59 533/575/59 529/570/59 +f 1422/1385/91 1380/1386/91 1420/1387/91 +f 1382/1388/92 1377/1389/92 1378/1390/92 +f 1403/1391/93 1405/1392/93 1406/1393/93 +f 1821/1394/93 1838/1395/93 1837/1396/93 +f 1828/1397/93 1845/1398/93 1844/1399/93 +f 1821/1400/93 1836/1401/93 1820/1402/93 +f 1827/1403/93 1844/1404/93 1843/1405/93 +f 1820/1406/93 1835/1407/93 1819/1408/93 +f 1827/1409/93 1842/1410/93 1826/1411/93 +f 1818/1412/93 1835/1413/93 1834/1414/93 +f 1826/1415/93 1841/1416/93 1825/1417/93 +f 1422/1418/91 1389/1419/91 1388/1420/91 +f 1423/1421/91 1390/1422/91 1389/1419/91 +f 1424/1423/91 1391/1424/91 1390/1422/91 +f 1425/1425/91 1383/1426/91 1391/1424/91 +f 1410/1427/91 1384/1428/91 1383/1426/91 +f 1411/1429/91 1385/1430/91 1384/1428/91 +f 1385/1430/91 1413/1431/91 1386/1432/91 +f 1414/1433/91 1386/1432/91 1413/1434/91 +f 1379/1435/91 1414/1436/91 1421/1437/91 +f 1428/1438/91 1433/1439/91 1439/1440/91 +f 1438/1441/91 1427/1442/91 1415/1443/91 +f 1437/1444/91 1415/1445/91 1416/1446/91 +f 1436/1447/91 1416/1448/91 1417/1449/91 +f 1435/1450/91 1417/1451/91 1418/1452/91 +f 1434/1453/91 1418/1454/91 1419/1455/91 +f 1442/1456/91 1419/1457/91 1431/1458/91 +f 1441/1459/91 1431/1460/91 1430/1461/91 +f 1429/1462/91 1441/1463/91 1430/1464/91 +f 1439/1465/91 1429/1466/91 1428/1467/91 +f 1487/1468/91 1450/1469/91 1444/1470/91 +f 1432/1471/92 1433/1472/92 1420/1473/92 +f 1420/1473/92 1378/1390/92 1377/1389/92 +f 1454/1474/92 1457/1475/92 1455/1476/92 +f 1458/1477/94 1464/1478/94 1460/1479/94 +f 1454/1474/95 1460/1479/95 1456/1480/95 +f 1455/1481/93 1462/1482/93 1454/1483/93 +f 1457/1484/96 1459/1485/96 1455/1481/96 +f 1465/1486/97 1462/1487/97 1463/1488/97 +f 1461/1489/98 1463/1488/98 1459/1485/98 +f 1467/1490/96 1471/1491/96 1466/1492/96 +f 1466/1493/92 1472/1494/92 1468/1495/92 +f 1468/1495/95 1473/1496/95 1469/1497/95 +f 1469/1497/97 1470/1498/97 1467/1490/97 +f 1478/1499/91 1480/1500/91 1479/1501/91 +f 1475/1502/96 1481/1503/96 1477/1504/96 +f 1476/1505/95 1479/1501/95 1474/1506/95 +f 1477/1507/97 1478/1499/97 1476/1508/97 +f 1474/1509/92 1480/1500/92 1475/1510/92 +f 1450/1469/91 1490/1511/91 1451/1512/91 +f 1451/1512/91 1491/1513/91 1452/1514/91 +f 1491/1515/91 1453/1516/91 1452/1514/91 +f 1453/1516/91 1482/1517/91 1446/1518/91 +f 1446/1518/91 1483/1519/91 1445/1520/91 +f 1483/1521/91 1447/1522/91 1445/1520/91 +f 1447/1522/91 1485/1523/91 1448/1524/91 +f 1448/1524/91 1486/1525/91 1449/1526/91 +f 1488/1527/91 1449/1526/91 1486/1528/91 +f 1494/1529/91 1496/1530/91 1499/1531/91 +f 1432/1471/92 1493/1532/92 1500/1533/92 +f 1550/1534/93 1537/1535/93 1544/1536/93 +f 1558/1537/93 1556/1538/93 1557/1539/93 +f 1554/1540/97 1559/1541/97 1555/1542/97 +f 1553/1543/92 1557/1539/92 1552/1544/92 +f 1555/1545/96 1558/1537/96 1553/1546/96 +f 1552/1547/95 1556/1538/95 1554/1548/95 +f 1604/1549/95 1606/1550/95 1605/1551/95 +f 1598/1552/96 1596/1553/96 1597/1554/96 +f 1595/1555/92 1598/1552/92 1593/1556/92 +f 1592/1557/97 1596/1553/97 1594/1558/97 +f 1594/1559/91 1599/1560/91 1595/1561/91 +f 1593/1562/93 1597/1554/93 1592/1563/93 +f 1603/1564/91 1604/1549/91 1602/1565/91 +f 1600/1566/93 1606/1550/93 1601/1567/93 +f 1601/1568/92 1607/1569/92 1603/1570/92 +f 1602/1571/97 1605/1551/97 1600/1572/97 +f 1818/1573/93 1833/1574/93 1817/1575/93 +f 1824/1576/93 1841/1577/93 1840/1578/93 +f 1817/1579/93 1831/1580/93 1815/1581/93 +f 1823/1582/93 1840/1583/93 1839/1584/93 +f 1830/1585/93 1832/1586/93 1846/1587/93 +f 1815/1588/93 1832/1589/93 1816/1590/93 +f 1823/1591/93 1838/1592/93 1822/1593/93 +f 1829/1594/93 1846/1595/93 1845/1596/93 +f 1613/1597/97 1643/1598/97 1622/1599/97 +f 1635/1600/97 1612/1601/97 1621/1602/97 +f 1628/1603/93 1632/1604/93 1634/1605/93 +f 1637/1606/91 1635/1607/91 1640/1608/91 +f 1614/1609/93 1615/1610/93 1634/1605/93 +f 1619/1611/91 1618/1612/91 1635/1607/91 +f 1663/1613/92 1664/1614/92 1662/1615/92 +f 1667/1616/99 1673/1617/99 1669/1618/99 +f 1663/1619/91 1669/1618/91 1665/1620/91 +f 1672/1621/96 1668/1622/96 1664/1614/96 +f 1664/1623/93 1666/1624/93 1662/1625/93 +f 1672/1621/97 1671/1626/97 1670/1627/97 +f 1668/1628/100 1670/1627/100 1666/1624/100 +f 1677/1629/96 1674/1630/96 1675/1631/96 +f 1456/1632/91 1465/1633/91 1457/1484/91 +f 1422/1385/91 1388/1420/91 1380/1386/91 +f 1382/1388/92 1381/1634/92 1377/1389/92 +f 1381/1635/93 1382/1636/93 1406/1393/93 +f 1406/1393/93 1407/1637/93 1408/1638/93 +f 1408/1638/93 1409/1639/93 1406/1393/93 +f 1409/1639/93 1401/1640/93 1406/1393/93 +f 1401/1640/93 1402/1641/93 1403/1391/93 +f 1403/1391/93 1404/1642/93 1405/1392/93 +f 1405/1392/93 1381/1635/93 1406/1393/93 +f 1401/1640/93 1403/1391/93 1406/1393/93 +f 1821/1394/93 1822/1643/93 1838/1395/93 +f 1828/1397/93 1829/1644/93 1845/1398/93 +f 1821/1400/93 1837/1645/93 1836/1401/93 +f 1827/1403/93 1828/1646/93 1844/1404/93 +f 1820/1406/93 1836/1647/93 1835/1407/93 +f 1827/1409/93 1843/1648/93 1842/1410/93 +f 1818/1412/93 1819/1649/93 1835/1413/93 +f 1826/1415/93 1842/1650/93 1841/1416/93 +f 1422/1418/91 1423/1651/91 1389/1419/91 +f 1423/1421/91 1424/1652/91 1390/1422/91 +f 1424/1423/91 1425/1653/91 1391/1424/91 +f 1425/1425/91 1410/1654/91 1383/1426/91 +f 1410/1427/91 1411/1655/91 1384/1428/91 +f 1411/1429/91 1412/1656/91 1385/1430/91 +f 1385/1430/91 1412/1657/91 1413/1431/91 +f 1414/1433/91 1387/1658/91 1386/1432/91 +f 1379/1435/91 1387/1658/91 1414/1436/91 +f 1428/1438/91 1426/1659/91 1433/1439/91 +f 1438/1441/91 1432/1660/91 1427/1442/91 +f 1437/1444/91 1438/1661/91 1415/1445/91 +f 1436/1447/91 1437/1662/91 1416/1448/91 +f 1435/1450/91 1436/1663/91 1417/1451/91 +f 1434/1453/91 1435/1664/91 1418/1454/91 +f 1442/1456/91 1434/1665/91 1419/1457/91 +f 1441/1459/91 1442/1666/91 1431/1460/91 +f 1429/1462/91 1440/1667/91 1441/1463/91 +f 1439/1465/91 1440/1668/91 1429/1466/91 +f 1487/1468/91 1489/1669/91 1450/1469/91 +f 1433/1472/92 1426/1670/92 1420/1473/92 +f 1420/1473/92 1421/1671/92 1432/1471/92 +f 1421/1671/92 1427/1672/92 1432/1471/92 +f 1377/1389/92 1379/1673/92 1421/1671/92 +f 1420/1473/92 1380/1386/92 1378/1390/92 +f 1377/1389/92 1421/1671/92 1420/1473/92 +f 1454/1474/92 1456/1480/92 1457/1475/92 +f 1458/1477/94 1462/1487/94 1464/1478/94 +f 1454/1474/95 1458/1477/95 1460/1479/95 +f 1455/1481/93 1459/1485/93 1463/1674/93 +f 1463/1674/93 1462/1482/93 1455/1481/93 +f 1462/1482/93 1458/1675/93 1454/1483/93 +f 1457/1484/96 1461/1489/96 1459/1485/96 +f 1465/1486/97 1464/1478/97 1462/1487/97 +f 1461/1489/98 1465/1486/98 1463/1488/98 +f 1467/1490/96 1470/1498/96 1471/1491/96 +f 1466/1493/92 1471/1676/92 1472/1494/92 +f 1468/1495/95 1472/1494/95 1473/1496/95 +f 1469/1497/97 1473/1496/97 1470/1498/97 +f 1478/1499/91 1481/1503/91 1480/1500/91 +f 1475/1502/96 1480/1500/96 1481/1503/96 +f 1476/1505/95 1478/1499/95 1479/1501/95 +f 1477/1507/97 1481/1503/97 1478/1499/97 +f 1474/1509/92 1479/1501/92 1480/1500/92 +f 1450/1469/91 1489/1669/91 1490/1511/91 +f 1451/1512/91 1490/1677/91 1491/1513/91 +f 1491/1515/91 1492/1678/91 1453/1516/91 +f 1453/1516/91 1492/1679/91 1482/1517/91 +f 1446/1518/91 1482/1680/91 1483/1519/91 +f 1483/1521/91 1484/1681/91 1447/1522/91 +f 1447/1522/91 1484/1682/91 1485/1523/91 +f 1448/1524/91 1485/1683/91 1486/1525/91 +f 1488/1527/91 1443/1684/91 1449/1526/91 +f 1500/1685/91 1493/1686/91 1494/1529/91 +f 1494/1529/91 1498/1687/91 1496/1530/91 +f 1498/1687/91 1497/1688/91 1496/1530/91 +f 1497/1688/91 1495/1689/91 1496/1530/91 +f 1496/1530/91 1503/1690/91 1502/1691/91 +f 1502/1691/91 1501/1692/91 1496/1530/91 +f 1501/1692/91 1499/1531/91 1496/1530/91 +f 1499/1531/91 1500/1685/91 1494/1529/91 +f 1444/1693/92 1433/1472/92 1500/1533/92 +f 1433/1472/92 1432/1471/92 1500/1533/92 +f 1432/1471/92 1443/1694/92 1493/1532/92 +f 1443/1694/92 1488/1695/92 1493/1532/92 +f 1500/1533/92 1487/1696/92 1444/1693/92 +f 1537/1535/93 1536/1697/93 1538/1698/93 +f 1538/1698/93 1539/1699/93 1540/1700/93 +f 1540/1700/93 1541/1701/93 1542/1702/93 +f 1542/1702/93 1543/1703/93 1544/1536/93 +f 1544/1536/93 1545/1704/93 1548/1705/93 +f 1545/1704/93 1546/1706/93 1548/1705/93 +f 1546/1706/93 1547/1707/93 1548/1705/93 +f 1548/1705/93 1549/1708/93 1550/1534/93 +f 1550/1534/93 1551/1709/93 1537/1535/93 +f 1537/1535/93 1538/1698/93 1544/1536/93 +f 1538/1698/93 1540/1700/93 1544/1536/93 +f 1540/1700/93 1542/1702/93 1544/1536/93 +f 1548/1705/93 1550/1534/93 1544/1536/93 +f 1558/1537/93 1559/1541/93 1556/1538/93 +f 1554/1540/97 1556/1538/97 1559/1541/97 +f 1553/1543/92 1558/1537/92 1557/1539/92 +f 1555/1545/96 1559/1541/96 1558/1537/96 +f 1552/1547/95 1557/1539/95 1556/1538/95 +f 1604/1549/95 1607/1569/95 1606/1550/95 +f 1598/1552/96 1599/1560/96 1596/1553/96 +f 1595/1555/92 1599/1560/92 1598/1552/92 +f 1592/1557/97 1597/1554/97 1596/1553/97 +f 1594/1559/91 1596/1553/91 1599/1560/91 +f 1593/1562/93 1598/1552/93 1597/1554/93 +f 1603/1564/91 1607/1569/91 1604/1549/91 +f 1600/1566/93 1605/1551/93 1606/1550/93 +f 1601/1568/92 1606/1550/92 1607/1569/92 +f 1602/1571/97 1604/1549/97 1605/1551/97 +f 1818/1573/93 1834/1710/93 1833/1574/93 +f 1824/1576/93 1825/1711/93 1841/1577/93 +f 1817/1579/93 1833/1712/93 1831/1580/93 +f 1823/1582/93 1824/1713/93 1840/1583/93 +f 1830/1585/93 1816/1714/93 1832/1586/93 +f 1815/1588/93 1831/1715/93 1832/1589/93 +f 1823/1591/93 1839/1716/93 1838/1592/93 +f 1829/1594/93 1830/1717/93 1846/1595/93 +f 1613/1597/97 1634/1718/97 1643/1598/97 +f 1635/1600/97 1626/1719/97 1612/1601/97 +f 1626/1720/93 1627/1721/93 1634/1605/93 +f 1627/1721/93 1628/1603/93 1634/1605/93 +f 1628/1603/93 1629/1722/93 1630/1723/93 +f 1630/1723/93 1631/1724/93 1628/1603/93 +f 1631/1724/93 1632/1604/93 1628/1603/93 +f 1632/1604/93 1633/1725/93 1634/1605/93 +f 1637/1606/91 1636/1726/91 1635/1607/91 +f 1635/1607/91 1643/1727/91 1642/1728/91 +f 1642/1728/91 1641/1729/91 1635/1607/91 +f 1641/1729/91 1640/1608/91 1635/1607/91 +f 1640/1608/91 1639/1730/91 1638/1731/91 +f 1638/1731/91 1637/1606/91 1640/1608/91 +f 1615/1610/93 1616/1732/93 1634/1605/93 +f 1616/1732/93 1608/1733/93 1634/1605/93 +f 1608/1733/93 1609/1734/93 1626/1720/93 +f 1609/1734/93 1610/1735/93 1626/1720/93 +f 1610/1735/93 1611/1736/93 1626/1720/93 +f 1611/1736/93 1612/1737/93 1626/1720/93 +f 1626/1720/93 1634/1605/93 1608/1733/93 +f 1634/1605/93 1613/1738/93 1614/1609/93 +f 1618/1612/91 1617/1739/91 1635/1607/91 +f 1617/1739/91 1625/1740/91 1643/1727/91 +f 1625/1740/91 1624/1741/91 1643/1727/91 +f 1624/1741/91 1623/1742/91 1643/1727/91 +f 1623/1742/91 1622/1743/91 1643/1727/91 +f 1635/1607/91 1621/1744/91 1620/1745/91 +f 1643/1727/91 1635/1607/91 1617/1739/91 +f 1620/1745/91 1619/1611/91 1635/1607/91 +f 1663/1613/92 1665/1746/92 1664/1614/92 +f 1667/1616/99 1671/1626/99 1673/1617/99 +f 1663/1619/91 1667/1616/91 1669/1618/91 +f 1664/1614/96 1665/1746/96 1672/1621/96 +f 1665/1746/96 1669/1747/96 1673/1617/96 +f 1672/1621/96 1665/1746/96 1673/1617/96 +f 1664/1623/93 1668/1628/93 1666/1624/93 +f 1672/1621/97 1673/1617/97 1671/1626/97 +f 1668/1628/100 1672/1621/100 1670/1627/100 +f 1677/1629/96 1676/1748/96 1674/1630/96 +f 1456/1632/91 1460/1749/91 1464/1750/91 +f 1464/1750/91 1465/1633/91 1456/1632/91 +f 1465/1633/91 1461/1489/91 1457/1484/91 s 1 -f 848/837/69 865/838/70 847/839/71 -f 844/840/62 861/841/72 843/842/72 -f 842/843/65 868/844/73 850/845/73 -f 849/846/66 866/847/69 848/837/69 -f 845/848/74 862/849/62 844/840/62 -f 842/843/65 861/841/72 860/850/65 -f 857/851/69 876/852/66 858/853/66 -f 853/854/62 872/855/74 854/856/74 -f 846/857/75 863/858/74 845/848/74 -f 850/845/73 867/859/66 849/846/66 -f 834/860/76 826/861/77 835/862/77 -f 826/861/77 836/863/78 835/864/77 -f 836/865/78 828/866/79 837/867/79 -f 837/868/79 820/869/80 829/870/80 -f 821/871/81 829/872/80 820/869/80 -f 822/873/82 830/874/81 821/871/81 -f 823/875/83 831/876/82 822/873/82 -f 824/877/84 832/878/83 823/875/83 -f 818/879/85 824/877/84 816/880/85 -f 817/881/86 834/882/76 819/883/86 -f 773/884/87 787/885/88 774/886/88 -f 776/887/89 783/888/64 778/889/64 -f 779/890/90 791/891/91 780/892/91 -f 782/893/92 786/894/60 772/895/60 -f 772/896/60 785/897/87 773/898/87 -f 777/899/63 789/900/90 779/890/90 -f 775/901/93 784/902/89 776/903/89 -f 781/904/94 793/905/92 782/906/92 -f 774/907/88 788/908/93 775/909/93 -f 780/910/91 792/911/94 781/912/94 -f 796/913/62 800/914/74 797/915/74 -f 798/916/75 811/917/63 805/918/63 -f 806/919/71 813/920/69 807/921/69 -f 809/922/73 803/923/65 794/924/65 -f 804/925/64 812/926/71 806/927/71 -f 795/928/72 801/929/62 796/930/62 -f 808/931/66 815/932/73 809/933/73 -f 794/934/65 802/935/72 795/936/72 -f 797/937/74 799/938/75 798/939/75 -f 807/940/69 814/941/66 808/942/66 -f 927/943/95 942/944/96 943/945/95 -f 576/946/65 607/947/73 591/948/73 -f 585/949/87 600/950/60 584/951/60 -f 578/952/62 592/953/72 577/954/72 -f 586/955/88 601/956/87 585/957/87 -f 579/958/74 594/959/62 578/960/62 -f 587/961/93 602/962/88 586/963/88 -f 580/964/63 595/965/74 579/966/74 -f 588/967/64 603/968/93 587/969/93 -f 581/970/91 596/971/63 580/972/63 -f 589/973/69 604/974/64 588/975/64 -f 582/976/94 597/977/91 581/978/91 -f 590/979/66 605/980/69 589/981/69 -f 583/982/92 598/983/94 582/984/94 -f 591/985/73 606/986/66 590/987/66 -f 584/988/60 599/989/92 583/990/92 -f 577/991/72 593/992/65 576/993/65 -f 934/994/97 949/995/98 950/996/97 -f 926/997/96 941/998/99 942/944/96 -f 932/999/100 949/995/98 933/1000/98 -f 924/1001/101 941/998/99 925/1002/99 -f 931/1003/102 948/1004/100 932/1005/100 -f 924/1006/101 939/1007/103 940/1008/101 -f 930/1009/104 947/1010/102 931/1011/102 -f 923/1012/103 938/1013/105 939/1007/103 -f 929/1014/106 946/1015/104 930/1016/104 -f 921/1017/107 938/1013/105 922/1018/105 -f 928/1019/108 945/1020/106 929/1021/106 -f 920/1022/109 937/1023/107 921/1024/107 -f 927/1025/95 944/1026/108 928/1027/108 -f 919/1028/110 950/996/97 935/1029/110 -f 920/1030/109 935/1029/110 936/1031/109 -f 634/1032/62 651/1033/74 635/1034/74 -f 642/1035/88 659/1036/93 643/1037/93 -f 635/1034/74 652/1038/63 636/1039/63 -f 643/1037/93 660/1040/64 644/1041/64 -f 636/1039/63 653/1042/91 637/1043/91 -f 644/1041/64 661/1044/69 645/1045/69 -f 637/1043/91 654/1046/94 638/1047/94 -f 645/1045/69 662/1048/66 646/1049/66 -f 638/1047/94 655/1050/92 639/1051/92 -f 646/1049/66 663/1052/73 647/1053/73 -f 639/1051/92 656/1054/60 640/1055/60 -f 632/1056/65 649/1057/72 633/1058/72 -f 647/1053/73 648/1059/65 632/1056/65 -f 640/1060/60 657/1061/87 641/1062/87 -f 633/1058/72 650/1063/62 634/1032/62 -f 641/1062/87 658/1064/88 642/1035/88 -f 878/1065/111 471/1066/69 472/1067/111 -f 879/1068/69 470/1069/66 471/1066/69 -f 880/1070/66 469/1071/73 470/1069/66 -f 881/1072/73 468/1073/65 469/1071/73 -f 882/1074/65 467/1075/72 468/1073/65 -f 883/1076/72 466/1077/62 467/1075/72 -f 884/1078/62 465/1079/74 466/1077/62 -f 885/1080/74 464/1081/112 465/1079/74 -f 733/1082/73 716/1083/65 724/1084/73 -f 731/1085/69 723/1086/66 722/1087/69 -f 728/1088/74 720/1089/112 719/1090/74 -f 726/1091/72 718/1092/62 717/1093/72 -f 732/1094/66 724/1084/73 723/1086/66 -f 730/1095/111 722/1087/69 721/1096/111 -f 727/1097/62 719/1090/74 718/1092/62 -f 725/1098/65 717/1093/72 716/1083/65 -f 759/1099/66 771/1100/73 760/1101/73 -f 756/1102/75 761/1103/63 750/1104/63 -f 754/1105/62 766/1106/74 755/1107/74 -f 760/1101/73 764/1108/65 752/1109/65 -f 757/1110/71 769/1111/69 758/1112/69 -f 755/1107/74 767/1113/75 756/1102/75 -f 752/1109/65 763/1114/72 753/1115/72 -f 758/1112/69 770/1116/66 759/1099/66 -f 751/1117/64 768/1118/71 757/1110/71 -f 753/1115/72 765/1119/62 754/1105/62 -f 851/1120/65 870/1121/72 852/1122/72 -f 858/853/66 877/1123/73 859/1124/73 -f 854/856/74 873/1125/113 855/1126/75 -f 856/1127/71 875/1128/69 857/851/69 -f 852/1122/72 871/1129/62 853/854/62 -f 859/1124/73 869/1130/65 851/1120/65 -f 841/1131/64 865/838/70 874/1132/70 -f 864/1133/113 846/857/75 840/1134/63 -f 956/1135/69 971/1136/64 955/1137/64 -f 964/1138/91 979/1139/63 963/1140/63 -f 957/1141/66 972/1142/69 956/1143/69 -f 965/1144/94 980/1145/91 964/1146/91 -f 957/1147/66 974/1148/73 973/1149/66 -f 966/1150/92 981/1151/94 965/1152/94 -f 959/1153/65 974/1154/73 958/1155/73 -f 951/1156/87 968/1157/60 952/1158/60 -f 952/1159/60 982/1160/92 966/1161/92 -f 959/1162/65 976/1163/72 975/1164/65 -f 953/1165/88 967/1166/87 951/1167/87 -f 961/1168/62 976/1169/72 960/1170/72 -f 954/1171/93 969/1172/88 953/1173/88 -f 962/1174/74 977/1175/62 961/1176/62 -f 955/1177/64 970/1178/93 954/1179/93 -f 963/1180/63 978/1181/74 962/1182/74 -f 848/837/69 866/847/69 865/838/70 -f 844/840/62 862/849/62 861/841/72 -f 842/843/65 860/850/65 868/844/73 -f 849/846/66 867/859/66 866/847/69 -f 845/848/74 863/858/74 862/849/62 -f 842/843/65 843/842/72 861/841/72 -f 857/851/69 875/1128/69 876/852/66 -f 853/854/62 871/1129/62 872/855/74 -f 846/857/75 864/1133/113 863/858/74 -f 850/845/73 868/844/73 867/859/66 -f 834/860/76 825/1183/114 826/861/77 -f 826/861/77 827/1184/78 836/863/78 -f 836/865/78 827/1184/78 828/866/79 -f 837/868/79 828/866/79 820/869/80 -f 821/871/81 830/1185/81 829/872/80 -f 822/873/82 831/1186/82 830/874/81 -f 823/875/83 832/1187/83 831/876/82 -f 824/877/84 833/1188/115 832/878/83 -f 818/879/85 833/1189/115 824/877/84 -f 817/881/86 825/1183/114 834/882/76 -f 773/884/87 785/1190/87 787/885/88 -f 776/887/89 784/1191/89 783/888/64 -f 779/890/90 789/900/90 791/891/91 -f 782/893/92 793/1192/92 786/894/60 -f 772/896/60 786/1193/60 785/897/87 -f 777/899/63 790/1194/63 789/900/90 -f 775/901/93 788/1195/93 784/902/89 -f 781/904/94 792/1196/94 793/905/92 -f 774/907/88 787/1197/88 788/908/93 -f 780/910/91 791/1198/91 792/911/94 -f 796/913/62 801/1199/62 800/914/74 -f 798/916/75 799/1200/75 811/917/63 -f 806/919/71 812/1201/71 813/920/69 -f 809/922/73 815/1202/73 803/923/65 -f 804/925/64 810/1203/64 812/926/71 -f 795/928/72 802/1204/72 801/929/62 -f 808/931/66 814/1205/66 815/932/73 -f 794/934/65 803/1206/65 802/935/72 -f 797/937/74 800/1207/74 799/938/75 -f 807/940/69 813/1208/69 814/941/66 -f 927/943/95 926/1209/96 942/944/96 -f 576/946/65 593/1210/65 607/947/73 -f 585/949/87 601/1211/87 600/950/60 -f 578/952/62 594/1212/62 592/953/72 -f 586/955/88 602/1213/88 601/956/87 -f 579/958/74 595/1214/74 594/959/62 -f 587/961/93 603/1215/93 602/962/88 -f 580/964/63 596/1216/63 595/965/74 -f 588/967/64 604/1217/64 603/968/93 -f 581/970/91 597/1218/91 596/971/63 -f 589/973/69 605/1219/69 604/974/64 -f 582/976/94 598/1220/94 597/977/91 -f 590/979/66 606/1221/66 605/980/69 -f 583/982/92 599/1222/92 598/983/94 -f 591/985/73 607/1223/73 606/986/66 -f 584/988/60 600/1224/60 599/989/92 -f 577/991/72 592/1225/72 593/992/65 -f 934/994/97 933/1226/98 949/995/98 -f 926/997/96 925/1227/99 941/998/99 -f 932/999/100 948/1004/100 949/995/98 -f 924/1001/101 940/1008/101 941/998/99 -f 931/1003/102 947/1010/102 948/1004/100 -f 924/1006/101 923/1228/103 939/1007/103 -f 930/1009/104 946/1015/104 947/1010/102 -f 923/1012/103 922/1229/105 938/1013/105 -f 929/1014/106 945/1020/106 946/1015/104 -f 921/1017/107 937/1023/107 938/1013/105 -f 928/1019/108 944/1026/108 945/1020/106 -f 920/1022/109 936/1031/109 937/1023/107 -f 927/1025/95 943/1230/95 944/1026/108 -f 919/1028/110 934/1231/97 950/996/97 -f 920/1030/109 919/1232/110 935/1029/110 -f 634/1032/62 650/1063/62 651/1033/74 -f 642/1035/88 658/1064/88 659/1036/93 -f 635/1034/74 651/1033/74 652/1038/63 -f 643/1037/93 659/1036/93 660/1040/64 -f 636/1039/63 652/1038/63 653/1042/91 -f 644/1041/64 660/1040/64 661/1044/69 -f 637/1043/91 653/1042/91 654/1046/94 -f 645/1045/69 661/1044/69 662/1048/66 -f 638/1047/94 654/1046/94 655/1050/92 -f 646/1049/66 662/1048/66 663/1052/73 -f 639/1051/92 655/1050/92 656/1054/60 -f 632/1056/65 648/1059/65 649/1057/72 -f 647/1053/73 663/1052/73 648/1059/65 -f 640/1060/60 656/1233/60 657/1061/87 -f 633/1058/72 649/1057/72 650/1063/62 -f 641/1062/87 657/1061/87 658/1064/88 -f 878/1065/111 879/1068/69 471/1066/69 -f 879/1068/69 880/1070/66 470/1069/66 -f 880/1070/66 881/1072/73 469/1071/73 -f 881/1072/73 882/1074/65 468/1073/65 -f 882/1074/65 883/1076/72 467/1075/72 -f 883/1076/72 884/1078/62 466/1077/62 -f 884/1078/62 885/1080/74 465/1079/74 -f 885/1080/74 886/1234/112 464/1081/112 -f 733/1082/73 725/1098/65 716/1083/65 -f 731/1085/69 732/1094/66 723/1086/66 -f 728/1088/74 729/1235/112 720/1089/112 -f 726/1091/72 727/1097/62 718/1092/62 -f 732/1094/66 733/1082/73 724/1084/73 -f 730/1095/111 731/1085/69 722/1087/69 -f 727/1097/62 728/1088/74 719/1090/74 -f 725/1098/65 726/1091/72 717/1093/72 -f 759/1099/66 770/1116/66 771/1100/73 -f 756/1102/75 767/1113/75 761/1103/63 -f 754/1105/62 765/1119/62 766/1106/74 -f 760/1101/73 771/1100/73 764/1108/65 -f 757/1110/71 768/1118/71 769/1111/69 -f 755/1107/74 766/1106/74 767/1113/75 -f 752/1109/65 764/1108/65 763/1114/72 -f 758/1112/69 769/1111/69 770/1116/66 -f 751/1117/64 762/1236/64 768/1118/71 -f 753/1115/72 763/1114/72 765/1119/62 -f 851/1120/65 869/1130/65 870/1121/72 -f 858/853/66 876/852/66 877/1123/73 -f 854/856/74 872/855/74 873/1125/113 -f 856/1127/71 874/1132/70 875/1128/69 -f 852/1122/72 870/1121/72 871/1129/62 -f 859/1124/73 877/1123/73 869/1130/65 -f 856/1127/71 839/1237/64 874/1132/70 -f 839/1237/64 841/1131/64 874/1132/70 -f 841/1131/64 847/839/71 865/838/70 -f 840/1134/63 838/1238/63 873/1125/113 -f 838/1238/63 855/1126/75 873/1125/113 -f 873/1125/113 864/1133/113 840/1134/63 -f 956/1135/69 972/1239/69 971/1136/64 -f 964/1138/91 980/1240/91 979/1139/63 -f 957/1141/66 973/1241/66 972/1142/69 -f 965/1144/94 981/1242/94 980/1145/91 -f 957/1147/66 958/1243/73 974/1148/73 -f 966/1150/92 982/1244/92 981/1151/94 -f 959/1153/65 975/1245/65 974/1154/73 -f 951/1156/87 967/1246/87 968/1157/60 -f 952/1159/60 968/1247/60 982/1160/92 -f 959/1162/65 960/1248/72 976/1163/72 -f 953/1165/88 969/1249/88 967/1166/87 -f 961/1168/62 977/1250/62 976/1169/72 -f 954/1171/93 970/1251/93 969/1172/88 -f 962/1174/74 978/1252/74 977/1175/62 -f 955/1177/64 971/1253/64 970/1178/93 -f 963/1180/63 979/1254/63 978/1181/74 +f 1776/1751/101 1793/1752/102 1775/1753/103 +f 1772/1754/94 1789/1755/104 1771/1756/104 +f 1770/1757/97 1796/1758/105 1778/1759/105 +f 1777/1760/98 1794/1761/101 1776/1751/101 +f 1773/1762/106 1790/1763/94 1772/1754/94 +f 1770/1757/97 1789/1755/104 1788/1764/97 +f 1785/1765/101 1804/1766/98 1786/1767/98 +f 1781/1768/94 1800/1769/106 1782/1770/106 +f 1774/1771/107 1791/1772/106 1773/1762/106 +f 1778/1759/105 1795/1773/98 1777/1760/98 +f 1762/1774/108 1754/1775/109 1763/1776/109 +f 1754/1775/109 1764/1777/110 1763/1778/109 +f 1764/1779/110 1756/1780/111 1765/1781/111 +f 1765/1782/111 1748/1783/112 1757/1784/112 +f 1749/1785/113 1757/1786/112 1748/1783/112 +f 1750/1787/114 1758/1788/113 1749/1785/113 +f 1751/1789/115 1759/1790/114 1750/1787/114 +f 1752/1791/116 1760/1792/115 1751/1789/115 +f 1746/1793/117 1752/1791/116 1744/1794/117 +f 1745/1795/118 1762/1796/108 1747/1797/118 +f 1701/1798/119 1715/1799/120 1702/1800/120 +f 1704/1801/121 1711/1802/96 1706/1803/96 +f 1707/1804/122 1719/1805/123 1708/1806/123 +f 1710/1807/124 1714/1808/92 1700/1809/92 +f 1700/1810/92 1713/1811/119 1701/1812/119 +f 1705/1813/95 1717/1814/122 1707/1804/122 +f 1703/1815/125 1712/1816/121 1704/1817/121 +f 1709/1818/126 1721/1819/124 1710/1820/124 +f 1702/1821/120 1716/1822/125 1703/1823/125 +f 1708/1824/123 1720/1825/126 1709/1826/126 +f 1724/1827/94 1728/1828/106 1725/1829/106 +f 1726/1830/107 1739/1831/95 1733/1832/95 +f 1734/1833/103 1741/1834/101 1735/1835/101 +f 1737/1836/105 1731/1837/97 1722/1838/97 +f 1732/1839/96 1740/1840/103 1734/1841/103 +f 1723/1842/104 1729/1843/94 1724/1844/94 +f 1736/1845/98 1743/1846/105 1737/1847/105 +f 1722/1848/97 1730/1849/104 1723/1850/104 +f 1725/1851/106 1727/1852/107 1726/1853/107 +f 1735/1854/101 1742/1855/98 1736/1856/98 +f 1855/1857/127 1870/1858/128 1871/1859/127 +f 1504/1860/97 1535/1861/105 1519/1862/105 +f 1513/1863/119 1528/1864/92 1512/1865/92 +f 1506/1866/94 1520/1867/104 1505/1868/104 +f 1514/1869/120 1529/1870/119 1513/1871/119 +f 1507/1872/106 1522/1873/94 1506/1874/94 +f 1515/1875/125 1530/1876/120 1514/1877/120 +f 1508/1878/95 1523/1879/106 1507/1880/106 +f 1516/1881/96 1531/1882/125 1515/1883/125 +f 1509/1884/123 1524/1885/95 1508/1886/95 +f 1517/1887/101 1532/1888/96 1516/1889/96 +f 1510/1890/126 1525/1891/123 1509/1892/123 +f 1518/1893/98 1533/1894/101 1517/1895/101 +f 1511/1896/124 1526/1897/126 1510/1898/126 +f 1519/1899/105 1534/1900/98 1518/1901/98 +f 1512/1902/92 1527/1903/124 1511/1904/124 +f 1505/1905/104 1521/1906/97 1504/1907/97 +f 1862/1908/129 1877/1909/130 1878/1910/129 +f 1854/1911/128 1869/1912/131 1870/1858/128 +f 1860/1913/132 1877/1909/130 1861/1914/130 +f 1852/1915/133 1869/1912/131 1853/1916/131 +f 1859/1917/134 1876/1918/132 1860/1919/132 +f 1852/1920/133 1867/1921/135 1868/1922/133 +f 1858/1923/136 1875/1924/134 1859/1925/134 +f 1851/1926/135 1866/1927/137 1867/1921/135 +f 1857/1928/138 1874/1929/136 1858/1930/136 +f 1849/1931/139 1866/1927/137 1850/1932/137 +f 1856/1933/140 1873/1934/138 1857/1935/138 +f 1848/1936/141 1865/1937/139 1849/1938/139 +f 1855/1939/127 1872/1940/140 1856/1941/140 +f 1847/1942/142 1878/1910/129 1863/1943/142 +f 1848/1944/141 1863/1943/142 1864/1945/141 +f 1562/1946/94 1579/1947/106 1563/1948/106 +f 1570/1949/120 1587/1950/125 1571/1951/125 +f 1563/1948/106 1580/1952/95 1564/1953/95 +f 1571/1951/125 1588/1954/96 1572/1955/96 +f 1564/1953/95 1581/1956/123 1565/1957/123 +f 1572/1955/96 1589/1958/101 1573/1959/101 +f 1565/1957/123 1582/1960/126 1566/1961/126 +f 1573/1959/101 1590/1962/98 1574/1963/98 +f 1566/1961/126 1583/1964/124 1567/1965/124 +f 1574/1963/98 1591/1966/105 1575/1967/105 +f 1567/1965/124 1584/1968/92 1568/1969/92 +f 1560/1970/97 1577/1971/104 1561/1972/104 +f 1575/1967/105 1576/1973/97 1560/1970/97 +f 1568/1974/92 1585/1975/119 1569/1976/119 +f 1561/1972/104 1578/1977/94 1562/1946/94 +f 1569/1976/119 1586/1978/120 1570/1949/120 +f 1806/1979/143 1399/1980/101 1400/1981/143 +f 1807/1982/101 1398/1983/98 1399/1980/101 +f 1808/1984/98 1397/1985/105 1398/1983/98 +f 1809/1986/105 1396/1987/97 1397/1985/105 +f 1810/1988/97 1395/1989/104 1396/1987/97 +f 1811/1990/104 1394/1991/94 1395/1989/104 +f 1812/1992/94 1393/1993/106 1394/1991/94 +f 1813/1994/106 1392/1995/144 1393/1993/106 +f 1661/1996/105 1644/1997/97 1652/1998/105 +f 1659/1999/101 1651/2000/98 1650/2001/101 +f 1656/2002/106 1648/2003/144 1647/2004/106 +f 1654/2005/104 1646/2006/94 1645/2007/104 +f 1660/2008/98 1652/1998/105 1651/2000/98 +f 1658/2009/143 1650/2001/101 1649/2010/143 +f 1655/2011/94 1647/2004/106 1646/2006/94 +f 1653/2012/97 1645/2007/104 1644/1997/97 +f 1687/2013/98 1699/2014/105 1688/2015/105 +f 1684/2016/107 1689/2017/95 1678/2018/95 +f 1682/2019/94 1694/2020/106 1683/2021/106 +f 1688/2015/105 1692/2022/97 1680/2023/97 +f 1685/2024/103 1697/2025/101 1686/2026/101 +f 1683/2021/106 1695/2027/107 1684/2016/107 +f 1680/2023/97 1691/2028/104 1681/2029/104 +f 1686/2026/101 1698/2030/98 1687/2013/98 +f 1679/2031/96 1696/2032/103 1685/2024/103 +f 1681/2029/104 1693/2033/94 1682/2019/94 +f 1779/2034/97 1798/2035/104 1780/2036/104 +f 1786/1767/98 1805/2037/105 1787/2038/105 +f 1782/1770/106 1801/2039/145 1783/2040/107 +f 1784/2041/103 1803/2042/101 1785/1765/101 +f 1780/2036/104 1799/2043/94 1781/1768/94 +f 1787/2038/105 1797/2044/97 1779/2034/97 +f 1769/2045/96 1793/1752/102 1802/2046/102 +f 1792/2047/145 1774/1771/107 1768/2048/95 +f 1884/2049/101 1899/2050/96 1883/2051/96 +f 1892/2052/123 1907/2053/95 1891/2054/95 +f 1885/2055/98 1900/2056/101 1884/2057/101 +f 1893/2058/126 1908/2059/123 1892/2060/123 +f 1885/2061/98 1902/2062/105 1901/2063/98 +f 1894/2064/124 1909/2065/126 1893/2066/126 +f 1887/2067/97 1902/2068/105 1886/2069/105 +f 1879/2070/119 1896/2071/92 1880/2072/92 +f 1880/2073/92 1910/2074/124 1894/2075/124 +f 1887/2076/97 1904/2077/104 1903/2078/97 +f 1881/2079/120 1895/2080/119 1879/2081/119 +f 1889/2082/94 1904/2083/104 1888/2084/104 +f 1882/2085/125 1897/2086/120 1881/2087/120 +f 1890/2088/106 1905/2089/94 1889/2090/94 +f 1883/2091/96 1898/2092/125 1882/2093/125 +f 1891/2094/95 1906/2095/106 1890/2096/106 +f 1911/2097/92 1928/2098/124 1919/2099/124 +f 1918/2100/126 1926/2101/123 1917/2102/123 +f 1915/2103/146 1923/2104/125 1914/2105/125 +f 1913/2106/120 1921/2107/119 1912/2108/119 +f 1919/2099/124 1927/2109/126 1918/2100/126 +f 1917/2102/123 1925/2110/147 1916/2111/147 +f 1914/2105/125 1922/2112/120 1913/2106/120 +f 1912/2108/119 1920/2113/92 1911/2097/92 +f 1776/1751/101 1794/1761/101 1793/1752/102 +f 1772/1754/94 1790/1763/94 1789/1755/104 +f 1770/1757/97 1788/1764/97 1796/1758/105 +f 1777/1760/98 1795/1773/98 1794/1761/101 +f 1773/1762/106 1791/1772/106 1790/1763/94 +f 1770/1757/97 1771/1756/104 1789/1755/104 +f 1785/1765/101 1803/2042/101 1804/1766/98 +f 1781/1768/94 1799/2043/94 1800/1769/106 +f 1774/1771/107 1792/2047/145 1791/1772/106 +f 1778/1759/105 1796/1758/105 1795/1773/98 +f 1762/1774/108 1753/2114/148 1754/1775/109 +f 1754/1775/109 1755/2115/110 1764/1777/110 +f 1764/1779/110 1755/2115/110 1756/1780/111 +f 1765/1782/111 1756/1780/111 1748/1783/112 +f 1749/1785/113 1758/2116/113 1757/1786/112 +f 1750/1787/114 1759/2117/114 1758/1788/113 +f 1751/1789/115 1760/2118/115 1759/1790/114 +f 1752/1791/116 1761/2119/149 1760/1792/115 +f 1746/1793/117 1761/2120/149 1752/1791/116 +f 1745/1795/118 1753/2114/148 1762/1796/108 +f 1701/1798/119 1713/2121/119 1715/1799/120 +f 1704/1801/121 1712/2122/121 1711/1802/96 +f 1707/1804/122 1717/1814/122 1719/1805/123 +f 1710/1807/124 1721/2123/124 1714/1808/92 +f 1700/1810/92 1714/2124/92 1713/1811/119 +f 1705/1813/95 1718/2125/95 1717/1814/122 +f 1703/1815/125 1716/2126/125 1712/1816/121 +f 1709/1818/126 1720/2127/126 1721/1819/124 +f 1702/1821/120 1715/2128/120 1716/1822/125 +f 1708/1824/123 1719/2129/123 1720/1825/126 +f 1724/1827/94 1729/2130/94 1728/1828/106 +f 1726/1830/107 1727/2131/107 1739/1831/95 +f 1734/1833/103 1740/2132/103 1741/1834/101 +f 1737/1836/105 1743/2133/105 1731/1837/97 +f 1732/1839/96 1738/2134/96 1740/1840/103 +f 1723/1842/104 1730/2135/104 1729/1843/94 +f 1736/1845/98 1742/2136/98 1743/1846/105 +f 1722/1848/97 1731/2137/97 1730/1849/104 +f 1725/1851/106 1728/2138/106 1727/1852/107 +f 1735/1854/101 1741/2139/101 1742/1855/98 +f 1855/1857/127 1854/2140/128 1870/1858/128 +f 1504/1860/97 1521/2141/97 1535/1861/105 +f 1513/1863/119 1529/2142/119 1528/1864/92 +f 1506/1866/94 1522/2143/94 1520/1867/104 +f 1514/1869/120 1530/2144/120 1529/1870/119 +f 1507/1872/106 1523/2145/106 1522/1873/94 +f 1515/1875/125 1531/2146/125 1530/1876/120 +f 1508/1878/95 1524/2147/95 1523/1879/106 +f 1516/1881/96 1532/2148/96 1531/1882/125 +f 1509/1884/123 1525/2149/123 1524/1885/95 +f 1517/1887/101 1533/2150/101 1532/1888/96 +f 1510/1890/126 1526/2151/126 1525/1891/123 +f 1518/1893/98 1534/2152/98 1533/1894/101 +f 1511/1896/124 1527/2153/124 1526/1897/126 +f 1519/1899/105 1535/2154/105 1534/1900/98 +f 1512/1902/92 1528/2155/92 1527/1903/124 +f 1505/1905/104 1520/2156/104 1521/1906/97 +f 1862/1908/129 1861/2157/130 1877/1909/130 +f 1854/1911/128 1853/2158/131 1869/1912/131 +f 1860/1913/132 1876/1918/132 1877/1909/130 +f 1852/1915/133 1868/1922/133 1869/1912/131 +f 1859/1917/134 1875/1924/134 1876/1918/132 +f 1852/1920/133 1851/2159/135 1867/1921/135 +f 1858/1923/136 1874/1929/136 1875/1924/134 +f 1851/1926/135 1850/2160/137 1866/1927/137 +f 1857/1928/138 1873/1934/138 1874/1929/136 +f 1849/1931/139 1865/1937/139 1866/1927/137 +f 1856/1933/140 1872/1940/140 1873/1934/138 +f 1848/1936/141 1864/1945/141 1865/1937/139 +f 1855/1939/127 1871/2161/127 1872/1940/140 +f 1847/1942/142 1862/2162/129 1878/1910/129 +f 1848/1944/141 1847/2163/142 1863/1943/142 +f 1562/1946/94 1578/1977/94 1579/1947/106 +f 1570/1949/120 1586/1978/120 1587/1950/125 +f 1563/1948/106 1579/1947/106 1580/1952/95 +f 1571/1951/125 1587/1950/125 1588/1954/96 +f 1564/1953/95 1580/1952/95 1581/1956/123 +f 1572/1955/96 1588/1954/96 1589/1958/101 +f 1565/1957/123 1581/1956/123 1582/1960/126 +f 1573/1959/101 1589/1958/101 1590/1962/98 +f 1566/1961/126 1582/1960/126 1583/1964/124 +f 1574/1963/98 1590/1962/98 1591/1966/105 +f 1567/1965/124 1583/1964/124 1584/1968/92 +f 1560/1970/97 1576/1973/97 1577/1971/104 +f 1575/1967/105 1591/1966/105 1576/1973/97 +f 1568/1974/92 1584/2164/92 1585/1975/119 +f 1561/1972/104 1577/1971/104 1578/1977/94 +f 1569/1976/119 1585/1975/119 1586/1978/120 +f 1806/1979/143 1807/1982/101 1399/1980/101 +f 1807/1982/101 1808/1984/98 1398/1983/98 +f 1808/1984/98 1809/1986/105 1397/1985/105 +f 1809/1986/105 1810/1988/97 1396/1987/97 +f 1810/1988/97 1811/1990/104 1395/1989/104 +f 1811/1990/104 1812/1992/94 1394/1991/94 +f 1812/1992/94 1813/1994/106 1393/1993/106 +f 1813/1994/106 1814/2165/144 1392/1995/144 +f 1661/1996/105 1653/2012/97 1644/1997/97 +f 1659/1999/101 1660/2008/98 1651/2000/98 +f 1656/2002/106 1657/2166/144 1648/2003/144 +f 1654/2005/104 1655/2011/94 1646/2006/94 +f 1660/2008/98 1661/1996/105 1652/1998/105 +f 1658/2009/143 1659/1999/101 1650/2001/101 +f 1655/2011/94 1656/2002/106 1647/2004/106 +f 1653/2012/97 1654/2005/104 1645/2007/104 +f 1687/2013/98 1698/2030/98 1699/2014/105 +f 1684/2016/107 1695/2027/107 1689/2017/95 +f 1682/2019/94 1693/2033/94 1694/2020/106 +f 1688/2015/105 1699/2014/105 1692/2022/97 +f 1685/2024/103 1696/2032/103 1697/2025/101 +f 1683/2021/106 1694/2020/106 1695/2027/107 +f 1680/2023/97 1692/2022/97 1691/2028/104 +f 1686/2026/101 1697/2025/101 1698/2030/98 +f 1679/2031/96 1690/2167/96 1696/2032/103 +f 1681/2029/104 1691/2028/104 1693/2033/94 +f 1779/2034/97 1797/2044/97 1798/2035/104 +f 1786/1767/98 1804/1766/98 1805/2037/105 +f 1782/1770/106 1800/1769/106 1801/2039/145 +f 1784/2041/103 1802/2046/102 1803/2042/101 +f 1780/2036/104 1798/2035/104 1799/2043/94 +f 1787/2038/105 1805/2037/105 1797/2044/97 +f 1784/2041/103 1767/2168/96 1802/2046/102 +f 1767/2168/96 1769/2045/96 1802/2046/102 +f 1769/2045/96 1775/1753/103 1793/1752/102 +f 1768/2048/95 1766/2169/95 1801/2039/145 +f 1766/2169/95 1783/2040/107 1801/2039/145 +f 1801/2039/145 1792/2047/145 1768/2048/95 +f 1884/2049/101 1900/2170/101 1899/2050/96 +f 1892/2052/123 1908/2171/123 1907/2053/95 +f 1885/2055/98 1901/2172/98 1900/2056/101 +f 1893/2058/126 1909/2173/126 1908/2059/123 +f 1885/2061/98 1886/2174/105 1902/2062/105 +f 1894/2064/124 1910/2175/124 1909/2065/126 +f 1887/2067/97 1903/2176/97 1902/2068/105 +f 1879/2070/119 1895/2177/119 1896/2071/92 +f 1880/2073/92 1896/2178/92 1910/2074/124 +f 1887/2076/97 1888/2179/104 1904/2077/104 +f 1881/2079/120 1897/2180/120 1895/2080/119 +f 1889/2082/94 1905/2181/94 1904/2083/104 +f 1882/2085/125 1898/2182/125 1897/2086/120 +f 1890/2088/106 1906/2183/106 1905/2089/94 +f 1883/2091/96 1899/2184/96 1898/2092/125 +f 1891/2094/95 1907/2185/95 1906/2095/106 +f 1911/2097/92 1920/2113/92 1928/2098/124 +f 1918/2100/126 1927/2109/126 1926/2101/123 +f 1915/2103/146 1924/2186/146 1923/2104/125 +f 1913/2106/120 1922/2112/120 1921/2107/119 +f 1919/2099/124 1928/2098/124 1927/2109/126 +f 1917/2102/123 1926/2101/123 1925/2110/147 +f 1914/2105/125 1923/2104/125 1922/2112/120 +f 1912/2108/119 1921/2107/119 1920/2113/92 diff --git a/src/main/resources/assets/hbm/sounds.json b/src/main/resources/assets/hbm/sounds.json index b25444b23..6b15ba45f 100644 --- a/src/main/resources/assets/hbm/sounds.json +++ b/src/main/resources/assets/hbm/sounds.json @@ -36,6 +36,7 @@ "block.screm": {"category": "block", "sounds": ["screm/scream1", "screm/scream01", "screm/scream2", "screm/scream02", "screm/scream3", "screm/scream03", "screm/scream4", "screm/scream04", "screm/scream5", "screm/scream05", "screm/scream6", "screm/scream06", "screm/scream7", "screm/scream07", "screm/scream08", "screm/scream09", "screm/scream10", "screm/scream11", "screm/scream12", "screm/scream13", "screm/scream14", "screm/scream15", "screm/scream16", "screm/scream17", "screm/scream18", "screm/scream19", "screm/scream20", "screm/scream21", "screm/scream22", "screm/scream23", "screm/scream24", "screm/scream25"]}, "block.rbmk_explosion": {"category": "block", "sounds": [{"name": "block/rbmk_explosion", "stream": false}]}, "block.rbmk_az5_cover": {"category": "block", "sounds": [{"name": "block/rbmk_az5_cover", "stream": false}]}, + "block.chungusLever": {"category": "block", "sounds": [{"name": "block/chungusLever", "stream": false}]}, "item.techBleep": {"category": "player", "sounds": [{"name": "tool/techBleep", "stream": false}]}, "item.techBoop": {"category": "player", "sounds": [{"name": "tool/techBoop", "stream": false}]}, diff --git a/src/main/resources/assets/hbm/sounds/block/chungusLever.ogg b/src/main/resources/assets/hbm/sounds/block/chungusLever.ogg new file mode 100644 index 000000000..3b469ed9f Binary files /dev/null and b/src/main/resources/assets/hbm/sounds/block/chungusLever.ogg differ diff --git a/src/main/resources/assets/hbm/textures/blocks/barrel_tcalloy.png b/src/main/resources/assets/hbm/textures/blocks/barrel_tcalloy.png new file mode 100644 index 000000000..c7ae36290 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/barrel_tcalloy.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_chungus.png b/src/main/resources/assets/hbm/textures/blocks/machine_chungus.png new file mode 100644 index 000000000..9f14e40e2 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/machine_chungus.png differ diff --git a/src/main/resources/assets/hbm/textures/items/dont_they_know.png b/src/main/resources/assets/hbm/textures/items/dont_they_know.png new file mode 100644 index 000000000..b906a88b5 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/dont_they_know.png differ diff --git a/src/main/resources/assets/hbm/textures/items/flywheel_beryllium.png b/src/main/resources/assets/hbm/textures/items/flywheel_beryllium.png new file mode 100644 index 000000000..cc3ce3010 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/flywheel_beryllium.png differ diff --git a/src/main/resources/assets/hbm/textures/items/ingot_tcalloy.png b/src/main/resources/assets/hbm/textures/items/ingot_tcalloy.png new file mode 100644 index 000000000..c692f1014 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/ingot_tcalloy.png differ diff --git a/src/main/resources/assets/hbm/textures/items/particle_trigamma.png b/src/main/resources/assets/hbm/textures/items/particle_trigamma.png new file mode 100644 index 000000000..618f3cb22 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/particle_trigamma.png differ diff --git a/src/main/resources/assets/hbm/textures/items/powder_tcalloy.png b/src/main/resources/assets/hbm/textures/items/powder_tcalloy.png new file mode 100644 index 000000000..003ea83f6 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/powder_tcalloy.png differ diff --git a/src/main/resources/assets/hbm/textures/items/rbmk_fuel_hep241.png b/src/main/resources/assets/hbm/textures/items/rbmk_fuel_hep241.png new file mode 100644 index 000000000..28b61fa66 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/rbmk_fuel_hep241.png differ diff --git a/src/main/resources/assets/hbm/textures/models/machines/chungus.png b/src/main/resources/assets/hbm/textures/models/machines/chungus.png index 75c1d77ca..30b909522 100644 Binary files a/src/main/resources/assets/hbm/textures/models/machines/chungus.png and b/src/main/resources/assets/hbm/textures/models/machines/chungus.png differ diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 5a632421b..3cbdfe74f 100755 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "hbm", "name": "Hbm's Nuclear Tech", "description": "A mod that adds weapons, nuclear themed stuff and machines", - "version":"1.0.27-3894", + "version":"1.0.27-3899", "mcversion": "1.7.10", "url": "", "updateUrl": "",