diff --git a/changelog b/changelog index eb53a1652..e69de29bb 100644 --- a/changelog +++ b/changelog @@ -1,49 +0,0 @@ -##Added -* CRTs and toasters - * Found in the new silo structure -* Sentry turret "Edwin" - * A broken down version of the sentry turret with infinite power and ammo - * Also found in the new silos -* Launch code piece - * A rare drop from hostile mobs - * 8 of them can be combined into launch codes, which are required to launch the missile found in the silo - * Single-use -* Launch key - * The key is required to launch the missile found in the silo - -## Changed -* Updated chinese localization -* Tweaked super shotgun animations, added config for changing the animation style -* The benelli now has reloading animations and the drum mag as advertised -* Tom will now explode close to bedrock even when not hitting a block -* The assembler recipe config now uses the same system as all other recipe configs, the file has moved into the `hbmRecipes` folder - * Old files are still compatible if moved to the new folder, since the base structure of the recipe file is the same - * Recipes should work as expected with the `/ntmreload` command - * Recipes now have an optional list for specifying which template folder they are made in -* Electrolyzing heavy water now has the same yields as regular water, I don't remember why this incsonsistency existed and there was probably a reason for it but I don't care -* Electrolyzing fluids now only takes 20 ticks instead of 60 - * Batch sizes for water and heavy water have been doubled, effectively increasing throughout 6x - * The throughput for electrolysis on chemical plants has been halved (but heavy water still has the output buff, effectively remaining unchanged) -* Custom machines now have an optional localization field which allows translations to be added within the config -* The congo lake now has reload and better firing animations -* Improved shift clicking for centrifuges, acidizers, electric furnace, arc furnaces and arc welders -* Schrabidium transmutation by fallout is now limited to the inner 40% of the sellafite conversion radius -* Fluid traits are now listed in a fixed order instead of being arranged randomly -* Hidden fluid trait descriptions will now be added below the visible part of that trait instead of below the last visible trait -* The methusalem turret no longer drops anything when broken -* Gaseous fuels now have a combusion multiplier of 1.5 instead of 1.25 -* LPG now has half the base burn value, preventing an unreasonable jump in efficiency simply by liquefacting petroleum gas - * While overall slightly less efficient that petroleum gas per unit of petroleum needed, LPG is still very much desirable due to being much easier to burn at max efficiency -* The ZPE is no longer craftable in 528 mode -* The silo structure has been remade. Instead of a concrete hole with a single small control room, it's now a much larger multi-level silo with a small bunker complex - * The silo will spawn with the new large silo hatch, as well as a structure-only variant of the silo launch pad - * The silo has a damaged version of the doomsday missile loaded, which can be launched using the launch code and launch key - * The missile can be released from the launch position, which renders it inoperable. Repairing it will make it usable again, as well as increase the yield considerably - -## Fixed -* Fixed the structure toggle on the world creation screen not working correctly on most world types -* Fixed antiknock having a broken sprite and localization -* Fixed crash caused by fallout affecting spotlight blocks, crashing the game -* Fixed 528 mode bedrock ore replacements not working -* Fixed potential crashes with improperly configured custom machines -* Fixed misspelling in the custom machine config template diff --git a/gradle.properties b/gradle.properties index d9a886880..204129933 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_version=1.0.27 # Empty build number makes a release type -mod_build_number=4880 +mod_build_number=4895 credits=HbMinecraft, rodolphito (explosion algorithms), grangerave (explosion algorithms),\ \ Hoboy (textures, models), Doctor17 (russian localization), Drillgon200 (effects, models,\ diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 43fa85e20..94c961f5e 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -1544,7 +1544,7 @@ public class ModBlocks { deco_loot = new BlockLoot().setBlockName("deco_loot").setCreativeTab(null).setHardness(0.0F).setResistance(0.0F).setBlockTextureName(RefStrings.MODID + ":block_steel"); pedestal = new BlockPedestal().setBlockName("pedestal").setCreativeTab(null).setHardness(2.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":pedestal_top"); bobblehead = new BlockBobble().setBlockName("bobblehead").setCreativeTab(MainRegistry.blockTab).setHardness(0.0F).setResistance(0.0F).setBlockTextureName(RefStrings.MODID + ":block_steel"); - snowglobe = new BlockSnowglobe().setBlockName("snowglobe").setCreativeTab(null).setHardness(0.0F).setResistance(0.0F).setBlockTextureName(RefStrings.MODID + ":glass_boron"); + snowglobe = new BlockSnowglobe().setBlockName("snowglobe").setCreativeTab(MainRegistry.blockTab).setHardness(0.0F).setResistance(0.0F).setBlockTextureName(RefStrings.MODID + ":glass_boron"); hazmat = new BlockGeneric(Material.cloth).setBlockName("hazmat").setStepSound(Block.soundTypeCloth).setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(60.0F).setBlockTextureName(RefStrings.MODID + ":hazmat"); gravel_obsidian = new BlockFalling(Material.iron).setBlockName("gravel_obsidian").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeGravel).setHardness(5.0F).setResistance(240.0F).setBlockTextureName(RefStrings.MODID + ":gravel_obsidian"); diff --git a/src/main/java/com/hbm/blocks/generic/BlockSnowglobe.java b/src/main/java/com/hbm/blocks/generic/BlockSnowglobe.java index ff1ed304c..07d5179fa 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockSnowglobe.java +++ b/src/main/java/com/hbm/blocks/generic/BlockSnowglobe.java @@ -26,8 +26,10 @@ import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; public class BlockSnowglobe extends BlockContainer implements IGUIProvider { @@ -58,13 +60,8 @@ public class BlockSnowglobe extends BlockContainer implements IGUIProvider { @Override public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) { - TileEntitySnowglobe entity = (TileEntitySnowglobe) world.getTileEntity(x, y, z); - - if(entity != null) { - return new ItemStack(this, 1, entity.type.ordinal()); - } - + if(entity != null) return new ItemStack(this, 1, entity.type.ordinal()); return super.getPickBlock(target, world, x, y, z, player); } @@ -100,9 +97,7 @@ public class BlockSnowglobe extends BlockContainer implements IGUIProvider { @Override @SideOnly(Side.CLIENT) public void getSubBlocks(Item item, CreativeTabs tab, List list) { - - for(int i = 1; i < SnowglobeType.values().length; i++) - list.add(new ItemStack(item, 1, i)); + for(int i = 1; i < SnowglobeType.values().length; i++) list.add(new ItemStack(item, 1, i)); } @Override @@ -114,6 +109,18 @@ public class BlockSnowglobe extends BlockContainer implements IGUIProvider { bobble.type = SnowglobeType.values()[Math.abs(stack.getItemDamage()) % SnowglobeType.values().length]; bobble.markDirty(); } + + @Override + public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { + float f = 0.0625F; + this.setBlockBounds(4F * f, 0.0F, 4F * f, 1.0F - 4F * f, 0.3125F, 1.0F - 4F * f); + } + + @Override + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { + this.setBlockBoundsBasedOnState(world, x, y, z); + return AxisAlignedBB.getBoundingBox(x + this.minX, y + this.minY, z + this.minZ, x + this.maxX, y + this.maxY, z + this.maxZ); + } @Override public TileEntity createNewTileEntity(World world, int meta) { @@ -160,7 +167,7 @@ public class BlockSnowglobe extends BlockContainer implements IGUIProvider { TENPENNYTOWER( "Tenpenny Tower", "Tenpenny Tower is the brainchild of Allistair Tenpenny, a British refugee who came to the Capital Wasteland seeking his fortune."), LUCKY38( "Lucky 38", "My guess? Leads to a big cashout at some casino - and if the \"38\" on it is any indication... well... Lucky 38 it is."), SIERRAMADRE( "Sierra Madre", "It's the moment you've been waiting for, the reason we're all here - the Gala Event, the Grand Opening of the Sierra Madre Casino."), - PRYDWEN( "Prydwen", "People of the Commonwealth. Do not interfere. Our intentions are peaceful. We are the Brotherhood of Steel."); + PRYDWEN( "The Prydwen", "People of the Commonwealth. Do not interfere. Our intentions are peaceful. We are the Brotherhood of Steel."); public String label; public String inscription; diff --git a/src/main/java/com/hbm/config/WorldConfig.java b/src/main/java/com/hbm/config/WorldConfig.java index 0b1fa3a55..1a7c40b0e 100644 --- a/src/main/java/com/hbm/config/WorldConfig.java +++ b/src/main/java/com/hbm/config/WorldConfig.java @@ -50,6 +50,7 @@ public class WorldConfig { public static int bedrockFluoriteSpawn = 50; public static int bedrockRedstoneSpawn = 50; public static int bedrockRareEarthSpawn = 50; + public static int bedrockBauxiteSpawn = 100; public static int bedrockGlowstoneSpawn = 100; public static int bedrockPhosphorusSpawn = 50; public static int bedrockQuartzSpawn = 100; @@ -170,6 +171,7 @@ public class WorldConfig { bedrockChlorocalciteSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.B14_bedrockChlorocalciteWeight", "Spawn weight for chlorocalcite bedrock ore", 35); bedrockNeodymiumSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.B15_bedrockNeodymiumWeight", "Spawn weight for neodymium bedrock ore", 50); bedrockRareEarthSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.B16_bedrockRareEarthWeight", "Spawn weight for rare earth bedrock ore", 50); + bedrockBauxiteSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.B17_bedrockBauxiteWeight", "Spawn weight for bauxite bedrock ore", 100); bedrockGlowstoneSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.BN00_bedrockGlowstoneWeight", "Spawn weight for glowstone bedrock ore", 100); bedrockPhosphorusSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.BN01_bedrockPhosphorusWeight", "Spawn weight for phosphorus bedrock ore", 50); diff --git a/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java b/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java index ec5890cd1..9f66d91c8 100644 --- a/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java @@ -50,7 +50,11 @@ public class MixerRecipes extends SerializableRecipe { register(Fluids.SUNFLOWEROIL, new MixerRecipe(100, 50).setSolid(new ComparableStack(Blocks.double_plant, 1, 0))); register(Fluids.FULLERENE, new MixerRecipe(250, 50).setStack1(new FluidStack(Fluids.RADIOSOLVENT, 500)).setSolid(new ComparableStack(DictFrame.fromOne(ModItems.powder_ash, EnumAshType.SOOT)))); - register(Fluids.SOLVENT, new MixerRecipe(1000, 50).setStack1(new FluidStack(Fluids.NAPHTHA, 500)).setStack2(new FluidStack(Fluids.AROMATICS, 500))); + register(Fluids.SOLVENT, + new MixerRecipe(1000, 50).setStack1(new FluidStack(Fluids.NAPHTHA, 500)).setStack2(new FluidStack(Fluids.AROMATICS, 500)), + new MixerRecipe(1000, 50).setStack1(new FluidStack(Fluids.NAPHTHA_CRACK, 500)).setStack2(new FluidStack(Fluids.AROMATICS, 500)), + new MixerRecipe(1000, 50).setStack1(new FluidStack(Fluids.NAPHTHA_DS, 500)).setStack2(new FluidStack(Fluids.AROMATICS, 500)), + new MixerRecipe(1000, 50).setStack1(new FluidStack(Fluids.NAPHTHA_COKER, 500)).setStack2(new FluidStack(Fluids.AROMATICS, 500))); register(Fluids.SULFURIC_ACID, new MixerRecipe(500, 50).setStack1(new FluidStack(Fluids.ACID, 800)).setSolid(new OreDictStack(S.dust()))); register(Fluids.NITRIC_ACID, new MixerRecipe(500, 50).setStack1(new FluidStack(Fluids.SULFURIC_ACID, 500)).setSolid(new OreDictStack(KNO.dust()))); register(Fluids.RADIOSOLVENT, new MixerRecipe(1000, 50).setStack1(new FluidStack(Fluids.REFORMGAS, 750)).setStack2(new FluidStack(Fluids.CHLORINE, 250))); diff --git a/src/main/java/com/hbm/lib/RefStrings.java b/src/main/java/com/hbm/lib/RefStrings.java index 2884cce77..1002a2191 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 (4880)"; + public static final String VERSION = "1.0.27 BETA (4895)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/src/main/java/com/hbm/render/tileentity/RenderSnowglobe.java b/src/main/java/com/hbm/render/tileentity/RenderSnowglobe.java index f8ad256b6..3fe08895d 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderSnowglobe.java +++ b/src/main/java/com/hbm/render/tileentity/RenderSnowglobe.java @@ -12,6 +12,7 @@ import com.hbm.render.loader.HFRWavefrontObject; import com.hbm.util.EnumUtil; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.Item; @@ -25,6 +26,7 @@ public class RenderSnowglobe extends TileEntitySpecialRenderer implements IItemR public static final IModelCustom snowglobe = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/trinkets/snowglobe.obj"), false).asDisplayList(); public static final ResourceLocation socket = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/snowglobe.png"); + public static final ResourceLocation glass = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/snowglobe_glass.png"); public static final ResourceLocation features = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/snowglobe_features.png"); public static RenderBlocks renderer = new RenderBlocks(); @@ -46,12 +48,15 @@ public class RenderSnowglobe extends TileEntitySpecialRenderer implements IItemR GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL12.GL_RESCALE_NORMAL); GL11.glShadeModel(GL11.GL_SMOOTH); + GL11.glDisable(GL11.GL_CULL_FACE); double scale = 0.0625D; GL11.glScaled(scale, scale, scale); - + Minecraft.getMinecraft().getTextureManager().bindTexture(socket); snowglobe.renderPart("Socket"); + Minecraft.getMinecraft().getTextureManager().bindTexture(glass); + snowglobe.renderPart("Glass"); Minecraft.getMinecraft().getTextureManager().bindTexture(features); @@ -59,14 +64,28 @@ public class RenderSnowglobe extends TileEntitySpecialRenderer implements IItemR case NONE: break; case RIVETCITY: snowglobe.renderPart("RivetCity"); break; case TENPENNYTOWER: snowglobe.renderPart("TenpennyTower"); break; - case LUCKY38: snowglobe.renderPart("Lucky38_Plane"); break; + case LUCKY38: snowglobe.renderPart("Lucky38"); break; case SIERRAMADRE: snowglobe.renderPart("SierraMadre"); break; case PRYDWEN: snowglobe.renderPart("Prydwen"); break; default: break; } + GL11.glEnable(GL11.GL_CULL_FACE); GL11.glDisable(GL12.GL_RESCALE_NORMAL); GL11.glShadeModel(GL11.GL_FLAT); + + GL11.glDisable(GL11.GL_LIGHTING); + FontRenderer font = Minecraft.getMinecraft().fontRenderer; + float f3 = 0.05F; + GL11.glTranslated(4.025, 0.5, 0); + GL11.glScalef(f3, -f3, f3); + GL11.glTranslated(0, -font.FONT_HEIGHT / 2F, font.getStringWidth(type.label) * 0.5D); + GL11.glRotatef(90, 0, 1, 0); + GL11.glDepthMask(false); + GL11.glTranslatef(0, 1, 0); + font.drawString(type.label, 0, 0, 0xffffff); + GL11.glDepthMask(true); + GL11.glEnable(GL11.GL_LIGHTING); } @Override @@ -78,8 +97,8 @@ public class RenderSnowglobe extends TileEntitySpecialRenderer implements IItemR public IItemRenderer getRenderer() { return new ItemRenderBase() { public void renderInventory() { - GL11.glTranslated(0, -4, 0); - GL11.glScaled(10, 10, 10); + GL11.glTranslated(0, -2, 0); + GL11.glScaled(6, 6, 6); } public void renderCommonWithStack(ItemStack item) { GL11.glTranslated(0, 0.25, 0); diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityLandmine.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityLandmine.java index 7e05391c1..e9320c85d 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityLandmine.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityLandmine.java @@ -8,6 +8,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.passive.EntityBat; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -29,7 +30,7 @@ public class TileEntityLandmine extends TileEntity { double range = landmine.range; double height = landmine.height; - if (waitingForPlayer) { + if(waitingForPlayer) { range = 25; height = 25; } else if(!isPrimed) { @@ -42,6 +43,7 @@ public class TileEntityLandmine extends TileEntity { AxisAlignedBB.getBoundingBox(xCoord - range, yCoord - height, zCoord - range, xCoord + range + 1, yCoord + height, zCoord + range + 1)); for(Object o : list) { + if(o instanceof EntityBat) continue; if(waitingForPlayer) { // This mine has been generated by worldgen and is ignoring mobs until a player is close enough // This is to prevent worldgen mines from detonating well before they become gameplay relevant diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityCustomMachine.java b/src/main/java/com/hbm/tileentity/machine/TileEntityCustomMachine.java index 92af2a4ed..f810b8dfb 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityCustomMachine.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityCustomMachine.java @@ -438,7 +438,7 @@ public class TileEntityCustomMachine extends TileEntityMachinePolluting implemen if(this.config.itemInCount > 2) return new int[] { 4, 5, 6, 16, 17, 18, 19, 20, 21 }; if(this.config.itemInCount > 1) return new int[] { 4, 5, 16, 17, 18, 19, 20, 21 }; if(this.config.itemInCount > 0) return new int[] { 4, 16, 17, 18, 19, 20, 21 }; - return new int[] { }; + return new int[] { 16, 17, 18, 19, 20, 21 }; } @Override diff --git a/src/main/java/com/hbm/world/feature/BedrockOre.java b/src/main/java/com/hbm/world/feature/BedrockOre.java index 953b13a85..fa162e6dd 100644 --- a/src/main/java/com/hbm/world/feature/BedrockOre.java +++ b/src/main/java/com/hbm/world/feature/BedrockOre.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import com.hbm.blocks.BlockEnums.EnumStoneType; import com.hbm.blocks.ModBlocks; import com.hbm.blocks.generic.BlockBedrockOreTE.TileEntityBedrockOre; import com.hbm.config.WorldConfig; @@ -29,23 +30,24 @@ public class BedrockOre { public static HashMap replacements = new HashMap(); public static void init() { - registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.IRON, 1), WorldConfig.bedrockIronSpawn); - registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.COPPER, 1), WorldConfig.bedrockCopperSpawn); - registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.BORAX, 3, new FluidStack(Fluids.SULFURIC_ACID, 500)), WorldConfig.bedrockBoraxSpawn); - registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.CHLOROCALCITE, 3, new FluidStack(Fluids.SULFURIC_ACID, 500)), WorldConfig.bedrockChlorocalciteSpawn); - registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.ASBESTOS, 2), WorldConfig.bedrockAsbestosSpawn); - registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.NIOBIUM, 2, new FluidStack(Fluids.ACID, 500)), WorldConfig.bedrockNiobiumSpawn); - registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.NEODYMIUM, 3, new FluidStack(Fluids.ACID, 500)), WorldConfig.bedrockNeodymiumSpawn); - registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.TITANIUM, 2, new FluidStack(Fluids.SULFURIC_ACID, 500)), WorldConfig.bedrockTitaniumSpawn); - registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.TUNGSTEN, 2, new FluidStack(Fluids.ACID, 500)), WorldConfig.bedrockTungstenSpawn); - registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.GOLD, 1), WorldConfig.bedrockGoldSpawn); - registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.URANIUM, 4, new FluidStack(Fluids.SULFURIC_ACID, 500)), WorldConfig.bedrockUraniumSpawn); - registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.THORIUM, 4, new FluidStack(Fluids.SULFURIC_ACID, 500)), WorldConfig.bedrockThoriumSpawn); - registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.FLUORITE, 1), WorldConfig.bedrockFluoriteSpawn); - registerBedrockOre(weightedOres, new BedrockOreDefinition(new ItemStack(Items.coal, 8), 1, 0x202020), WorldConfig.bedrockCoalSpawn); - registerBedrockOre(weightedOres, new BedrockOreDefinition(new ItemStack(ModItems.niter, 4), 2, 0x808080, new FluidStack(Fluids.ACID, 500)), WorldConfig.bedrockNiterSpawn); - registerBedrockOre(weightedOres, new BedrockOreDefinition(new ItemStack(Items.redstone, 4), 1, 0xd01010), WorldConfig.bedrockRedstoneSpawn); - registerBedrockOre(weightedOres, new BedrockOreDefinition(DictFrame.fromOne(ModItems.chunk_ore, EnumChunkType.RARE), 2, 0x8F9999, new FluidStack(Fluids.ACID, 500)), WorldConfig.bedrockRedstoneSpawn); + registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.IRON, 1), WorldConfig.bedrockIronSpawn); + registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.COPPER, 1), WorldConfig.bedrockCopperSpawn); + registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.BORAX, 3, new FluidStack(Fluids.SULFURIC_ACID, 500)), WorldConfig.bedrockBoraxSpawn); + registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.CHLOROCALCITE, 3, new FluidStack(Fluids.SULFURIC_ACID, 500)), WorldConfig.bedrockChlorocalciteSpawn); + registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.ASBESTOS, 2), WorldConfig.bedrockAsbestosSpawn); + registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.NIOBIUM, 2, new FluidStack(Fluids.ACID, 500)), WorldConfig.bedrockNiobiumSpawn); + registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.NEODYMIUM, 3, new FluidStack(Fluids.ACID, 500)), WorldConfig.bedrockNeodymiumSpawn); + registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.TITANIUM, 2, new FluidStack(Fluids.SULFURIC_ACID, 500)), WorldConfig.bedrockTitaniumSpawn); + registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.TUNGSTEN, 2, new FluidStack(Fluids.ACID, 500)), WorldConfig.bedrockTungstenSpawn); + registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.GOLD, 1), WorldConfig.bedrockGoldSpawn); + registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.URANIUM, 4, new FluidStack(Fluids.SULFURIC_ACID, 500)), WorldConfig.bedrockUraniumSpawn); + registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.THORIUM, 4, new FluidStack(Fluids.SULFURIC_ACID, 500)), WorldConfig.bedrockThoriumSpawn); + registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.FLUORITE, 1), WorldConfig.bedrockFluoriteSpawn); + registerBedrockOre(weightedOres, new BedrockOreDefinition(new ItemStack(Items.coal, 8), 1, 0x202020), WorldConfig.bedrockCoalSpawn); + registerBedrockOre(weightedOres, new BedrockOreDefinition(new ItemStack(ModItems.niter, 4), 2, 0x808080, new FluidStack(Fluids.ACID, 500)), WorldConfig.bedrockNiterSpawn); + registerBedrockOre(weightedOres, new BedrockOreDefinition(new ItemStack(Items.redstone, 4), 1, 0xd01010), WorldConfig.bedrockRedstoneSpawn); + registerBedrockOre(weightedOres, new BedrockOreDefinition(DictFrame.fromOne(ModItems.chunk_ore, EnumChunkType.RARE), 2, 0x8F9999, new FluidStack(Fluids.ACID, 500)), WorldConfig.bedrockRareEarthSpawn); + registerBedrockOre(weightedOres, new BedrockOreDefinition(DictFrame.fromOne(ModBlocks.stone_resource, EnumStoneType.BAUXITE, 2),1, 0xEF7213), WorldConfig.bedrockBauxiteSpawn); registerBedrockOre(weightedOresNether, new BedrockOreDefinition(new ItemStack(Items.glowstone_dust, 4), 1, 0xF9FF4D), WorldConfig.bedrockGlowstoneSpawn); registerBedrockOre(weightedOresNether, new BedrockOreDefinition(new ItemStack(ModItems.powder_fire, 4), 1, 0xD7341F), WorldConfig.bedrockPhosphorusSpawn); diff --git a/src/main/java/com/hbm/world/gen/MapGenNTMFeatures.java b/src/main/java/com/hbm/world/gen/MapGenNTMFeatures.java index 1ec502efa..a4d225c7f 100644 --- a/src/main/java/com/hbm/world/gen/MapGenNTMFeatures.java +++ b/src/main/java/com/hbm/world/gen/MapGenNTMFeatures.java @@ -144,7 +144,7 @@ public class MapGenNTMFeatures extends MapGenStructure { this.components.add(ruin4); } - } else if(biome.heightVariation <= 0.25F && rand.nextInt(15) == 0) { //for now our only restriction is kinda-flat biomes. that and chance might change idk + } else if(biome.heightVariation <= 0.25F && rand.nextInt(10) == 0) { //for now our only restriction is kinda-flat biomes. that and chance might change idk SiloComponent silo = new SiloComponent(rand, i, j); this.components.add(silo); } else if(biome.temperature >= 1.0 && biome.rainfall == 0 && !(biome instanceof BiomeGenMesa)) { //Desert & Savannah diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index 7a8e251ba..9b1fdfaa1 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -4523,6 +4523,10 @@ tile.solar_mirror.name=Heliostatspiegel tile.soyuz_capsule.name=Landekapsel tile.soyuz_launcher.name=Soyuz-Startplatform tile.spikes.name=Stacheln +tile.snowglobe.name=Schneekugel +tile.spotlight_incandescent.name=Käfiglampe +tile.spotlight_fluoro.name=Leuchtstoffröhre +tile.spotlight_halogen.name=Halogen-Flutlicht tile.stalactite.asbestos.name=Asbest-Stalaktit tile.stalactite.sulfur.name=Schwefelhaltiger Stalaktit tile.stalagmite.asbestos.name=Asbest-Stalagmit diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 44935cb1c..c4824a861 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -5086,9 +5086,6 @@ tile.lamp_tritium_green_off.name=Green Tritium Lamp tile.lamp_tritium_green_on.name=Green Tritium Lamp tile.lantern.name=Lantern tile.lantern_behemoth.name=Old Lantern -tile.spotlight_incandescent.name=Cage Lamp -tile.spotlight_fluoro.name=Fluorescent Light -tile.spotlight_halogen.name=Halogen Floodlight tile.launch_pad.name=Silo Launch Pad tile.launch_pad_large.name=Launch Pad tile.launch_table.name=Large Launch Pad @@ -5535,6 +5532,10 @@ tile.solar_mirror.name=Heliostat Mirror tile.soyuz_capsule.name=Cargo Landing Capsule tile.soyuz_launcher.name=Soyuz Launch Platform tile.spikes.name=Spikes +tile.snowglobe.name=Snowglobe +tile.spotlight_incandescent.name=Cage Lamp +tile.spotlight_fluoro.name=Fluorescent Light +tile.spotlight_halogen.name=Halogen Floodlight tile.stalactite.asbestos.name=Asbestos Stalactite tile.stalactite.sulfur.name=Sulfurous Stalactite tile.stalagmite.asbestos.name=Asbestos Stalagmite diff --git a/src/main/resources/assets/hbm/models/trinkets/snowglobe.obj b/src/main/resources/assets/hbm/models/trinkets/snowglobe.obj index fe52cda54..a165813f1 100644 --- a/src/main/resources/assets/hbm/models/trinkets/snowglobe.obj +++ b/src/main/resources/assets/hbm/models/trinkets/snowglobe.obj @@ -297,54 +297,54 @@ v 0.062500 1.562500 1.375000 vt 0.682837 0.937347 vt 0.692469 0.937347 vt 0.687653 0.945689 -vt 0.684873 0.920665 -vt 0.690433 0.951250 -vt 0.684873 0.951250 -vt 0.684873 0.951250 -vt 0.690433 0.920665 -vt 0.690433 0.951250 -vt 0.632155 0.951250 -vt 0.626372 0.920665 -vt 0.632155 0.920665 -vt 0.743151 0.935957 -vt 0.720907 0.933177 -vt 0.743151 0.933177 -vt 0.743151 0.935957 -vt 0.720907 0.933177 -vt 0.743151 0.933177 -vt 0.743151 0.951250 -vt 0.720907 0.929006 -vt 0.743151 0.929006 -vt 0.632155 0.929006 -vt 0.654399 0.951250 -vt 0.632155 0.951250 -vt 0.743151 0.931786 -vt 0.748934 0.937347 -vt 0.743151 0.937347 -vt 0.743151 0.931786 -vt 0.748934 0.937347 -vt 0.743151 0.937347 -vt 0.743151 0.920665 -vt 0.748934 0.951250 -vt 0.743151 0.951250 +vt 0.059873 0.920665 +vt 0.065433 0.951250 +vt 0.059873 0.951250 +vt 0.059873 0.951250 +vt 0.065433 0.920665 +vt 0.065433 0.951250 +vt 0.007155 0.951250 +vt 0.001372 0.920665 +vt 0.007155 0.920665 +vt 0.118151 0.935957 +vt 0.095907 0.933177 +vt 0.118151 0.933177 +vt 0.118151 0.935957 +vt 0.095907 0.933177 +vt 0.118151 0.933177 +vt 0.118151 0.951250 +vt 0.095907 0.929006 +vt 0.118151 0.929006 +vt 0.007155 0.929006 +vt 0.029399 0.951250 +vt 0.007155 0.951250 +vt 0.118151 0.931786 +vt 0.123934 0.937347 +vt 0.118151 0.937347 +vt 0.118151 0.931786 +vt 0.123934 0.937347 +vt 0.118151 0.937347 +vt 0.118151 0.920665 +vt 0.123934 0.951250 +vt 0.118151 0.951250 vt 0.656957 0.931786 vt 0.701444 0.937347 vt 0.656957 0.937347 -vt 0.676420 0.929006 -vt 0.654176 0.940128 -vt 0.654176 0.929006 -vt 0.682092 0.931786 -vt 0.693214 0.923445 -vt 0.693214 0.931786 -vt 0.682092 0.931786 -vt 0.693214 0.923445 -vt 0.693214 0.931786 -vt 0.654176 0.931786 -vt 0.676420 0.923445 -vt 0.676420 0.931786 -vt 0.698886 0.931786 -vt 0.721130 0.923445 -vt 0.721130 0.931786 +vt 0.051420 0.929006 +vt 0.029176 0.940128 +vt 0.029176 0.929006 +vt 0.057092 0.931786 +vt 0.068214 0.923445 +vt 0.068214 0.931786 +vt 0.057092 0.931786 +vt 0.068214 0.923445 +vt 0.068214 0.931786 +vt 0.029176 0.931786 +vt 0.051420 0.923445 +vt 0.051420 0.931786 +vt 0.073886 0.931786 +vt 0.096130 0.923445 +vt 0.096130 0.931786 vt 0.701444 0.931786 vt 0.656957 0.937347 vt 0.656957 0.931786 @@ -357,39 +357,39 @@ vt 0.718349 0.923445 vt 0.684873 0.923445 vt 0.690433 0.920665 vt 0.690433 0.923445 -vt 0.712566 0.929006 -vt 0.701444 0.940128 -vt 0.701444 0.929006 -vt 0.682092 0.931786 -vt 0.693214 0.917884 -vt 0.693214 0.931786 -vt 0.682092 0.931786 -vt 0.693214 0.917884 -vt 0.693214 0.931786 -vt 0.701444 0.931786 -vt 0.712566 0.917884 -vt 0.712566 0.931786 -vt 0.662740 0.931786 -vt 0.673862 0.917884 -vt 0.673862 0.931786 -vt 0.654176 0.929006 -vt 0.676420 0.940128 -vt 0.654176 0.940128 -vt 0.676420 0.929006 -vt 0.654176 0.940128 -vt 0.654176 0.929006 -vt 0.654176 0.920665 -vt 0.676420 0.917884 -vt 0.676420 0.920665 -vt 0.698886 0.920665 -vt 0.721130 0.917884 -vt 0.721130 0.920665 -vt 0.682092 0.920665 -vt 0.693214 0.917884 -vt 0.693214 0.920665 -vt 0.682092 0.920665 -vt 0.693214 0.917884 -vt 0.693214 0.920665 +vt 0.087566 0.929006 +vt 0.076444 0.940128 +vt 0.076444 0.929006 +vt 0.057092 0.931786 +vt 0.068214 0.917884 +vt 0.068214 0.931786 +vt 0.057092 0.931786 +vt 0.068214 0.917884 +vt 0.068214 0.931786 +vt 0.076444 0.931786 +vt 0.087566 0.917884 +vt 0.087566 0.931786 +vt 0.037740 0.931786 +vt 0.048862 0.917884 +vt 0.048862 0.931786 +vt 0.029176 0.929006 +vt 0.051420 0.940128 +vt 0.029176 0.940128 +vt 0.051420 0.929006 +vt 0.029176 0.940128 +vt 0.029176 0.929006 +vt 0.029176 0.920665 +vt 0.051420 0.917884 +vt 0.051420 0.920665 +vt 0.073886 0.920665 +vt 0.096130 0.917884 +vt 0.096130 0.920665 +vt 0.057092 0.920665 +vt 0.068214 0.917884 +vt 0.068214 0.920665 +vt 0.057092 0.920665 +vt 0.068214 0.917884 +vt 0.068214 0.920665 vt 0.689043 0.938738 vt 0.686263 0.941518 vt 0.686263 0.938738 @@ -426,37 +426,37 @@ vt 0.690433 0.935312 vt 0.693214 0.940128 vt 0.692469 0.942908 vt 0.690433 0.944944 -vt 0.690433 0.920665 -vt 0.684873 0.920665 -vt 0.626372 0.951250 -vt 0.720907 0.935957 -vt 0.720907 0.935957 -vt 0.720907 0.951250 -vt 0.654399 0.929006 -vt 0.748934 0.931786 -vt 0.748934 0.931786 -vt 0.748934 0.920665 +vt 0.065433 0.920665 +vt 0.059873 0.920665 +vt 0.001372 0.951250 +vt 0.095907 0.935957 +vt 0.095907 0.935957 +vt 0.095907 0.951250 +vt 0.029399 0.929006 +vt 0.123934 0.931786 +vt 0.123934 0.931786 +vt 0.123934 0.920665 vt 0.701444 0.931786 -vt 0.676420 0.940128 -vt 0.682092 0.923445 -vt 0.682092 0.923445 -vt 0.654176 0.923445 -vt 0.698886 0.923445 +vt 0.051420 0.940128 +vt 0.057092 0.923445 +vt 0.057092 0.923445 +vt 0.029176 0.923445 +vt 0.073886 0.923445 vt 0.701444 0.937347 vt 0.656957 0.920665 vt 0.673862 0.920665 vt 0.684873 0.920665 -vt 0.712566 0.940128 -vt 0.682092 0.917884 -vt 0.682092 0.917884 -vt 0.701444 0.917884 -vt 0.662740 0.917884 -vt 0.676420 0.929006 -vt 0.676420 0.940128 -vt 0.654176 0.917884 -vt 0.698886 0.917884 -vt 0.682092 0.917884 -vt 0.682092 0.917884 +vt 0.087566 0.940128 +vt 0.057092 0.917884 +vt 0.057092 0.917884 +vt 0.076444 0.917884 +vt 0.037740 0.917884 +vt 0.051420 0.929006 +vt 0.051420 0.940128 +vt 0.029176 0.917884 +vt 0.073886 0.917884 +vt 0.057092 0.917884 +vt 0.057092 0.917884 vt 0.689043 0.941518 vt 0.626372 0.935957 vt 0.626372 0.935957 @@ -734,7 +734,7 @@ f 47/283/47 83/324/47 82/308/44 f 43/278/45 44/266/39 80/305/39 f 40/280/46 41/286/41 77/313/41 f 48/271/42 84/307/42 83/315/47 -o Lucky38_Plane +o Lucky38 v 0.000000 1.125000 -0.750000 v -0.375000 1.125000 -0.649519 v -0.649519 1.125000 -0.375000 @@ -1968,230 +1968,48 @@ f 375/832/69 387/831/69 388/836/66 f 365/818/51 378/817/51 377/838/68 f 372/834/63 384/833/63 385/839/62 o Glass -v 0.000000 1.000000 -3.500000 -v -1.339392 1.000000 -3.233578 -v -2.474874 1.000000 -2.474874 -v -3.233578 1.000000 -1.339392 -v -3.500000 1.000000 0.000000 -v -3.233578 1.000000 1.339393 -v -2.474874 1.000000 2.474874 -v -1.339392 1.000000 3.233578 -v -0.000000 1.000000 3.500000 -v 1.339391 1.000000 3.233579 -v 2.474873 1.000000 2.474874 -v 3.233578 1.000000 1.339393 -v 3.500000 1.000000 0.000000 -v 3.233578 1.000000 -1.339393 -v 2.474873 1.000000 -2.474874 -v 1.339391 1.000000 -3.233579 -v 0.000001 5.000000 -1.205920 -v 0.000001 4.469670 -2.511333 -v -0.461486 5.000000 -1.114124 -v -0.961046 4.469670 -2.320169 -v -0.852714 5.000000 -0.852715 -v -1.775780 4.469670 -1.775781 -v -1.114124 5.000000 -0.461486 -v -2.320169 4.469670 -0.961045 -v -1.205920 5.000000 0.000000 -v -2.511333 4.469670 0.000000 -v -1.114124 5.000000 0.461486 -v -2.320169 4.469669 0.961046 -v -0.852714 5.000000 0.852715 -v -1.775780 4.469670 1.775781 -v -0.461485 5.000000 1.114124 -v -0.961046 4.469670 2.320169 -v -0.000000 5.000000 1.205920 -v -0.000000 4.469670 2.511333 -v 0.461486 5.000000 1.114124 -v 0.961045 4.469670 2.320169 -v 0.852714 5.000000 0.852715 -v 1.775780 4.469669 1.775782 -v 1.114125 5.000000 0.461486 -v 2.320169 4.469670 0.961046 -v 1.205920 5.000000 0.000000 -v 2.511333 4.469670 0.000000 -v 1.114125 5.000000 -0.461486 -v 2.320169 4.469670 -0.961046 -v 0.852714 5.000000 -0.852715 -v 1.775780 4.469670 -1.775782 -v 0.461484 5.000000 -1.114125 -v 0.961044 4.469669 -2.320170 -v 0.000000 4.030330 -2.959280 -v 0.000000 2.750000 -3.500000 -v -1.339392 2.750000 -3.233578 -v -1.132467 4.030330 -2.734018 -v -2.474874 2.750000 -2.474874 -v -2.092527 4.030330 -2.092527 -v -3.233578 2.750000 -1.339392 -v -2.734018 4.030330 -1.132467 -v -3.500000 2.750000 0.000000 -v -2.959280 4.030330 0.000000 -v -3.233578 2.750000 1.339393 -v -2.734018 4.030330 1.132467 -v -2.474874 2.750000 2.474874 -v -2.092527 4.030330 2.092527 -v -1.339392 2.750000 3.233578 -v -1.132468 4.030330 2.734018 -v -0.000000 2.750000 3.500000 -v -0.000000 4.030330 2.959280 -v 1.339391 2.750000 3.233579 -v 1.132467 4.030330 2.734018 -v 2.474873 2.750000 2.474874 -v 2.092527 4.030330 2.092527 -v 3.233578 2.750000 1.339393 -v 2.734018 4.030330 1.132468 -v 3.500000 2.750000 0.000000 -v 2.959280 4.030330 0.000000 -v 3.233578 2.750000 -1.339393 -v 2.734018 4.030330 -1.132468 -v 2.474873 2.750000 -2.474874 -v 2.092526 4.030330 -2.092527 -v 1.339391 2.750000 -3.233579 -v 1.132466 4.030330 -2.734019 -l 398 397 -l 399 398 -l 400 399 -l 401 400 -l 402 401 -l 403 402 -l 404 403 -l 405 404 -l 406 405 -l 407 406 -l 408 407 -l 409 408 -l 410 409 -l 411 410 -l 412 411 -l 397 412 -l 416 415 -l 415 413 -l 413 414 -l 414 416 -l 418 417 -l 417 415 -l 416 418 -l 420 419 -l 419 417 -l 418 420 -l 422 421 -l 421 419 -l 420 422 -l 424 423 -l 423 421 -l 422 424 -l 426 425 -l 425 423 -l 424 426 -l 428 427 -l 427 425 -l 426 428 -l 430 429 -l 429 427 -l 428 430 -l 432 431 -l 431 429 -l 430 432 -l 434 433 -l 433 431 -l 432 434 -l 436 435 -l 435 433 -l 434 436 -l 438 437 -l 437 435 -l 436 438 -l 440 439 -l 439 437 -l 438 440 -l 442 441 -l 441 439 -l 440 442 -l 444 443 -l 443 441 -l 442 444 -l 413 443 -l 444 414 -l 445 446 -l 446 447 -l 447 448 -l 448 445 -l 447 449 -l 449 450 -l 450 448 -l 449 451 -l 451 452 -l 452 450 -l 451 453 -l 453 454 -l 454 452 -l 453 455 -l 455 456 -l 456 454 -l 455 457 -l 457 458 -l 458 456 -l 457 459 -l 459 460 -l 460 458 -l 459 461 -l 461 462 -l 462 460 -l 461 463 -l 463 464 -l 464 462 -l 463 465 -l 465 466 -l 466 464 -l 465 467 -l 467 468 -l 468 466 -l 467 469 -l 469 470 -l 470 468 -l 469 471 -l 471 472 -l 472 470 -l 471 473 -l 473 474 -l 474 472 -l 473 475 -l 475 476 -l 476 474 -l 475 446 -l 445 476 -l 448 416 -l 414 445 -l 475 412 -l 397 446 -l 398 447 -l 444 476 -l 450 418 -l 399 449 -l 452 420 -l 400 451 -l 454 422 -l 401 453 -l 456 424 -l 402 455 -l 458 426 -l 403 457 -l 460 428 -l 404 459 -l 462 430 -l 405 461 -l 464 432 -l 406 463 -l 466 434 -l 407 465 -l 468 436 -l 408 467 -l 470 438 -l 409 469 -l 472 440 -l 410 471 -l 474 442 -l 411 473 +v -3.500000 1.000000 3.500000 +v 3.500000 1.000000 3.500000 +v -3.500000 1.000000 -3.500000 +v 3.500000 1.000000 -3.500000 +v -3.500000 5.000000 -3.500000 +v -3.500000 5.000000 3.500000 +v 3.500000 5.000000 3.500000 +v 3.500000 5.000000 -3.500000 +vt -0.000000 0.363636 +vt 1.000000 1.000000 +vt -0.000000 1.000000 +vt 1.000000 0.000000 +vt 0.000000 0.363636 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +vt 0.000000 0.363636 +vt 0.000000 0.000000 +vt 1.000000 -0.000000 +vt -0.000000 -0.000000 +vt 1.000000 0.000000 +vt 0.000000 0.363636 +vt 0.000000 0.000000 +vt 1.000000 0.363636 +vt 1.000000 0.363636 +vt 1.000000 0.363636 +vt 1.000000 0.363636 +vn 0.0000 1.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 0.0000 0.0000 1.0000 +vn 1.0000 0.0000 0.0000 +vn -1.0000 0.0000 0.0000 +s off +f 403/869/118 401/870/118 402/871/118 +f 399/872/119 404/873/119 400/874/119 +f 398/875/120 402/876/120 397/877/120 +f 400/878/121 403/869/121 398/879/121 +f 397/880/122 401/881/122 399/882/122 +f 403/869/118 404/883/118 401/870/118 +f 399/872/119 401/884/119 404/873/119 +f 398/875/120 403/885/120 402/876/120 +f 400/878/121 404/883/121 403/869/121 +f 397/880/122 402/886/122 401/881/122 o TenpennyTower v 0.625000 1.500000 0.375000 v 1.375000 1.500000 0.625000 @@ -2610,220 +2428,220 @@ vn -0.5657 0.6000 -0.5657 vn -0.5657 0.6000 0.5657 vn 0.0000 -1.0000 0.0000 s off -f 487/869/118 488/870/118 490/871/118 -f 486/872/119 492/873/119 481/874/119 -f 494/875/120 486/876/120 485/877/120 -f 482/878/121 492/879/121 491/880/121 -f 495/881/122 488/882/122 487/883/122 -f 497/884/123 489/885/123 488/886/123 -f 486/887/118 481/888/118 509/889/118 -f 501/890/124 490/891/124 489/892/124 -f 495/881/125 485/877/125 508/893/125 -f 505/894/119 507/895/119 509/896/119 -f 504/897/121 506/898/121 505/899/121 -f 509/900/120 508/901/120 510/902/120 -f 507/903/118 506/904/118 515/905/118 -f 482/878/126 490/891/126 502/906/126 -f 516/907/119 498/908/119 520/909/119 -f 519/910/126 496/911/126 515/912/126 -f 477/913/119 519/914/119 515/915/119 -f 477/916/125 511/917/125 518/918/125 -f 478/919/119 511/920/119 514/921/119 -f 499/922/123 536/923/123 524/924/123 -f 521/925/118 528/926/118 525/927/118 -f 523/928/118 525/927/118 524/929/118 -f 535/930/119 484/931/119 523/932/119 -f 522/933/118 526/934/118 528/926/118 -f 513/935/125 526/936/125 512/937/125 -f 483/938/125 523/939/125 484/940/125 -f 480/941/126 522/942/126 479/943/126 -f 500/944/119 528/945/119 513/946/119 -f 539/947/118 526/934/118 527/948/118 -f 499/949/126 525/950/126 500/951/126 -f 479/952/123 521/953/123 483/954/123 -f 527/955/119 537/956/119 539/957/119 -f 538/958/123 526/959/123 540/960/123 -f 524/929/118 535/961/118 523/928/118 -f 537/962/125 540/963/125 539/964/125 -f 536/965/126 533/966/126 535/967/126 -f 560/968/127 575/969/127 576/970/127 -f 565/971/128 583/972/128 567/973/128 -f 557/974/128 575/969/128 559/975/128 -f 565/971/129 582/976/129 581/977/129 -f 530/978/122 553/979/122 529/980/122 -f 543/981/121 560/982/121 544/983/121 -f 551/984/121 568/985/121 552/986/121 -f 544/983/124 558/987/124 542/988/124 -f 552/986/124 566/989/124 550/990/124 -f 529/980/120 555/991/120 531/992/120 -f 546/993/122 561/994/122 545/995/122 -f 545/995/120 563/996/120 547/997/120 -f 531/998/121 556/999/121 532/1000/121 -f 547/1001/121 564/1002/121 548/1003/121 -f 532/1000/124 554/1004/124 530/1005/124 -f 548/1003/124 562/1006/124 546/1007/124 -f 542/1008/122 557/1009/122 541/1010/122 -f 550/1011/122 565/1012/122 549/1013/122 -f 541/1010/120 559/1014/120 543/1015/120 -f 549/1013/120 567/1016/120 551/1017/120 -f 571/1018/118 570/1019/118 572/1020/118 -f 576/970/118 573/1021/118 574/1022/118 -f 579/1023/118 578/1024/118 580/1025/118 -f 584/1026/118 581/977/118 582/976/118 -f 567/973/127 584/1026/127 568/1027/127 -f 560/968/130 574/1022/130 558/1028/130 -f 554/1029/129 569/1030/129 553/1031/129 -f 568/1027/130 582/976/130 566/1032/130 -f 562/1033/129 577/1034/129 561/1035/129 -f 553/1031/128 571/1018/128 555/1036/128 -f 563/1037/128 577/1034/128 579/1023/128 -f 555/1036/127 572/1020/127 556/1038/127 -f 563/1037/127 580/1025/127 564/1039/127 -f 556/1038/130 570/1019/130 554/1029/130 -f 564/1039/130 578/1024/130 562/1033/130 -f 557/974/129 574/1022/129 573/1021/129 -f 615/1040/118 595/1041/118 596/1042/118 -f 594/1043/118 612/1044/118 593/1045/118 -f 598/1046/118 616/1047/118 597/1048/118 -f 610/1049/122 608/1050/122 611/1051/122 -f 602/1052/119 604/1053/119 601/1054/119 -f 602/1052/131 590/1055/131 591/1056/131 -f 607/1057/124 613/1058/124 616/1047/124 -f 604/1053/118 594/1043/118 595/1041/118 -f 589/1059/131 601/1054/131 614/1060/131 -f 606/1061/123 608/1050/123 605/1062/123 -f 606/1061/131 586/1063/131 587/1064/131 -f 603/1065/120 609/1066/120 612/1044/120 -f 608/1050/118 598/1046/118 599/1067/118 -f 585/1068/131 605/1062/131 610/1049/131 -f 610/1049/125 612/1044/125 609/1066/125 -f 610/1049/131 592/1069/131 585/1068/131 -f 611/1051/118 599/1067/118 600/1070/118 -f 612/1044/118 600/1070/118 593/1045/118 -f 606/1061/131 588/1071/131 613/1058/131 -f 614/1060/126 616/1047/126 613/1058/126 -f 614/1060/131 588/1071/131 589/1059/131 -f 614/1060/121 604/1053/121 615/1040/121 -f 616/1047/118 596/1042/118 597/1048/118 -f 602/1052/131 592/1069/131 609/1066/131 -f 488/870/118 489/1072/118 490/871/118 -f 490/871/118 491/1073/118 494/1074/118 -f 491/1073/118 492/1075/118 494/1074/118 -f 492/1075/118 493/1076/118 494/1074/118 -f 494/1074/118 487/869/118 490/871/118 -f 486/872/119 493/1077/119 492/873/119 -f 494/875/120 493/1078/120 486/876/120 -f 482/878/121 481/1079/121 492/879/121 -f 495/881/122 497/1080/122 488/882/122 -f 497/884/123 501/1081/123 489/885/123 -f 481/888/118 482/1082/118 504/1083/118 -f 504/1083/118 505/1084/118 481/888/118 -f 505/1084/118 509/889/118 481/888/118 -f 509/889/118 510/1085/118 486/887/118 -f 510/1085/118 485/1086/118 486/887/118 -f 501/890/124 502/906/124 490/891/124 -f 495/881/125 487/883/125 485/877/125 -f 487/883/125 494/875/125 485/877/125 -f 485/877/125 510/1087/125 508/893/125 -f 516/1088/125 520/1089/125 508/893/125 -f 520/1089/125 495/881/125 508/893/125 -f 505/894/119 506/1090/119 507/895/119 -f 504/897/121 503/1091/121 506/898/121 -f 509/900/120 507/1092/120 508/901/120 -f 503/1093/118 478/1094/118 477/1095/118 -f 478/1094/118 514/1096/118 477/1095/118 -f 506/904/118 503/1093/118 477/1095/118 -f 515/905/118 496/1097/118 516/1098/118 -f 506/904/118 477/1095/118 515/905/118 -f 516/1098/118 508/1099/118 515/905/118 -f 508/1099/118 507/903/118 515/905/118 -f 503/1100/126 504/1101/126 482/878/126 -f 482/878/126 491/880/126 490/891/126 -f 502/906/126 517/1102/126 503/1100/126 -f 517/1102/126 478/1103/126 503/1100/126 -f 503/1100/126 482/878/126 502/906/126 -f 516/907/119 496/1104/119 498/908/119 -f 519/910/126 498/1105/126 496/911/126 -f 477/913/119 518/1106/119 519/914/119 -f 477/916/125 514/1107/125 511/917/125 -f 478/919/119 517/1108/119 511/920/119 -f 499/922/123 534/1109/123 536/923/123 -f 521/925/118 522/933/118 528/926/118 -f 523/928/118 521/925/118 525/927/118 -f 535/930/119 533/1110/119 484/931/119 -f 522/933/118 527/948/118 526/934/118 -f 513/935/125 528/1111/125 526/936/125 -f 483/938/125 521/1112/125 523/939/125 -f 480/941/126 527/1113/126 522/942/126 -f 500/944/119 525/1114/119 528/945/119 -f 539/947/118 540/1115/118 526/934/118 -f 499/949/126 524/1116/126 525/950/126 -f 479/952/123 522/1117/123 521/953/123 -f 527/955/119 480/1118/119 537/956/119 -f 538/958/123 512/1119/123 526/959/123 -f 524/929/118 536/1120/118 535/961/118 -f 537/962/125 538/1121/125 540/963/125 -f 536/965/126 534/1122/126 533/966/126 -f 560/968/127 559/975/127 575/969/127 -f 565/971/128 581/977/128 583/972/128 -f 557/974/128 573/1021/128 575/969/128 -f 565/971/129 566/1032/129 582/976/129 -f 530/978/122 554/1123/122 553/979/122 -f 543/981/121 559/1124/121 560/982/121 -f 551/984/121 567/1125/121 568/985/121 -f 544/983/124 560/982/124 558/987/124 -f 552/986/124 568/985/124 566/989/124 -f 529/980/120 553/979/120 555/991/120 -f 546/993/122 562/1126/122 561/994/122 -f 545/995/120 561/994/120 563/996/120 -f 531/998/121 555/1127/121 556/999/121 -f 547/1001/121 563/1128/121 564/1002/121 -f 532/1000/124 556/999/124 554/1004/124 -f 548/1003/124 564/1002/124 562/1006/124 -f 542/1008/122 558/1129/122 557/1009/122 -f 550/1011/122 566/1130/122 565/1012/122 -f 541/1010/120 557/1009/120 559/1014/120 -f 549/1013/120 565/1012/120 567/1016/120 -f 571/1018/118 569/1030/118 570/1019/118 -f 576/970/118 575/969/118 573/1021/118 -f 579/1023/118 577/1034/118 578/1024/118 -f 584/1026/118 583/972/118 581/977/118 -f 567/973/127 583/972/127 584/1026/127 -f 560/968/130 576/970/130 574/1022/130 -f 554/1029/129 570/1019/129 569/1030/129 -f 568/1027/130 584/1026/130 582/976/130 -f 562/1033/129 578/1024/129 577/1034/129 -f 553/1031/128 569/1030/128 571/1018/128 -f 563/1037/128 561/1035/128 577/1034/128 -f 555/1036/127 571/1018/127 572/1020/127 -f 563/1037/127 579/1023/127 580/1025/127 -f 556/1038/130 572/1020/130 570/1019/130 -f 564/1039/130 580/1025/130 578/1024/130 -f 557/974/129 558/1028/129 574/1022/129 -f 615/1040/118 604/1053/118 595/1041/118 -f 594/1043/118 603/1065/118 612/1044/118 -f 598/1046/118 607/1057/118 616/1047/118 -f 610/1049/122 605/1062/122 608/1050/122 -f 602/1052/119 603/1065/119 604/1053/119 -f 602/1052/131 601/1054/131 590/1055/131 -f 607/1057/124 606/1061/124 613/1058/124 -f 604/1053/118 603/1065/118 594/1043/118 -f 589/1059/131 590/1055/131 601/1054/131 -f 606/1061/123 607/1057/123 608/1050/123 -f 606/1061/131 605/1062/131 586/1063/131 -f 603/1065/120 602/1052/120 609/1066/120 -f 608/1050/118 607/1057/118 598/1046/118 -f 585/1068/131 586/1063/131 605/1062/131 -f 610/1049/125 611/1051/125 612/1044/125 -f 610/1049/131 609/1066/131 592/1069/131 -f 611/1051/118 608/1050/118 599/1067/118 -f 612/1044/118 611/1051/118 600/1070/118 -f 606/1061/131 587/1064/131 588/1071/131 -f 614/1060/126 615/1040/126 616/1047/126 -f 614/1060/131 613/1058/131 588/1071/131 -f 614/1060/121 601/1054/121 604/1053/121 -f 616/1047/118 615/1040/118 596/1042/118 -f 602/1052/131 591/1056/131 592/1069/131 +f 415/887/123 416/888/123 418/889/123 +f 414/890/124 420/891/124 409/892/124 +f 422/893/125 414/894/125 413/895/125 +f 410/896/126 420/897/126 419/898/126 +f 423/899/127 416/900/127 415/901/127 +f 425/902/128 417/903/128 416/904/128 +f 414/905/123 409/906/123 437/907/123 +f 429/908/129 418/909/129 417/910/129 +f 423/899/130 413/895/130 436/911/130 +f 433/912/124 435/913/124 437/914/124 +f 432/915/126 434/916/126 433/917/126 +f 437/918/125 436/919/125 438/920/125 +f 435/921/123 434/922/123 443/923/123 +f 410/896/131 418/909/131 430/924/131 +f 444/925/124 426/926/124 448/927/124 +f 447/928/131 424/929/131 443/930/131 +f 405/931/124 447/932/124 443/933/124 +f 405/934/130 439/935/130 446/936/130 +f 406/937/124 439/938/124 442/939/124 +f 427/940/128 464/941/128 452/942/128 +f 449/943/123 456/944/123 453/945/123 +f 451/946/123 453/945/123 452/947/123 +f 463/948/124 412/949/124 451/950/124 +f 450/951/123 454/952/123 456/944/123 +f 441/953/130 454/954/130 440/955/130 +f 411/956/130 451/957/130 412/958/130 +f 408/959/131 450/960/131 407/961/131 +f 428/962/124 456/963/124 441/964/124 +f 467/965/123 454/952/123 455/966/123 +f 427/967/131 453/968/131 428/969/131 +f 407/970/128 449/971/128 411/972/128 +f 455/973/124 465/974/124 467/975/124 +f 466/976/128 454/977/128 468/978/128 +f 452/947/123 463/979/123 451/946/123 +f 465/980/130 468/981/130 467/982/130 +f 464/983/131 461/984/131 463/985/131 +f 488/986/132 503/987/132 504/988/132 +f 493/989/133 511/990/133 495/991/133 +f 485/992/133 503/987/133 487/993/133 +f 493/989/134 510/994/134 509/995/134 +f 458/996/127 481/997/127 457/998/127 +f 471/999/126 488/1000/126 472/1001/126 +f 479/1002/126 496/1003/126 480/1004/126 +f 472/1001/129 486/1005/129 470/1006/129 +f 480/1004/129 494/1007/129 478/1008/129 +f 457/998/125 483/1009/125 459/1010/125 +f 474/1011/127 489/1012/127 473/1013/127 +f 473/1013/125 491/1014/125 475/1015/125 +f 459/1016/126 484/1017/126 460/1018/126 +f 475/1019/126 492/1020/126 476/1021/126 +f 460/1018/129 482/1022/129 458/1023/129 +f 476/1021/129 490/1024/129 474/1025/129 +f 470/1026/127 485/1027/127 469/1028/127 +f 478/1029/127 493/1030/127 477/1031/127 +f 469/1028/125 487/1032/125 471/1033/125 +f 477/1031/125 495/1034/125 479/1035/125 +f 499/1036/123 498/1037/123 500/1038/123 +f 504/988/123 501/1039/123 502/1040/123 +f 507/1041/123 506/1042/123 508/1043/123 +f 512/1044/123 509/995/123 510/994/123 +f 495/991/132 512/1044/132 496/1045/132 +f 488/986/135 502/1040/135 486/1046/135 +f 482/1047/134 497/1048/134 481/1049/134 +f 496/1045/135 510/994/135 494/1050/135 +f 490/1051/134 505/1052/134 489/1053/134 +f 481/1049/133 499/1036/133 483/1054/133 +f 491/1055/133 505/1052/133 507/1041/133 +f 483/1054/132 500/1038/132 484/1056/132 +f 491/1055/132 508/1043/132 492/1057/132 +f 484/1056/135 498/1037/135 482/1047/135 +f 492/1057/135 506/1042/135 490/1051/135 +f 485/992/134 502/1040/134 501/1039/134 +f 543/1058/123 523/1059/123 524/1060/123 +f 522/1061/123 540/1062/123 521/1063/123 +f 526/1064/123 544/1065/123 525/1066/123 +f 538/1067/127 536/1068/127 539/1069/127 +f 530/1070/124 532/1071/124 529/1072/124 +f 530/1070/136 518/1073/136 519/1074/136 +f 535/1075/129 541/1076/129 544/1065/129 +f 532/1071/123 522/1061/123 523/1059/123 +f 517/1077/136 529/1072/136 542/1078/136 +f 534/1079/128 536/1068/128 533/1080/128 +f 534/1079/136 514/1081/136 515/1082/136 +f 531/1083/125 537/1084/125 540/1062/125 +f 536/1068/123 526/1064/123 527/1085/123 +f 513/1086/136 533/1080/136 538/1067/136 +f 538/1067/130 540/1062/130 537/1084/130 +f 538/1067/136 520/1087/136 513/1086/136 +f 539/1069/123 527/1085/123 528/1088/123 +f 540/1062/123 528/1088/123 521/1063/123 +f 534/1079/136 516/1089/136 541/1076/136 +f 542/1078/131 544/1065/131 541/1076/131 +f 542/1078/136 516/1089/136 517/1077/136 +f 542/1078/126 532/1071/126 543/1058/126 +f 544/1065/123 524/1060/123 525/1066/123 +f 530/1070/136 520/1087/136 537/1084/136 +f 416/888/123 417/1090/123 418/889/123 +f 418/889/123 419/1091/123 422/1092/123 +f 419/1091/123 420/1093/123 422/1092/123 +f 420/1093/123 421/1094/123 422/1092/123 +f 422/1092/123 415/887/123 418/889/123 +f 414/890/124 421/1095/124 420/891/124 +f 422/893/125 421/1096/125 414/894/125 +f 410/896/126 409/1097/126 420/897/126 +f 423/899/127 425/1098/127 416/900/127 +f 425/902/128 429/1099/128 417/903/128 +f 409/906/123 410/1100/123 432/1101/123 +f 432/1101/123 433/1102/123 409/906/123 +f 433/1102/123 437/907/123 409/906/123 +f 437/907/123 438/1103/123 414/905/123 +f 438/1103/123 413/1104/123 414/905/123 +f 429/908/129 430/924/129 418/909/129 +f 423/899/130 415/901/130 413/895/130 +f 415/901/130 422/893/130 413/895/130 +f 413/895/130 438/1105/130 436/911/130 +f 444/1106/130 448/1107/130 436/911/130 +f 448/1107/130 423/899/130 436/911/130 +f 433/912/124 434/1108/124 435/913/124 +f 432/915/126 431/1109/126 434/916/126 +f 437/918/125 435/1110/125 436/919/125 +f 431/1111/123 406/1112/123 405/1113/123 +f 406/1112/123 442/1114/123 405/1113/123 +f 434/922/123 431/1111/123 405/1113/123 +f 443/923/123 424/1115/123 444/1116/123 +f 434/922/123 405/1113/123 443/923/123 +f 444/1116/123 436/1117/123 443/923/123 +f 436/1117/123 435/921/123 443/923/123 +f 431/1118/131 432/1119/131 410/896/131 +f 410/896/131 419/898/131 418/909/131 +f 430/924/131 445/1120/131 431/1118/131 +f 445/1120/131 406/1121/131 431/1118/131 +f 431/1118/131 410/896/131 430/924/131 +f 444/925/124 424/1122/124 426/926/124 +f 447/928/131 426/1123/131 424/929/131 +f 405/931/124 446/1124/124 447/932/124 +f 405/934/130 442/1125/130 439/935/130 +f 406/937/124 445/1126/124 439/938/124 +f 427/940/128 462/1127/128 464/941/128 +f 449/943/123 450/951/123 456/944/123 +f 451/946/123 449/943/123 453/945/123 +f 463/948/124 461/1128/124 412/949/124 +f 450/951/123 455/966/123 454/952/123 +f 441/953/130 456/1129/130 454/954/130 +f 411/956/130 449/1130/130 451/957/130 +f 408/959/131 455/1131/131 450/960/131 +f 428/962/124 453/1132/124 456/963/124 +f 467/965/123 468/1133/123 454/952/123 +f 427/967/131 452/1134/131 453/968/131 +f 407/970/128 450/1135/128 449/971/128 +f 455/973/124 408/1136/124 465/974/124 +f 466/976/128 440/1137/128 454/977/128 +f 452/947/123 464/1138/123 463/979/123 +f 465/980/130 466/1139/130 468/981/130 +f 464/983/131 462/1140/131 461/984/131 +f 488/986/132 487/993/132 503/987/132 +f 493/989/133 509/995/133 511/990/133 +f 485/992/133 501/1039/133 503/987/133 +f 493/989/134 494/1050/134 510/994/134 +f 458/996/127 482/1141/127 481/997/127 +f 471/999/126 487/1142/126 488/1000/126 +f 479/1002/126 495/1143/126 496/1003/126 +f 472/1001/129 488/1000/129 486/1005/129 +f 480/1004/129 496/1003/129 494/1007/129 +f 457/998/125 481/997/125 483/1009/125 +f 474/1011/127 490/1144/127 489/1012/127 +f 473/1013/125 489/1012/125 491/1014/125 +f 459/1016/126 483/1145/126 484/1017/126 +f 475/1019/126 491/1146/126 492/1020/126 +f 460/1018/129 484/1017/129 482/1022/129 +f 476/1021/129 492/1020/129 490/1024/129 +f 470/1026/127 486/1147/127 485/1027/127 +f 478/1029/127 494/1148/127 493/1030/127 +f 469/1028/125 485/1027/125 487/1032/125 +f 477/1031/125 493/1030/125 495/1034/125 +f 499/1036/123 497/1048/123 498/1037/123 +f 504/988/123 503/987/123 501/1039/123 +f 507/1041/123 505/1052/123 506/1042/123 +f 512/1044/123 511/990/123 509/995/123 +f 495/991/132 511/990/132 512/1044/132 +f 488/986/135 504/988/135 502/1040/135 +f 482/1047/134 498/1037/134 497/1048/134 +f 496/1045/135 512/1044/135 510/994/135 +f 490/1051/134 506/1042/134 505/1052/134 +f 481/1049/133 497/1048/133 499/1036/133 +f 491/1055/133 489/1053/133 505/1052/133 +f 483/1054/132 499/1036/132 500/1038/132 +f 491/1055/132 507/1041/132 508/1043/132 +f 484/1056/135 500/1038/135 498/1037/135 +f 492/1057/135 508/1043/135 506/1042/135 +f 485/992/134 486/1046/134 502/1040/134 +f 543/1058/123 532/1071/123 523/1059/123 +f 522/1061/123 531/1083/123 540/1062/123 +f 526/1064/123 535/1075/123 544/1065/123 +f 538/1067/127 533/1080/127 536/1068/127 +f 530/1070/124 531/1083/124 532/1071/124 +f 530/1070/136 529/1072/136 518/1073/136 +f 535/1075/129 534/1079/129 541/1076/129 +f 532/1071/123 531/1083/123 522/1061/123 +f 517/1077/136 518/1073/136 529/1072/136 +f 534/1079/128 535/1075/128 536/1068/128 +f 534/1079/136 533/1080/136 514/1081/136 +f 531/1083/125 530/1070/125 537/1084/125 +f 536/1068/123 535/1075/123 526/1064/123 +f 513/1086/136 514/1081/136 533/1080/136 +f 538/1067/130 539/1069/130 540/1062/130 +f 538/1067/136 537/1084/136 520/1087/136 +f 539/1069/123 536/1068/123 527/1085/123 +f 540/1062/123 539/1069/123 528/1088/123 +f 534/1079/136 515/1082/136 516/1089/136 +f 542/1078/131 543/1058/131 544/1065/131 +f 542/1078/136 541/1076/136 516/1089/136 +f 542/1078/126 529/1072/126 532/1071/126 +f 544/1065/123 543/1058/123 524/1060/123 +f 530/1070/136 519/1074/136 520/1087/136 o RivetCity v -0.750000 1.000000 2.750000 v -1.000000 1.000000 2.250000 @@ -3273,367 +3091,238 @@ vn 0.8649 0.4973 0.0679 vn -0.8196 -0.1731 -0.5462 vn 0.0514 0.9272 -0.3710 s off -f 687/1131/132 624/1132/132 619/1133/132 -f 622/1134/133 618/1135/133 617/1136/133 -f 624/1137/134 620/1138/134 619/1139/134 -f 624/1140/135 628/1141/135 623/1142/135 -f 621/1143/135 631/1144/135 632/1145/135 -f 627/1146/134 626/1147/134 628/1148/134 -f 694/1149/132 625/1150/132 627/1151/132 -f 692/1152/135 627/1153/135 624/1140/135 -f 631/1154/133 630/1155/133 632/1156/133 -f 622/1134/136 620/1138/136 623/1157/136 -f 629/1158/136 622/1134/136 623/1157/136 -f 647/1159/137 646/1160/137 645/1161/137 -f 695/1162/137 635/1163/137 636/1164/137 -f 636/1165/136 634/1166/136 633/1167/136 -f 635/1168/138 691/1169/138 634/1170/138 -f 644/1171/138 647/1172/138 643/1173/138 -f 643/1174/139 637/1175/139 639/1176/139 -f 644/1171/138 639/1177/138 640/1178/138 -f 642/1179/136 640/1180/136 638/1181/136 -f 641/1182/132 638/1183/132 637/1184/132 -f 642/1179/140 648/1185/140 644/1186/140 -f 641/1182/132 646/1187/132 642/1188/132 -f 643/1174/141 645/1189/141 641/1190/141 -f 655/1191/137 653/1192/137 654/1193/137 -f 651/1194/139 656/1195/139 652/1196/139 -f 650/1197/136 654/1198/136 649/1199/136 -f 652/1200/132 655/1201/132 650/1202/132 -f 649/1203/138 653/1204/138 651/1205/138 -f 662/1206/139 660/1207/139 661/1208/139 -f 663/1209/136 657/1210/136 664/1211/136 -f 661/1212/132 658/1213/132 663/1214/132 -f 664/1215/138 659/1216/138 662/1217/138 -f 658/1218/137 659/1219/137 657/1220/137 -f 668/1221/142 665/1222/142 666/1223/142 -f 670/1224/137 667/1225/137 668/1226/137 -f 672/1227/138 669/1228/138 670/1229/138 -f 665/1230/136 669/1231/136 671/1232/136 -f 666/1233/139 670/1234/139 668/1235/139 -f 679/1236/137 677/1237/137 678/1238/137 -f 676/1239/132 679/1240/132 674/1241/132 -f 673/1242/138 677/1243/138 675/1244/138 -f 675/1245/139 680/1246/139 676/1247/139 -f 674/1248/136 678/1249/136 673/1250/136 -f 683/1251/137 682/1252/137 681/1253/137 -f 625/1254/137 696/1255/137 633/1256/137 -f 633/1257/137 629/1258/137 626/1259/137 -f 691/1260/137 686/1261/137 630/1262/137 -f 689/1263/138 621/1264/138 688/1265/138 -f 688/1266/135 632/1145/135 685/1267/135 -f 696/1268/139 692/1269/139 688/1270/139 -f 695/1271/132 633/1272/132 696/1273/132 -f 685/1274/138 630/1275/138 686/1276/138 -f 716/1277/143 720/1278/143 715/1279/143 -f 704/1280/144 705/1281/144 701/1282/144 -f 697/1283/145 700/1284/145 698/1285/145 -f 699/1286/145 703/1287/145 704/1288/145 -f 697/1289/138 712/1290/138 699/1291/138 -f 712/1292/146 703/1293/146 699/1294/146 -f 703/1295/138 710/1296/138 704/1297/138 -f 708/1298/132 720/1299/132 705/1300/132 -f 707/1301/145 705/1302/145 706/1303/145 -f 719/1304/144 707/1305/144 714/1306/144 -f 716/1277/146 702/1307/146 718/1308/146 -f 710/1309/144 706/1303/144 704/1288/144 -f 717/1310/144 705/1302/144 720/1311/144 -f 717/1312/132 702/1313/132 701/1314/132 -f 716/1315/132 698/1316/132 700/1317/132 -f 714/1318/138 706/1319/138 715/1320/138 -f 722/1321/147 723/1322/147 721/1323/147 -f 723/1324/148 726/1325/148 725/1326/148 -f 726/1325/149 727/1327/149 725/1326/149 -f 728/1328/150 729/1329/150 727/1327/150 -f 724/1330/151 733/1331/151 726/1332/151 -f 732/1333/152 731/1334/152 736/1335/152 -f 731/1334/153 722/1321/153 721/1323/153 -f 727/1327/154 729/1329/154 736/1336/154 -f 728/1328/152 727/1327/152 734/1337/152 -f 730/1338/155 733/1339/155 732/1340/155 -f 726/1325/156 733/1341/156 728/1328/156 -f 732/1333/157 733/1342/157 722/1321/157 -f 722/1321/158 733/1342/158 724/1343/158 -f 728/1328/159 733/1341/159 730/1344/159 -f 721/1345/152 722/1346/152 735/1347/152 -f 737/1348/160 738/1349/160 739/1350/160 -f 687/1131/132 692/1351/132 624/1132/132 -f 622/1134/133 621/1352/133 618/1135/133 -f 624/1137/134 623/1157/134 620/1138/134 -f 624/1140/135 627/1153/135 628/1141/135 -f 621/1143/135 622/1353/135 631/1144/135 -f 627/1146/134 625/1354/134 626/1147/134 -f 694/1149/132 693/1355/132 625/1150/132 -f 692/1152/135 694/1356/135 627/1153/135 -f 631/1154/133 629/1158/133 630/1155/133 -f 622/1134/136 617/1136/136 620/1138/136 -f 628/1148/136 626/1147/136 623/1157/136 -f 626/1147/136 629/1158/136 623/1157/136 -f 629/1158/136 631/1154/136 622/1134/136 -f 647/1159/137 648/1357/137 646/1160/137 -f 695/1162/137 690/1358/137 635/1163/137 -f 636/1165/136 635/1359/136 634/1166/136 -f 635/1168/138 690/1360/138 691/1169/138 -f 644/1171/138 648/1361/138 647/1172/138 -f 643/1174/139 641/1190/139 637/1175/139 -f 644/1171/138 643/1173/138 639/1177/138 -f 642/1179/136 644/1186/136 640/1180/136 -f 641/1182/132 642/1188/132 638/1183/132 -f 642/1179/140 646/1362/140 648/1185/140 -f 641/1182/132 645/1363/132 646/1187/132 -f 643/1174/141 647/1364/141 645/1189/141 -f 655/1191/137 656/1365/137 653/1192/137 -f 651/1194/139 653/1366/139 656/1195/139 -f 650/1197/136 655/1367/136 654/1198/136 -f 652/1200/132 656/1368/132 655/1201/132 -f 649/1203/138 654/1369/138 653/1204/138 -f 662/1206/139 659/1370/139 660/1207/139 -f 663/1209/136 658/1371/136 657/1210/136 -f 661/1212/132 660/1372/132 658/1213/132 -f 664/1215/138 657/1373/138 659/1216/138 -f 658/1218/137 660/1374/137 659/1219/137 -f 668/1221/142 667/1375/142 665/1222/142 -f 670/1224/137 669/1376/137 667/1225/137 -f 672/1227/138 671/1377/138 669/1228/138 -f 665/1230/136 667/1378/136 669/1231/136 -f 666/1233/139 672/1379/139 670/1234/139 -f 679/1236/137 680/1380/137 677/1237/137 -f 676/1239/132 680/1381/132 679/1240/132 -f 673/1242/138 678/1382/138 677/1243/138 -f 675/1245/139 677/1383/139 680/1246/139 -f 674/1248/136 679/1384/136 678/1249/136 -f 683/1251/137 684/1385/137 682/1252/137 -f 633/1256/137 626/1386/137 625/1254/137 -f 625/1254/137 693/1387/137 696/1255/137 -f 633/1257/137 634/1388/137 629/1258/137 -f 630/1262/137 629/1389/137 634/1390/137 -f 634/1390/137 691/1260/137 630/1262/137 -f 689/1263/138 618/1391/138 621/1264/138 -f 688/1266/135 621/1143/135 632/1145/135 -f 685/1392/139 686/1393/139 691/1394/139 -f 691/1394/139 690/1395/139 695/1396/139 -f 696/1268/139 693/1397/139 694/1398/139 -f 691/1394/139 695/1396/139 696/1268/139 -f 688/1270/139 685/1392/139 691/1394/139 -f 687/1399/139 689/1400/139 688/1270/139 -f 696/1268/139 694/1398/139 692/1269/139 -f 692/1269/139 687/1399/139 688/1270/139 -f 688/1270/139 691/1394/139 696/1268/139 -f 695/1271/132 636/1401/132 633/1272/132 -f 685/1274/138 632/1402/138 630/1275/138 -f 710/1403/143 709/1404/143 715/1279/143 -f 709/1404/143 712/1292/143 715/1279/143 -f 712/1292/143 713/1405/143 711/1406/143 -f 716/1277/143 718/1308/143 720/1278/143 -f 718/1308/143 717/1407/143 720/1278/143 -f 712/1292/143 711/1406/143 716/1277/143 -f 719/1304/143 714/1306/143 715/1279/143 -f 720/1278/143 719/1304/143 715/1279/143 -f 715/1279/143 712/1292/143 716/1277/143 -f 704/1280/144 706/1408/144 705/1281/144 -f 697/1283/145 699/1294/145 700/1284/145 -f 704/1288/145 701/1409/145 700/1410/145 -f 701/1409/145 702/1411/145 700/1410/145 -f 700/1410/145 699/1286/145 704/1288/145 -f 697/1289/138 713/1412/138 712/1290/138 -f 712/1292/146 709/1404/146 703/1293/146 -f 703/1295/138 709/1413/138 710/1296/138 -f 708/1298/132 719/1414/132 720/1299/132 -f 707/1301/145 708/1415/145 705/1302/145 -f 719/1304/144 708/1416/144 707/1305/144 -f 716/1277/146 700/1284/146 702/1307/146 -f 710/1309/144 715/1417/144 706/1303/144 -f 717/1310/144 701/1409/144 705/1302/144 -f 717/1312/132 718/1418/132 702/1313/132 -f 716/1315/132 711/1419/132 698/1316/132 -f 714/1318/138 707/1420/138 706/1319/138 -f 722/1321/147 724/1343/147 723/1322/147 -f 723/1324/148 724/1421/148 726/1325/148 -f 726/1325/149 728/1328/149 727/1327/149 -f 728/1328/150 730/1344/150 729/1329/150 -f 736/1335/161 729/1422/161 730/1423/161 -f 730/1423/152 732/1333/152 736/1335/152 -f 731/1334/153 732/1333/153 722/1321/153 -f 731/1424/154 721/1345/154 736/1336/154 -f 721/1345/154 723/1324/154 736/1336/154 -f 723/1324/154 725/1326/154 736/1336/154 -f 725/1326/154 727/1327/154 736/1336/154 +f 615/1149/137 552/1150/137 547/1151/137 +f 550/1152/138 546/1153/138 545/1154/138 +f 552/1155/139 548/1156/139 547/1157/139 +f 552/1158/140 556/1159/140 551/1160/140 +f 549/1161/140 559/1162/140 560/1163/140 +f 555/1164/139 554/1165/139 556/1166/139 +f 622/1167/137 553/1168/137 555/1169/137 +f 620/1170/140 555/1171/140 552/1158/140 +f 559/1172/138 558/1173/138 560/1174/138 +f 550/1152/141 548/1156/141 551/1175/141 +f 557/1176/141 550/1152/141 551/1175/141 +f 575/1177/142 574/1178/142 573/1179/142 +f 623/1180/142 563/1181/142 564/1182/142 +f 564/1183/141 562/1184/141 561/1185/141 +f 563/1186/143 619/1187/143 562/1188/143 +f 572/1189/143 575/1190/143 571/1191/143 +f 571/1192/144 565/1193/144 567/1194/144 +f 572/1189/143 567/1195/143 568/1196/143 +f 570/1197/141 568/1198/141 566/1199/141 +f 569/1200/137 566/1201/137 565/1202/137 +f 570/1197/145 576/1203/145 572/1204/145 +f 569/1200/137 574/1205/137 570/1206/137 +f 571/1192/146 573/1207/146 569/1208/146 +f 583/1209/142 581/1210/142 582/1211/142 +f 579/1212/144 584/1213/144 580/1214/144 +f 578/1215/141 582/1216/141 577/1217/141 +f 580/1218/137 583/1219/137 578/1220/137 +f 577/1221/143 581/1222/143 579/1223/143 +f 590/1224/144 588/1225/144 589/1226/144 +f 591/1227/141 585/1228/141 592/1229/141 +f 589/1230/137 586/1231/137 591/1232/137 +f 592/1233/143 587/1234/143 590/1235/143 +f 586/1236/142 587/1237/142 585/1238/142 +f 596/1239/147 593/1240/147 594/1241/147 +f 598/1242/142 595/1243/142 596/1244/142 +f 600/1245/143 597/1246/143 598/1247/143 +f 593/1248/141 597/1249/141 599/1250/141 +f 594/1251/144 598/1252/144 596/1253/144 +f 607/1254/142 605/1255/142 606/1256/142 +f 604/1257/137 607/1258/137 602/1259/137 +f 601/1260/143 605/1261/143 603/1262/143 +f 603/1263/144 608/1264/144 604/1265/144 +f 602/1266/141 606/1267/141 601/1268/141 +f 611/1269/142 610/1270/142 609/1271/142 +f 553/1272/142 624/1273/142 561/1274/142 +f 561/1275/142 557/1276/142 554/1277/142 +f 619/1278/142 614/1279/142 558/1280/142 +f 617/1281/143 549/1282/143 616/1283/143 +f 616/1284/140 560/1163/140 613/1285/140 +f 624/1286/144 620/1287/144 616/1288/144 +f 623/1289/137 561/1290/137 624/1291/137 +f 613/1292/143 558/1293/143 614/1294/143 +f 644/1295/148 648/1296/148 643/1297/148 +f 632/1298/149 633/1299/149 629/1300/149 +f 625/1301/150 628/1302/150 626/1303/150 +f 627/1304/150 631/1305/150 632/1306/150 +f 625/1307/143 640/1308/143 627/1309/143 +f 640/1310/151 631/1311/151 627/1312/151 +f 631/1313/143 638/1314/143 632/1315/143 +f 636/1316/137 648/1317/137 633/1318/137 +f 635/1319/150 633/1320/150 634/1321/150 +f 647/1322/149 635/1323/149 642/1324/149 +f 644/1295/151 630/1325/151 646/1326/151 +f 638/1327/149 634/1321/149 632/1306/149 +f 645/1328/149 633/1320/149 648/1329/149 +f 645/1330/137 630/1331/137 629/1332/137 +f 644/1333/137 626/1334/137 628/1335/137 +f 642/1336/143 634/1337/143 643/1338/143 +f 650/1339/152 651/1340/152 649/1341/152 +f 651/1342/153 654/1343/153 653/1344/153 +f 654/1343/154 655/1345/154 653/1344/154 +f 656/1346/155 657/1347/155 655/1345/155 +f 652/1348/156 661/1349/156 654/1350/156 +f 660/1351/157 659/1352/157 664/1353/157 +f 659/1352/158 650/1339/158 649/1341/158 +f 655/1345/159 657/1347/159 664/1354/159 +f 656/1346/157 655/1345/157 662/1355/157 +f 658/1356/160 661/1357/160 660/1358/160 +f 654/1343/161 661/1359/161 656/1346/161 +f 660/1351/162 661/1360/162 650/1339/162 +f 650/1339/163 661/1360/163 652/1361/163 +f 656/1346/164 661/1359/164 658/1362/164 +f 649/1363/157 650/1364/157 663/1365/157 +f 665/1366/165 666/1367/165 667/1368/165 +f 615/1149/137 620/1369/137 552/1150/137 +f 550/1152/138 549/1370/138 546/1153/138 +f 552/1155/139 551/1175/139 548/1156/139 +f 552/1158/140 555/1171/140 556/1159/140 +f 549/1161/140 550/1371/140 559/1162/140 +f 555/1164/139 553/1372/139 554/1165/139 +f 622/1167/137 621/1373/137 553/1168/137 +f 620/1170/140 622/1374/140 555/1171/140 +f 559/1172/138 557/1176/138 558/1173/138 +f 550/1152/141 545/1154/141 548/1156/141 +f 556/1166/141 554/1165/141 551/1175/141 +f 554/1165/141 557/1176/141 551/1175/141 +f 557/1176/141 559/1172/141 550/1152/141 +f 575/1177/142 576/1375/142 574/1178/142 +f 623/1180/142 618/1376/142 563/1181/142 +f 564/1183/141 563/1377/141 562/1184/141 +f 563/1186/143 618/1378/143 619/1187/143 +f 572/1189/143 576/1379/143 575/1190/143 +f 571/1192/144 569/1208/144 565/1193/144 +f 572/1189/143 571/1191/143 567/1195/143 +f 570/1197/141 572/1204/141 568/1198/141 +f 569/1200/137 570/1206/137 566/1201/137 +f 570/1197/145 574/1380/145 576/1203/145 +f 569/1200/137 573/1381/137 574/1205/137 +f 571/1192/146 575/1382/146 573/1207/146 +f 583/1209/142 584/1383/142 581/1210/142 +f 579/1212/144 581/1384/144 584/1213/144 +f 578/1215/141 583/1385/141 582/1216/141 +f 580/1218/137 584/1386/137 583/1219/137 +f 577/1221/143 582/1387/143 581/1222/143 +f 590/1224/144 587/1388/144 588/1225/144 +f 591/1227/141 586/1389/141 585/1228/141 +f 589/1230/137 588/1390/137 586/1231/137 +f 592/1233/143 585/1391/143 587/1234/143 +f 586/1236/142 588/1392/142 587/1237/142 +f 596/1239/147 595/1393/147 593/1240/147 +f 598/1242/142 597/1394/142 595/1243/142 +f 600/1245/143 599/1395/143 597/1246/143 +f 593/1248/141 595/1396/141 597/1249/141 +f 594/1251/144 600/1397/144 598/1252/144 +f 607/1254/142 608/1398/142 605/1255/142 +f 604/1257/137 608/1399/137 607/1258/137 +f 601/1260/143 606/1400/143 605/1261/143 +f 603/1263/144 605/1401/144 608/1264/144 +f 602/1266/141 607/1402/141 606/1267/141 +f 611/1269/142 612/1403/142 610/1270/142 +f 561/1274/142 554/1404/142 553/1272/142 +f 553/1272/142 621/1405/142 624/1273/142 +f 561/1275/142 562/1406/142 557/1276/142 +f 558/1280/142 557/1407/142 562/1408/142 +f 562/1408/142 619/1278/142 558/1280/142 +f 617/1281/143 546/1409/143 549/1282/143 +f 616/1284/140 549/1161/140 560/1163/140 +f 613/1410/144 614/1411/144 619/1412/144 +f 619/1412/144 618/1413/144 623/1414/144 +f 624/1286/144 621/1415/144 622/1416/144 +f 619/1412/144 623/1414/144 624/1286/144 +f 616/1288/144 613/1410/144 619/1412/144 +f 615/1417/144 617/1418/144 616/1288/144 +f 624/1286/144 622/1416/144 620/1287/144 +f 620/1287/144 615/1417/144 616/1288/144 +f 616/1288/144 619/1412/144 624/1286/144 +f 623/1289/137 564/1419/137 561/1290/137 +f 613/1292/143 560/1420/143 558/1293/143 +f 638/1421/148 637/1422/148 643/1297/148 +f 637/1422/148 640/1310/148 643/1297/148 +f 640/1310/148 641/1423/148 639/1424/148 +f 644/1295/148 646/1326/148 648/1296/148 +f 646/1326/148 645/1425/148 648/1296/148 +f 640/1310/148 639/1424/148 644/1295/148 +f 647/1322/148 642/1324/148 643/1297/148 +f 648/1296/148 647/1322/148 643/1297/148 +f 643/1297/148 640/1310/148 644/1295/148 +f 632/1298/149 634/1426/149 633/1299/149 +f 625/1301/150 627/1312/150 628/1302/150 +f 632/1306/150 629/1427/150 628/1428/150 +f 629/1427/150 630/1429/150 628/1428/150 +f 628/1428/150 627/1304/150 632/1306/150 +f 625/1307/143 641/1430/143 640/1308/143 +f 640/1310/151 637/1422/151 631/1311/151 +f 631/1313/143 637/1431/143 638/1314/143 +f 636/1316/137 647/1432/137 648/1317/137 +f 635/1319/150 636/1433/150 633/1320/150 +f 647/1322/149 636/1434/149 635/1323/149 +f 644/1295/151 628/1302/151 630/1325/151 +f 638/1327/149 643/1435/149 634/1321/149 +f 645/1328/149 629/1427/149 633/1320/149 +f 645/1330/137 646/1436/137 630/1331/137 +f 644/1333/137 639/1437/137 626/1334/137 +f 642/1336/143 635/1438/143 634/1337/143 +f 650/1339/152 652/1361/152 651/1340/152 +f 651/1342/153 652/1439/153 654/1343/153 +f 654/1343/154 656/1346/154 655/1345/154 +f 656/1346/155 658/1362/155 657/1347/155 +f 664/1353/166 657/1440/166 658/1441/166 +f 658/1441/157 660/1351/157 664/1353/157 +f 659/1352/158 660/1351/158 650/1339/158 +f 659/1442/159 649/1363/159 664/1354/159 +f 649/1363/159 651/1342/159 664/1354/159 +f 651/1342/159 653/1344/159 664/1354/159 +f 653/1344/159 655/1345/159 664/1354/159 o Socket -v 0.000000 0.000000 -4.000000 -v 0.000000 1.000000 -4.000000 -v 1.530734 0.000000 -3.695518 -v 1.530734 1.000000 -3.695518 -v 2.828427 0.000000 -2.828427 -v 2.828427 1.000000 -2.828427 -v 3.695518 0.000000 -1.530734 -v 3.695518 1.000000 -1.530734 -v 4.000000 0.000000 0.000000 -v 4.000000 1.000000 0.000000 -v 3.695518 0.000000 1.530734 -v 3.695518 1.000000 1.530734 -v 2.828427 0.000000 2.828427 -v 2.828427 1.000000 2.828427 -v 1.530734 0.000000 3.695518 -v 1.530734 1.000000 3.695518 -v 0.000001 0.000000 4.000000 -v 0.000001 1.000000 4.000000 -v -1.530733 0.000000 3.695518 -v -1.530733 1.000000 3.695518 -v -2.828426 0.000000 2.828428 -v -2.828426 1.000000 2.828428 -v -3.695518 0.000000 1.530734 -v -3.695518 1.000000 1.530734 -v -4.000000 0.000000 -0.000000 -v -4.000000 1.000000 -0.000000 -v -3.695518 0.000000 -1.530734 -v -3.695518 1.000000 -1.530734 -v -2.828426 0.000000 -2.828428 -v -2.828426 1.000000 -2.828428 -v -1.530732 0.000000 -3.695519 -v -1.530732 1.000000 -3.695519 -vt 0.426601 0.598494 -vt 0.426601 0.930919 -vt 0.073399 0.930919 -vt 0.345575 0.452461 -vt 0.019260 0.325247 -vt 0.154425 0.018127 -vt 0.480740 0.674753 -vt 0.499751 0.764706 -vt 0.480740 0.854660 -vt 0.345576 0.981873 -vt 0.250000 0.999766 -vt 0.154425 0.981873 -vt 0.019260 0.854659 -vt 0.000249 0.764706 -vt 0.019260 0.674752 -vt 0.073399 0.598493 -vt 0.154425 0.547539 -vt 0.250000 0.529646 -vt 0.345576 0.547539 -vt 0.480740 0.145341 -vt 0.499751 0.235294 -vt 0.480740 0.325248 -vt 0.426601 0.401507 -vt 0.250000 0.470354 -vt 0.154424 0.452461 -vt 0.073399 0.401506 -vt 0.000249 0.235294 -vt 0.019260 0.145341 -vt 0.073399 0.069081 -vt 0.250000 0.000234 -vt 0.345576 0.018127 -vt 0.426601 0.069082 -vt 0.750000 0.529412 -vt 0.687500 0.470588 -vt 0.750000 0.470588 -vt 0.687500 0.529412 -vt 0.625000 0.470588 -vt 0.625000 0.529412 -vt 0.562500 0.470588 -vt 0.562500 0.529412 -vt 0.500000 0.470588 -vt 0.500000 0.529412 -vt 0.437500 0.470588 -vt 0.437500 0.529412 -vt 0.375000 0.470588 -vt 0.375000 0.529412 -vt 0.312500 0.470588 -vt 0.312500 0.529412 -vt 0.250000 0.470588 -vt 0.250000 0.529412 -vt 0.187500 0.470588 -vt 0.187500 0.529412 -vt 0.125000 0.470588 -vt 0.125000 0.529412 -vt 0.062500 0.470588 -vt 0.062500 0.529412 -vt 0.000000 0.470588 -vt 1.000000 0.529412 -vt 0.937500 0.470588 -vt 1.000000 0.470588 -vt 0.937500 0.529412 -vt 0.875000 0.470588 -vt 0.875000 0.529412 -vt 0.812500 0.470588 -vt 0.812500 0.529412 -vt 0.000000 0.529412 -vn 0.0000 1.0000 -0.0000 +v -4.000000 0.000000 4.000000 +v 4.000000 0.000000 4.000000 +v -4.000000 0.000000 -4.000000 +v 4.000000 0.000000 -4.000000 +v -4.000000 1.000000 -4.000000 +v -4.000000 1.000000 4.000000 +v 4.000000 1.000000 4.000000 +v 4.000000 1.000000 -4.000000 +vt 1.000000 0.111111 +vt -0.000000 1.000000 +vt -0.000000 0.111111 +vt 0.000100 0.111189 +vt 0.999900 0.999900 +vt 0.000100 0.999900 +vt 0.999900 0.000100 +vt 0.000100 0.000100 +vt 1.000000 -0.000000 +vt -0.000000 0.111111 +vt -0.000000 -0.000000 +vt 1.000000 -0.000000 +vt -0.000000 0.111111 +vt -0.000000 -0.000000 +vt 1.000000 -0.000000 +vt -0.000000 0.111111 +vt -0.000000 -0.000000 +vt 1.000000 1.000000 +vt 0.999900 0.111189 +vt 1.000000 0.111111 +vt 1.000000 0.111111 +vt 1.000000 0.111111 vn 0.0000 -1.0000 0.0000 -vn 0.0000 0.0000 -1.0000 -vn 0.3827 0.0000 -0.9239 -vn 0.7071 0.0000 -0.7071 -vn 0.9239 0.0000 -0.3827 +vn 0.0000 1.0000 0.0000 vn 1.0000 0.0000 0.0000 -vn 0.9239 0.0000 0.3827 -vn 0.7071 0.0000 0.7071 -vn 0.3827 0.0000 0.9239 +vn -1.0000 0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 vn 0.0000 0.0000 1.0000 -vn -0.3827 0.0000 0.9239 -vn -0.7071 0.0000 0.7071 -vn -0.9239 0.0000 0.3827 -vn -1.0000 0.0000 -0.0000 -vn -0.9239 0.0000 -0.3827 -vn -0.7071 0.0000 -0.7071 -vn -0.3827 0.0000 -0.9239 s off -f 745/1425/162 769/1426/162 761/1427/162 -f 746/1428/163 754/1429/163 762/1430/163 -f 745/1425/162 743/1431/162 741/1432/162 -f 741/1432/162 771/1433/162 769/1426/162 -f 769/1426/162 767/1434/162 765/1435/162 -f 765/1435/162 763/1436/162 761/1427/162 -f 761/1427/162 759/1437/162 757/1438/162 -f 757/1438/162 755/1439/162 753/1440/162 -f 753/1440/162 751/1441/162 749/1442/162 -f 749/1442/162 747/1443/162 753/1440/162 -f 747/1443/162 745/1425/162 753/1440/162 -f 745/1425/162 741/1432/162 769/1426/162 -f 769/1426/162 765/1435/162 761/1427/162 -f 761/1427/162 757/1438/162 745/1425/162 -f 757/1438/162 753/1440/162 745/1425/162 -f 770/1444/163 740/1445/163 742/1446/163 -f 742/1446/163 744/1447/163 770/1444/163 -f 744/1447/163 746/1428/163 770/1444/163 -f 746/1428/163 748/1448/163 750/1449/163 -f 750/1449/163 752/1450/163 746/1428/163 -f 752/1450/163 754/1429/163 746/1428/163 -f 754/1429/163 756/1451/163 762/1430/163 -f 756/1451/163 758/1452/163 762/1430/163 -f 758/1452/163 760/1453/163 762/1430/163 -f 762/1430/163 764/1454/163 766/1455/163 -f 766/1455/163 768/1456/163 770/1444/163 -f 762/1430/163 766/1455/163 770/1444/163 -f 770/1444/163 746/1428/163 762/1430/163 -s 1 -f 741/1457/164 742/1458/165 740/1459/164 -f 743/1460/165 744/1461/166 742/1458/165 -f 745/1462/166 746/1463/167 744/1461/166 -f 747/1464/167 748/1465/168 746/1463/167 -f 749/1466/168 750/1467/169 748/1465/168 -f 751/1468/169 752/1469/170 750/1467/169 -f 753/1470/170 754/1471/171 752/1469/170 -f 755/1472/171 756/1473/172 754/1471/171 -f 757/1474/172 758/1475/173 756/1473/172 -f 759/1476/173 760/1477/174 758/1475/173 -f 761/1478/174 762/1479/175 760/1477/174 -f 763/1480/175 764/1481/176 762/1479/175 -f 765/1482/176 766/1483/177 764/1484/176 -f 767/1485/177 768/1486/178 766/1483/177 -f 769/1487/178 770/1488/179 768/1486/178 -f 771/1489/179 740/1459/164 770/1488/179 -f 741/1457/164 743/1460/165 742/1458/165 -f 743/1460/165 745/1462/166 744/1461/166 -f 745/1462/166 747/1464/167 746/1463/167 -f 747/1464/167 749/1466/168 748/1465/168 -f 749/1466/168 751/1468/169 750/1467/169 -f 751/1468/169 753/1470/170 752/1469/170 -f 753/1470/170 755/1472/171 754/1471/171 -f 755/1472/171 757/1474/172 756/1473/172 -f 757/1474/172 759/1476/173 758/1475/173 -f 759/1476/173 761/1478/174 760/1477/174 -f 761/1478/174 763/1480/175 762/1479/175 -f 763/1480/175 765/1490/176 764/1481/176 -f 765/1482/176 767/1485/177 766/1483/177 -f 767/1485/177 769/1487/178 768/1486/178 -f 769/1487/178 771/1489/179 770/1488/179 -f 771/1489/179 741/1457/164 740/1459/164 +f 670/1443/167 669/1444/167 668/1445/167 +f 674/1446/168 672/1447/168 673/1448/168 +f 671/1449/169 674/1446/169 669/1450/169 +f 668/1451/170 672/1452/170 670/1453/170 +f 670/1454/171 675/1455/171 671/1456/171 +f 669/1457/172 673/1458/172 668/1459/172 +f 670/1443/167 671/1460/167 669/1444/167 +f 674/1446/168 675/1461/168 672/1447/168 +f 671/1449/169 675/1461/169 674/1446/169 +f 668/1451/170 673/1462/170 672/1452/170 +f 670/1454/171 672/1463/171 675/1455/171 +f 669/1457/172 674/1464/172 673/1458/172 diff --git a/src/main/resources/assets/hbm/textures/models/trinkets/snowglobe.png b/src/main/resources/assets/hbm/textures/models/trinkets/snowglobe.png index 6be391ef7..eee84d7ca 100644 Binary files a/src/main/resources/assets/hbm/textures/models/trinkets/snowglobe.png and b/src/main/resources/assets/hbm/textures/models/trinkets/snowglobe.png differ diff --git a/src/main/resources/assets/hbm/textures/models/trinkets/snowglobe_glass.png b/src/main/resources/assets/hbm/textures/models/trinkets/snowglobe_glass.png new file mode 100644 index 000000000..e714aa532 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/models/trinkets/snowglobe_glass.png differ