From ef44b79f83db1e7fbcf5d84cd0a6412f6e003b8e Mon Sep 17 00:00:00 2001 From: Bob Date: Sat, 5 Aug 2023 16:33:23 +0200 Subject: [PATCH 1/2] suffering builds character --- changelog | 11 +- .../java/com/hbm/crafting/ArmorRecipes.java | 4 + .../java/com/hbm/handler/HazmatRegistry.java | 6 + .../container/ContainerElectrolyserFluid.java | 47 + .../container/ContainerElectrolyserMetal.java | 44 + .../com/hbm/inventory/gui/GUIRBMKConsole.java | 2 + src/main/java/com/hbm/items/ModItems.java | 12 +- .../com/hbm/items/armor/ArmorEnvsuit.java | 9 +- .../com/hbm/items/special/ItemGlitch.java | 11 +- .../com/hbm/items/tool/ItemPowerNetTool.java | 94 +- .../hbm/render/item/ItemRenderLibrary.java | 11 - .../hbm/render/loader/ModelRendererObj.java | 11 +- .../hbm/render/loader/ModelRendererTest.java | 172 + .../com/hbm/render/model/ModelArmorBase.java | 1 + .../render/tileentity/RenderElectrolyser.java | 30 +- .../machine/TileEntityElectrolyser.java | 38 + .../machine/rbmk/TileEntityRBMKRod.java | 13 +- .../assets/hbm/models/armor/envsuit.obj | 3104 +++++++++-------- .../assets/hbm/models/armor/test.obj | 219 ++ .../items/circuit_targeting_tier1.png | Bin 332 -> 344 bytes .../items/circuit_targeting_tier2.png | Bin 366 -> 404 bytes .../items/circuit_targeting_tier3.png | Bin 334 -> 357 bytes .../items/circuit_targeting_tier4.png | Bin 347 -> 344 bytes .../items/circuit_targeting_tier5.png | Bin 343 -> 361 bytes .../items/circuit_targeting_tier6.png | Bin 351 -> 362 bytes .../hbm/textures/items/envsuit_boots.png | Bin 0 -> 154 bytes .../hbm/textures/items/envsuit_helmet.png | Bin 0 -> 252 bytes .../hbm/textures/items/envsuit_legs.png | Bin 0 -> 282 bytes .../hbm/textures/items/envsuit_plate.png | Bin 0 -> 258 bytes 29 files changed, 2232 insertions(+), 1607 deletions(-) create mode 100644 src/main/java/com/hbm/render/loader/ModelRendererTest.java create mode 100644 src/main/resources/assets/hbm/models/armor/test.obj create mode 100644 src/main/resources/assets/hbm/textures/items/envsuit_boots.png create mode 100644 src/main/resources/assets/hbm/textures/items/envsuit_helmet.png create mode 100644 src/main/resources/assets/hbm/textures/items/envsuit_legs.png create mode 100644 src/main/resources/assets/hbm/textures/items/envsuit_plate.png diff --git a/changelog b/changelog index b609d3764..34c06cd90 100644 --- a/changelog +++ b/changelog @@ -1,4 +1,12 @@ ## Added +* Electrolysis machine + * A large machine that can do the chemical plant's electrolysis recipes, as well as crystal processing + * Crystals are turned into molten metals as well as byproducts, the metal can be cast using foundry blocks + * Processing crystals requires nitric acid and yields more than what the centrifuge would give +* Environment suit + * An airtight suit for diving with high radiation resistance + * Relatively cheap, but protection is comparatively low + * Has sprint assist and accelerated diving ## Changed * Bedrock ores now spawn in the nether @@ -9,4 +17,5 @@ ## Fixed * Fixed custom machines not sending fluid -* Fixed custom machine item IO not working beyond the first slot \ No newline at end of file +* Fixed custom machine item IO not working beyond the first slot +* Fixed the player's arms clipping through the armor model when punching \ No newline at end of file diff --git a/src/main/java/com/hbm/crafting/ArmorRecipes.java b/src/main/java/com/hbm/crafting/ArmorRecipes.java index 96b9543b8..3aaa6019e 100644 --- a/src/main/java/com/hbm/crafting/ArmorRecipes.java +++ b/src/main/java/com/hbm/crafting/ArmorRecipes.java @@ -105,6 +105,10 @@ public class ArmorRecipes { CraftingManager.addRecipeAuto(new ItemStack(ModItems.dieselsuit_plate, 1), new Object[] { "W W", "CDC", "SWS", 'W', new ItemStack(Blocks.wool, 1, 14), 'S', STEEL.ingot(), 'C', ModItems.circuit_targeting_tier3, 'D', ModBlocks.machine_diesel }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.dieselsuit_legs, 1), new Object[] { "M M", "S S", "W W", 'W', new ItemStack(Blocks.wool, 1, 14), 'S', STEEL.ingot(), 'M', ModItems.motor }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.dieselsuit_boots, 1), new Object[] { "W W", "S S", 'W', new ItemStack(Blocks.wool, 1, 14), 'S', STEEL.ingot() }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.envsuit_helmet, 1), new Object[] { "TCT", "TGT", "RRR", 'T', TI.plate(), 'C', ModItems.circuit_red_copper, 'G', KEY_ANYPANE, 'R', RUBBER.ingot() }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.envsuit_plate, 1), new Object[] { "T T", "TCT", "RRR", 'T', TI.plate(), 'C', TI.plateCast(), 'R', RUBBER.ingot() }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.envsuit_legs, 1), new Object[] { "TCT", "R R", "T T", 'T', TI.plate(), 'C', TI.plateCast(), 'R', RUBBER.ingot() }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.envsuit_boots, 1), new Object[] { "R R", "T T", 'T', TI.plate(), 'R', RUBBER.ingot() }); //Bismuth fursui- I mean armor CraftingManager.addRecipeAuto(new ItemStack(ModItems.bismuth_helmet, 1), new Object[] { "GPP", "P ", "FPP", 'G', Items.gold_ingot, 'P', ModItems.plate_bismuth, 'F', ModItems.rag }); diff --git a/src/main/java/com/hbm/handler/HazmatRegistry.java b/src/main/java/com/hbm/handler/HazmatRegistry.java index 67bc7c955..1d6b322b1 100644 --- a/src/main/java/com/hbm/handler/HazmatRegistry.java +++ b/src/main/java/com/hbm/handler/HazmatRegistry.java @@ -53,6 +53,7 @@ public class HazmatRegistry { double t45 = 1D; // 90% double ajr = 1.3D; // 95% double bj = 1D; // 90% + double env = 2D; // 99% double hev = 2.3D; // 99.5% double rpa = 2D; // 99% double fau = 4D; // 99.99% @@ -108,6 +109,11 @@ public class HazmatRegistry { HazmatRegistry.registerHazmat(ModItems.steamsuit_legs, 1.3 * legs); HazmatRegistry.registerHazmat(ModItems.steamsuit_boots, 1.3 * boots); + HazmatRegistry.registerHazmat(ModItems.envsuit_helmet, env * helmet); + HazmatRegistry.registerHazmat(ModItems.envsuit_plate, env * chest); + HazmatRegistry.registerHazmat(ModItems.envsuit_legs, env * legs); + HazmatRegistry.registerHazmat(ModItems.envsuit_boots, env * boots); + HazmatRegistry.registerHazmat(ModItems.hev_helmet, hev * helmet); HazmatRegistry.registerHazmat(ModItems.hev_plate, hev * chest); HazmatRegistry.registerHazmat(ModItems.hev_legs, hev * legs); diff --git a/src/main/java/com/hbm/inventory/container/ContainerElectrolyserFluid.java b/src/main/java/com/hbm/inventory/container/ContainerElectrolyserFluid.java index d52d54c24..f9fcff491 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerElectrolyserFluid.java +++ b/src/main/java/com/hbm/inventory/container/ContainerElectrolyserFluid.java @@ -1,12 +1,17 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotTakeOnly; +import com.hbm.items.ModItems; +import com.hbm.items.machine.IItemFluidIdentifier; +import com.hbm.items.machine.ItemMachineUpgrade; import com.hbm.tileentity.machine.TileEntityElectrolyser; +import api.hbm.energy.IBatteryItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; public class ContainerElectrolyserFluid extends Container { @@ -47,6 +52,48 @@ public class ContainerElectrolyserFluid extends Container { } } + @Override + public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2) { + ItemStack var3 = null; + Slot var4 = (Slot) this.inventorySlots.get(par2); + + if(var4 != null && var4.getHasStack()) { + ItemStack var5 = var4.getStack(); + var3 = var5.copy(); + + if(par2 <= 13) { + if(!this.mergeItemStack(var5, 14, this.inventorySlots.size(), true)) { + return null; + } + } else { + + if(var3.getItem() instanceof IBatteryItem || var3.getItem() == ModItems.battery_creative) { + if(!this.mergeItemStack(var5, 0, 1, false)) { + return null; + } + } else if(var3.getItem() instanceof ItemMachineUpgrade) { + if(!this.mergeItemStack(var5, 1, 3, false)) { + return null; + } + } else if(var3.getItem() instanceof IItemFluidIdentifier) { + if(!this.mergeItemStack(var5, 3, 4, false)) { + return null; + } + } else { + return null; + } + } + + if(var5.stackSize == 0) { + var4.putStack((ItemStack) null); + } else { + var4.onSlotChanged(); + } + } + + return var3; + } + @Override public boolean canInteractWith(EntityPlayer player) { return electrolyser.isUseableByPlayer(player); diff --git a/src/main/java/com/hbm/inventory/container/ContainerElectrolyserMetal.java b/src/main/java/com/hbm/inventory/container/ContainerElectrolyserMetal.java index 881f1382c..15c8b9565 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerElectrolyserMetal.java +++ b/src/main/java/com/hbm/inventory/container/ContainerElectrolyserMetal.java @@ -1,12 +1,16 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotCraftingOutput; +import com.hbm.items.ModItems; +import com.hbm.items.machine.ItemMachineUpgrade; import com.hbm.tileentity.machine.TileEntityElectrolyser; +import api.hbm.energy.IBatteryItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; public class ContainerElectrolyserMetal extends Container { @@ -41,6 +45,46 @@ public class ContainerElectrolyserMetal extends Container { } } + @Override + public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2) { + ItemStack var3 = null; + Slot var4 = (Slot) this.inventorySlots.get(par2); + + if(var4 != null && var4.getHasStack()) { + ItemStack var5 = var4.getStack(); + var3 = var5.copy(); + + if(par2 <= 10) { + if(!this.mergeItemStack(var5, 11, this.inventorySlots.size(), true)) { + return null; + } + } else { + + if(var3.getItem() instanceof IBatteryItem || var3.getItem() == ModItems.battery_creative) { + if(!this.mergeItemStack(var5, 0, 1, false)) { + return null; + } + } else if(var3.getItem() instanceof ItemMachineUpgrade) { + if(!this.mergeItemStack(var5, 1, 3, false)) { + return null; + } + } else { + if(!this.mergeItemStack(var5, 3, 4, false)) { + return null; + } + } + } + + if(var5.stackSize == 0) { + var4.putStack((ItemStack) null); + } else { + var4.onSlotChanged(); + } + } + + return var3; + } + @Override public boolean canInteractWith(EntityPlayer player) { return electrolyser.isUseableByPlayer(player); diff --git a/src/main/java/com/hbm/inventory/gui/GUIRBMKConsole.java b/src/main/java/com/hbm/inventory/gui/GUIRBMKConsole.java index 85be6afb7..1f8d20881 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIRBMKConsole.java +++ b/src/main/java/com/hbm/inventory/gui/GUIRBMKConsole.java @@ -320,9 +320,11 @@ public class GUIRBMKConsole extends GuiScreen { case FUEL_SIM: if(col.data.hasKey("c_heat")) { int fh = (int)Math.ceil((col.data.getDouble("c_heat") - 20) * 8 / col.data.getDouble("c_maxHeat")); + if(fh > 8) fh = 8; drawTexturedModalRect(guiLeft + x + 1, guiTop + y + size - fh - 1, 11, 191 - fh, 2, fh); int fe = (int)Math.ceil((col.data.getDouble("enrichment")) * 8); + if(fe > 8) fe = 8; drawTexturedModalRect(guiLeft + x + 4, guiTop + y + size - fe - 1, 14, 191 - fe, 2, fe); } break; diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index bf30755ad..01cd4fa82 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -4866,17 +4866,17 @@ public class ModItems { ArmorMaterial aMatEnv = EnumHelper.addArmorMaterial("HBM_ENV", 150, new int[] { 3, 8, 6, 3 }, 100); aMatEnv.customCraftingMaterial = ModItems.plate_armor_hev; - envsuit_helmet = new ArmorEnvsuit(aMatEnv, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png", 1000000, 10000, 2500, 0).setMod(0.5F).setThreshold(2.0F) + envsuit_helmet = new ArmorEnvsuit(aMatEnv, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png", 100_000, 1_000, 250, 0).setMod(0.5F).setThreshold(2.0F) .addEffect(new PotionEffect(Potion.moveSpeed.id, 20, 1)) .addEffect(new PotionEffect(Potion.jump.id, 20, 0)) - .addResistance("fall", 0.75F) + .addResistance("fall", 0.25F) .addResistance("monoxide", 0F) .addResistance("onFire", 0F) .hides(EnumPlayerPart.HAT) - .setUnlocalizedName("envsuit_helmet").setTextureName(RefStrings.MODID + ":hev_helmet"); - envsuit_plate = new ArmorEnvsuit(aMatEnv, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png", 1000000, 10000, 2500, 0).cloneStats((ArmorFSB) envsuit_helmet).setUnlocalizedName("envsuit_plate").setTextureName(RefStrings.MODID + ":hev_plate"); - envsuit_legs = new ArmorEnvsuit(aMatEnv, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png", 1000000, 10000, 2500, 0).cloneStats((ArmorFSB) envsuit_helmet).setUnlocalizedName("envsuit_legs").setTextureName(RefStrings.MODID + ":hev_legs"); - envsuit_boots = new ArmorEnvsuit(aMatEnv, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png", 1000000, 10000, 2500, 0).cloneStats((ArmorFSB) envsuit_helmet).setUnlocalizedName("envsuit_boots").setTextureName(RefStrings.MODID + ":hev_boots"); + .setUnlocalizedName("envsuit_helmet").setTextureName(RefStrings.MODID + ":envsuit_helmet"); + envsuit_plate = new ArmorEnvsuit(aMatEnv, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png", 100_000, 1_000, 250, 0).cloneStats((ArmorFSB) envsuit_helmet).setUnlocalizedName("envsuit_plate").setTextureName(RefStrings.MODID + ":envsuit_plate"); + envsuit_legs = new ArmorEnvsuit(aMatEnv, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png", 100_000, 1_000, 250, 0).cloneStats((ArmorFSB) envsuit_helmet).setUnlocalizedName("envsuit_legs").setTextureName(RefStrings.MODID + ":envsuit_legs"); + envsuit_boots = new ArmorEnvsuit(aMatEnv, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png", 100_000, 1_000, 250, 0).cloneStats((ArmorFSB) envsuit_helmet).setUnlocalizedName("envsuit_boots").setTextureName(RefStrings.MODID + ":envsuit_boots"); ArmorMaterial aMatHEV = EnumHelper.addArmorMaterial("HBM_HEV", 150, new int[] { 3, 8, 6, 3 }, 100); aMatHEV.customCraftingMaterial = ModItems.plate_armor_hev; diff --git a/src/main/java/com/hbm/items/armor/ArmorEnvsuit.java b/src/main/java/com/hbm/items/armor/ArmorEnvsuit.java index 158ab3059..e7ee41f79 100644 --- a/src/main/java/com/hbm/items/armor/ArmorEnvsuit.java +++ b/src/main/java/com/hbm/items/armor/ArmorEnvsuit.java @@ -63,9 +63,10 @@ public class ArmorEnvsuit extends ArmorFSBPowered { if(player.isInWater()) { - player.setAir(300); - - player.addPotionEffect(new PotionEffect(Potion.nightVision.id, 15 * 20, 0)); + if(!world.isRemote) { + player.setAir(300); + player.addPotionEffect(new PotionEffect(Potion.nightVision.id, 15 * 20, 0)); + } double mo = 0.1 * player.moveForward; Vec3 vec = player.getLookVec(); @@ -77,7 +78,7 @@ public class ArmorEnvsuit extends ArmorFSBPowered { player.motionY += vec.yCoord; player.motionZ += vec.zCoord; } else { - if(player.isPotionActive(Potion.nightVision.id) && player.getActivePotionEffect(Potion.nightVision).getDuration() > 15 * 20) { + if(!world.isRemote) { player.removePotionEffect(Potion.nightVision.id); } } diff --git a/src/main/java/com/hbm/items/special/ItemGlitch.java b/src/main/java/com/hbm/items/special/ItemGlitch.java index f30246151..9942c4754 100644 --- a/src/main/java/com/hbm/items/special/ItemGlitch.java +++ b/src/main/java/com/hbm/items/special/ItemGlitch.java @@ -12,6 +12,7 @@ import com.hbm.items.ModItems; import com.hbm.lib.ModDamageSource; import com.hbm.main.MainRegistry; +import api.hbm.energy.IBatteryItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; @@ -21,7 +22,7 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; -public class ItemGlitch extends Item { +public class ItemGlitch extends Item implements IBatteryItem { public ItemGlitch() { @@ -235,4 +236,12 @@ public class ItemGlitch extends Item { } } + + @Override public void chargeBattery(ItemStack stack, long i) { } + @Override public void setCharge(ItemStack stack, long i) { } + @Override public void dischargeBattery(ItemStack stack, long i) { } + @Override public long getCharge(ItemStack stack) { return 200; } + @Override public long getMaxCharge() { return 200; } + @Override public long getChargeRate() { return 0; } + @Override public long getDischargeRate() { return 200; } } diff --git a/src/main/java/com/hbm/items/tool/ItemPowerNetTool.java b/src/main/java/com/hbm/items/tool/ItemPowerNetTool.java index d1e5eef45..10b0d2d20 100644 --- a/src/main/java/com/hbm/items/tool/ItemPowerNetTool.java +++ b/src/main/java/com/hbm/items/tool/ItemPowerNetTool.java @@ -41,58 +41,60 @@ public class ItemPowerNetTool extends Item { TileEntity te = world.getTileEntity(x, y, z); - if(!(te instanceof IEnergyConductor)) - return false; - if(world.isRemote) return true; - IEnergyConductor con = (IEnergyConductor) te; - IPowerNet net = con.getPowerNet(); - - if(net == null) { - player.addChatComponentMessage(ChatBuilder.start("Error: No network found! This should be impossible!").color(EnumChatFormatting.RED).flush()); + if((te instanceof IEnergyConductor)) { + + IEnergyConductor con = (IEnergyConductor) te; + IPowerNet net = con.getPowerNet(); + + if(net == null) { + player.addChatComponentMessage(ChatBuilder.start("Error: No network found! This should be impossible!").color(EnumChatFormatting.RED).flush()); + return true; + } + + if(!(net instanceof PowerNet)) { + player.addChatComponentMessage(ChatBuilder.start("Error: Cannot print diagnostic for non-standard power net implementation!").color(EnumChatFormatting.RED).flush()); + } + + PowerNet network = (PowerNet) net; + String id = Integer.toHexString(net.hashCode()); + + player.addChatComponentMessage(ChatBuilder.start("Start of diagnostic for network " + id).color(EnumChatFormatting.GOLD).flush()); + player.addChatComponentMessage(ChatBuilder.start("Links: " + network.getLinks().size()).color(EnumChatFormatting.YELLOW).flush()); + player.addChatComponentMessage(ChatBuilder.start("Proxies: " + network.getProxies().size()).color(EnumChatFormatting.YELLOW).flush()); + player.addChatComponentMessage(ChatBuilder.start("Subscribers: " + network.getSubscribers().size()).color(EnumChatFormatting.YELLOW).flush()); + player.addChatComponentMessage(ChatBuilder.start("End of diagnostic for network " + id).color(EnumChatFormatting.GOLD).flush()); + + for(IEnergyConductor link : network.getLinks()) { + Vec3 pos = link.getDebugParticlePos(); + + boolean errored = link.getPowerNet() != net; + + NBTTagCompound data = new NBTTagCompound(); + data.setString("type", "debug"); + data.setInteger("color", errored ? 0xff0000 : 0xffff00); + data.setFloat("scale", 0.5F); + data.setString("text", id); + PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(data, pos.xCoord, pos.yCoord, pos.zCoord), new TargetPoint(world.provider.dimensionId, pos.xCoord, pos.yCoord, pos.zCoord, radius)); + } + + for(IEnergyConnector subscriber : network.getSubscribers()) { + Vec3 pos = subscriber.getDebugParticlePos(); + + NBTTagCompound data = new NBTTagCompound(); + data.setString("type", "debug"); + data.setInteger("color", 0x0000ff); + data.setFloat("scale", 1.5F); + data.setString("text", id); + PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(data, pos.xCoord, pos.yCoord, pos.zCoord), new TargetPoint(world.provider.dimensionId, pos.xCoord, pos.yCoord, pos.zCoord, radius)); + } + return true; } - if(!(net instanceof PowerNet)) { - player.addChatComponentMessage(ChatBuilder.start("Error: Cannot print diagnostic for non-standard power net implementation!").color(EnumChatFormatting.RED).flush()); - } - - PowerNet network = (PowerNet) net; - String id = Integer.toHexString(net.hashCode()); - - player.addChatComponentMessage(ChatBuilder.start("Start of diagnostic for network " + id).color(EnumChatFormatting.GOLD).flush()); - player.addChatComponentMessage(ChatBuilder.start("Links: " + network.getLinks().size()).color(EnumChatFormatting.YELLOW).flush()); - player.addChatComponentMessage(ChatBuilder.start("Proxies: " + network.getProxies().size()).color(EnumChatFormatting.YELLOW).flush()); - player.addChatComponentMessage(ChatBuilder.start("Subscribers: " + network.getSubscribers().size()).color(EnumChatFormatting.YELLOW).flush()); - player.addChatComponentMessage(ChatBuilder.start("End of diagnostic for network " + id).color(EnumChatFormatting.GOLD).flush()); - - for(IEnergyConductor link : network.getLinks()) { - Vec3 pos = link.getDebugParticlePos(); - - boolean errored = link.getPowerNet() != net; - - NBTTagCompound data = new NBTTagCompound(); - data.setString("type", "debug"); - data.setInteger("color", errored ? 0xff0000 : 0xffff00); - data.setFloat("scale", 0.5F); - data.setString("text", id); - PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(data, pos.xCoord, pos.yCoord, pos.zCoord), new TargetPoint(world.provider.dimensionId, pos.xCoord, pos.yCoord, pos.zCoord, radius)); - } - - for(IEnergyConnector subscriber : network.getSubscribers()) { - Vec3 pos = subscriber.getDebugParticlePos(); - - NBTTagCompound data = new NBTTagCompound(); - data.setString("type", "debug"); - data.setInteger("color", 0x0000ff); - data.setFloat("scale", 1.5F); - data.setString("text", id); - PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(data, pos.xCoord, pos.yCoord, pos.zCoord), new TargetPoint(world.provider.dimensionId, pos.xCoord, pos.yCoord, pos.zCoord, radius)); - } - - return true; + return false; } private static final int radius = 20; diff --git a/src/main/java/com/hbm/render/item/ItemRenderLibrary.java b/src/main/java/com/hbm/render/item/ItemRenderLibrary.java index 52222f734..57dadbfde 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderLibrary.java +++ b/src/main/java/com/hbm/render/item/ItemRenderLibrary.java @@ -1191,17 +1191,6 @@ public class ItemRenderLibrary { GL11.glShadeModel(GL11.GL_FLAT); }}); - renderers.put(Item.getItemFromBlock(ModBlocks.machine_electrolyser), new ItemRenderBase( ) { - public void renderInventory() { - GL11.glScaled(3, 3, 3); - } - public void renderCommon() { - GL11.glScaled(0.5, 0.5, 0.5); - GL11.glShadeModel(GL11.GL_SMOOTH); - bindTexture(ResourceManager.electrolyser_tex); ResourceManager.electrolyser.renderAll(); - GL11.glShadeModel(GL11.GL_FLAT); - }}); - renderers.put(Item.getItemFromBlock(ModBlocks.red_pylon_large), new ItemRenderBase( ) { public void renderInventory() { GL11.glTranslated(0, -5, 0); diff --git a/src/main/java/com/hbm/render/loader/ModelRendererObj.java b/src/main/java/com/hbm/render/loader/ModelRendererObj.java index e9ba2885f..4d916aa86 100644 --- a/src/main/java/com/hbm/render/loader/ModelRendererObj.java +++ b/src/main/java/com/hbm/render/loader/ModelRendererObj.java @@ -12,6 +12,9 @@ public class ModelRendererObj { public float rotationPointX; public float rotationPointY; public float rotationPointZ; + public float originPointX; + public float originPointY; + public float originPointZ; public float rotateAngleX; public float rotateAngleY; public float rotateAngleZ; @@ -35,9 +38,9 @@ public class ModelRendererObj { } public ModelRendererObj setRotationPoint(float x, float y, float z) { - this.rotationPointX = x; - this.rotationPointY = y; - this.rotationPointZ = z; + this.originPointX = this.rotationPointX = x; + this.originPointY = this.rotationPointY = y; + this.originPointZ = this.rotationPointZ = z; return this; } @@ -90,7 +93,7 @@ public class ModelRendererObj { GL11.glRotatef(this.rotateAngleX * (180F / (float) Math.PI), 1.0F, 0.0F, 0.0F); } - GL11.glTranslatef(-this.rotationPointX * scale, -this.rotationPointY * scale, -this.rotationPointZ * scale); + GL11.glTranslatef(-this.rotationPointX * scale, -this.rotationPointY * scale, -this.originPointZ * scale); //yes, that is correct GL11.glScalef(scale, scale, scale); diff --git a/src/main/java/com/hbm/render/loader/ModelRendererTest.java b/src/main/java/com/hbm/render/loader/ModelRendererTest.java new file mode 100644 index 000000000..0a8063a94 --- /dev/null +++ b/src/main/java/com/hbm/render/loader/ModelRendererTest.java @@ -0,0 +1,172 @@ +package com.hbm.render.loader; + +import org.lwjgl.opengl.GL11; + +import com.hbm.main.ResourceManager; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelBox; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.GLAllocation; +import net.minecraft.client.renderer.Tessellator; + +public class ModelRendererTest extends ModelRenderer { + + //TODO: blow up mojank HQ with a JDAM + private boolean compiled; + private int displayList; + + public ModelRendererTest(ModelBase p_i1173_1_) { + super(p_i1173_1_); + } + + public ModelRendererTest(ModelBase p_i1174_1_, int p_i1174_2_, int p_i1174_3_) { + this(p_i1174_1_); + this.setTextureOffset(p_i1174_2_, p_i1174_3_); + } + + @SideOnly(Side.CLIENT) + public void render(float p_78785_1_) { + if(!this.isHidden) { + if(this.showModel) { + if(!this.compiled) { + this.compileDisplayList(p_78785_1_); + } + + GL11.glTranslatef(this.offsetX, this.offsetY, this.offsetZ); + int i; + + if(this.rotateAngleX == 0.0F && this.rotateAngleY == 0.0F && this.rotateAngleZ == 0.0F) { + if(this.rotationPointX == 0.0F && this.rotationPointY == 0.0F && this.rotationPointZ == 0.0F) { + GL11.glCallList(this.displayList); + + if(this.childModels != null) { + for(i = 0; i < this.childModels.size(); ++i) { + ((ModelRenderer) this.childModels.get(i)).render(p_78785_1_); + } + } + } else { + GL11.glTranslatef(this.rotationPointX * p_78785_1_, this.rotationPointY * p_78785_1_, this.rotationPointZ * p_78785_1_); + GL11.glCallList(this.displayList); + + if(this.childModels != null) { + for(i = 0; i < this.childModels.size(); ++i) { + ((ModelRenderer) this.childModels.get(i)).render(p_78785_1_); + } + } + + GL11.glTranslatef(-this.rotationPointX * p_78785_1_, -this.rotationPointY * p_78785_1_, -this.rotationPointZ * p_78785_1_); + } + } else { + GL11.glPushMatrix(); + GL11.glTranslatef(this.rotationPointX * p_78785_1_, this.rotationPointY * p_78785_1_, this.rotationPointZ * p_78785_1_); + + if(this.rotateAngleZ != 0.0F) { + GL11.glRotatef(this.rotateAngleZ * (180F / (float) Math.PI), 0.0F, 0.0F, 1.0F); + } + + if(this.rotateAngleY != 0.0F) { + GL11.glRotatef(this.rotateAngleY * (180F / (float) Math.PI), 0.0F, 1.0F, 0.0F); + } + + if(this.rotateAngleX != 0.0F) { + GL11.glRotatef(this.rotateAngleX * (180F / (float) Math.PI), 1.0F, 0.0F, 0.0F); + } + + GL11.glPushMatrix(); + GL11.glScaled(0.1, 0.1, 0.1); + ResourceManager.chemplant_body.renderAll(); + GL11.glPopMatrix(); + + //GL11.glCallList(this.displayList); + + if(this.childModels != null) { + for(i = 0; i < this.childModels.size(); ++i) { + ((ModelRenderer) this.childModels.get(i)).render(p_78785_1_); + } + } + + GL11.glPopMatrix(); + } + + GL11.glTranslatef(-this.offsetX, -this.offsetY, -this.offsetZ); + } + } + } + + @SideOnly(Side.CLIENT) + public void renderWithRotation(float p_78791_1_) { + if(!this.isHidden) { + if(this.showModel) { + if(!this.compiled) { + this.compileDisplayList(p_78791_1_); + } + + GL11.glPushMatrix(); + GL11.glTranslatef(this.rotationPointX * p_78791_1_, this.rotationPointY * p_78791_1_, this.rotationPointZ * p_78791_1_); + + if(this.rotateAngleY != 0.0F) { + GL11.glRotatef(this.rotateAngleY * (180F / (float) Math.PI), 0.0F, 1.0F, 0.0F); + } + + if(this.rotateAngleX != 0.0F) { + GL11.glRotatef(this.rotateAngleX * (180F / (float) Math.PI), 1.0F, 0.0F, 0.0F); + } + + if(this.rotateAngleZ != 0.0F) { + GL11.glRotatef(this.rotateAngleZ * (180F / (float) Math.PI), 0.0F, 0.0F, 1.0F); + } + + GL11.glCallList(this.displayList); + GL11.glPopMatrix(); + } + } + } + + @SideOnly(Side.CLIENT) + public void postRender(float p_78794_1_) { + if(!this.isHidden) { + if(this.showModel) { + if(!this.compiled) { + this.compileDisplayList(p_78794_1_); + } + + if(this.rotateAngleX == 0.0F && this.rotateAngleY == 0.0F && this.rotateAngleZ == 0.0F) { + if(this.rotationPointX != 0.0F || this.rotationPointY != 0.0F || this.rotationPointZ != 0.0F) { + GL11.glTranslatef(this.rotationPointX * p_78794_1_, this.rotationPointY * p_78794_1_, this.rotationPointZ * p_78794_1_); + } + } else { + GL11.glTranslatef(this.rotationPointX * p_78794_1_, this.rotationPointY * p_78794_1_, this.rotationPointZ * p_78794_1_); + + if(this.rotateAngleZ != 0.0F) { + GL11.glRotatef(this.rotateAngleZ * (180F / (float) Math.PI), 0.0F, 0.0F, 1.0F); + } + + if(this.rotateAngleY != 0.0F) { + GL11.glRotatef(this.rotateAngleY * (180F / (float) Math.PI), 0.0F, 1.0F, 0.0F); + } + + if(this.rotateAngleX != 0.0F) { + GL11.glRotatef(this.rotateAngleX * (180F / (float) Math.PI), 1.0F, 0.0F, 0.0F); + } + } + } + } + } + + @SideOnly(Side.CLIENT) + private void compileDisplayList(float p_78788_1_) { + this.displayList = GLAllocation.generateDisplayLists(1); + GL11.glNewList(this.displayList, GL11.GL_COMPILE); + Tessellator tessellator = Tessellator.instance; + + for(int i = 0; i < this.cubeList.size(); ++i) { + ((ModelBox) this.cubeList.get(i)).render(tessellator, p_78788_1_); + } + + GL11.glEndList(); + this.compiled = true; + } +} diff --git a/src/main/java/com/hbm/render/model/ModelArmorBase.java b/src/main/java/com/hbm/render/model/ModelArmorBase.java index 81af0edba..b823ec015 100644 --- a/src/main/java/com/hbm/render/model/ModelArmorBase.java +++ b/src/main/java/com/hbm/render/model/ModelArmorBase.java @@ -40,6 +40,7 @@ public class ModelArmorBase extends ModelBiped { } public void setRotationAngles(float walkCycle, float walkAmplitude, float idleCycle, float headYaw, float headPitch, float scale, Entity entity) { + //super.setRotationAngles(walkCycle, walkAmplitude, idleCycle, headYaw, headPitch, scale, entity); head.rotateAngleY = headYaw / (180F / (float) Math.PI); head.rotateAngleX = headPitch / (180F / (float) Math.PI); diff --git a/src/main/java/com/hbm/render/tileentity/RenderElectrolyser.java b/src/main/java/com/hbm/render/tileentity/RenderElectrolyser.java index 9784333e1..f8054adc4 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderElectrolyser.java +++ b/src/main/java/com/hbm/render/tileentity/RenderElectrolyser.java @@ -3,19 +3,20 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; import com.hbm.blocks.BlockDummyable; +import com.hbm.blocks.ModBlocks; import com.hbm.main.ResourceManager; -import com.hbm.tileentity.machine.TileEntityElectrolyser; +import com.hbm.render.item.ItemRenderBase; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.client.IItemRenderer; -public class RenderElectrolyser extends TileEntitySpecialRenderer { +public class RenderElectrolyser extends TileEntitySpecialRenderer implements IItemRendererProvider { @Override public void renderTileEntityAt(TileEntity te, double x, double y, double z, float interp) { - TileEntityElectrolyser electrolyser = (TileEntityElectrolyser) te; - GL11.glPushMatrix(); GL11.glTranslated(x + 0.5D, y, z + 0.5D); @@ -40,4 +41,25 @@ public class RenderElectrolyser extends TileEntitySpecialRenderer { } + @Override + public Item getItemForRenderer() { + return Item.getItemFromBlock(ModBlocks.machine_electrolyser); + } + + @Override + public IItemRenderer getRenderer() { + return new ItemRenderBase( ) { + public void renderInventory() { + GL11.glTranslated(-1, -1, 0); + GL11.glScaled(2.5, 2.5, 2.5); + } + public void renderCommon() { + GL11.glScaled(0.5, 0.5, 0.5); + GL11.glShadeModel(GL11.GL_SMOOTH); + bindTexture(ResourceManager.electrolyser_tex); ResourceManager.electrolyser.renderAll(); + GL11.glShadeModel(GL11.GL_FLAT); + } + }; + } + } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityElectrolyser.java b/src/main/java/com/hbm/tileentity/machine/TileEntityElectrolyser.java index 26762787e..5f1801c59 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityElectrolyser.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityElectrolyser.java @@ -368,6 +368,44 @@ public class TileEntityElectrolyser extends TileEntityMachineBase implements IEn this.decrStackSize(14, 1); } + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); + + this.power = nbt.getLong("power"); + this.progressFluid = nbt.getInteger("progressFluid"); + this.progressOre = nbt.getInteger("progressOre"); + this.usage = nbt.getInteger("usage"); + this.processFluidTime = nbt.getInteger("processFluidTime"); + this.processOreTime = nbt.getInteger("processOreTime"); + if(nbt.hasKey("leftType")) this.leftStack = new MaterialStack(Mats.matById.get(nbt.getInteger("leftType")), nbt.getInteger("leftAmount")); + else this.leftStack = null; + if(nbt.hasKey("rightType")) this.rightStack = new MaterialStack(Mats.matById.get(nbt.getInteger("rightType")), nbt.getInteger("rightAmount")); + else this.rightStack = null; + for(int i = 0; i < 4; i++) tanks[i].readFromNBT(nbt, "t" + i); + } + + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); + + nbt.setLong("power", this.power); + nbt.setInteger("progressFluid", this.progressFluid); + nbt.setInteger("progressOre", this.progressOre); + nbt.setInteger("usage", this.usage); + nbt.setInteger("processFluidTime", this.processFluidTime); + nbt.setInteger("processOreTime", this.processOreTime); + if(this.leftStack != null) { + nbt.setInteger("leftType", leftStack.material.id); + nbt.setInteger("leftAmount", leftStack.amount); + } + if(this.rightStack != null) { + nbt.setInteger("rightType", rightStack.material.id); + nbt.setInteger("rightAmount", rightStack.amount); + } + for(int i = 0; i < 4; i++) tanks[i].writeToNBT(nbt, "t" + i); + } + AxisAlignedBB bb = null; @Override 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 f13f34952..9ec5ccd87 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java @@ -11,6 +11,8 @@ import com.hbm.items.ModItems; import com.hbm.items.machine.ItemRBMKRod; import com.hbm.tileentity.machine.rbmk.TileEntityRBMKConsole.ColumnType; import com.hbm.util.Compat; +import com.hbm.util.ParticleUtil; + import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -83,11 +85,18 @@ public class TileEntityRBMKRod extends TileEntityRBMKSlottedBase implements IRBM super.updateEntity(); - if(this.heat > this.maxHeat() && !RBMKDials.getMeltdownsDisabled(worldObj)) { - this.meltdown(); + if(this.heat > this.maxHeat()) { + + if(RBMKDials.getMeltdownsDisabled(worldObj)) { + ParticleUtil.spawnGasFlame(worldObj, xCoord + 0.5, yCoord + RBMKDials.getColumnHeight(worldObj) + 0.5, zCoord + 0.5, 0, 0.2, 0); + } else { + this.meltdown(); + } return; } + if(this.heat > 10_000) this.heat = 10_000; + //for spreading, we want the buffered flux to be 0 because we want to know exactly how much gets reflected back this.fluxFast = 0; this.fluxSlow = 0; diff --git a/src/main/resources/assets/hbm/models/armor/envsuit.obj b/src/main/resources/assets/hbm/models/armor/envsuit.obj index 6a6abae64..d3df05777 100644 --- a/src/main/resources/assets/hbm/models/armor/envsuit.obj +++ b/src/main/resources/assets/hbm/models/armor/envsuit.obj @@ -1,5 +1,385 @@ # Blender v2.79 (sub 0) OBJ File: 'envsuit_scaled.blend' # www.blender.org +o LeftFoot +v -0.100000 23.250000 -3.675000 +v 4.100000 23.250000 -3.675000 +v -0.100000 24.299999 -3.675000 +v 4.100000 24.299999 -3.675000 +v 4.100000 22.199999 -2.625000 +v -0.100000 22.200001 -2.625000 +v -0.625000 22.200001 -2.100000 +v 4.625000 22.199999 -2.100000 +v -0.625000 22.200001 2.100000 +v 4.625000 22.199999 2.100000 +v 4.100000 22.199999 2.625000 +v -0.100000 22.200001 2.625000 +v -0.100000 22.200001 2.100000 +v 4.100000 22.199999 2.100000 +v -0.100000 22.200001 -2.100000 +v 4.100000 22.199999 -2.100000 +v 4.100000 24.299999 -2.625000 +v 4.625000 24.299999 -2.100000 +v -0.100000 24.299999 -2.625000 +v -0.625000 24.299999 -2.100000 +v 4.625000 24.299999 2.100000 +v 4.100000 24.299999 2.625000 +v -0.625000 24.299999 2.100000 +v -0.100000 24.299999 2.625000 +v 1.475000 20.110407 -3.209024 +v 2.525000 20.110407 -3.209024 +v 1.475000 20.469528 -4.195702 +v 2.525000 20.469528 -4.195702 +v 0.425000 23.070438 -2.131661 +v 3.575000 23.070438 -2.131661 +v 0.425000 23.429560 -3.118338 +v 3.575000 23.429560 -3.118338 +v 2.525000 23.070438 -2.131661 +v 2.525000 23.429560 -3.118338 +v 1.475000 23.070438 -2.131661 +v 1.475000 23.429560 -3.118338 +v 2.000000 21.097084 -2.849903 +v 2.000000 21.456205 -3.836581 +vt 0.979167 0.025000 +vt 0.791667 -0.000000 +vt 0.770833 0.225000 +vt 0.791667 0.300000 +vt 0.958333 0.250000 +vt 0.791667 0.250000 +vt 0.958333 0.300000 +vt 0.791667 0.350000 +vt 0.958333 0.350000 +vt 0.791667 0.400000 +vt 0.958333 0.400000 +vt 0.750000 0.300000 +vt 1.000000 0.300000 +vt 0.562500 0.100000 +vt 0.395833 0.125000 +vt 0.562500 0.125000 +vt 0.208333 0.100000 +vt 0.375000 0.125000 +vt 0.375000 0.100000 +vt 0.375000 0.125000 +vt 0.395833 0.100000 +vt 0.187500 0.100000 +vt 0.020833 0.125000 +vt 0.187500 0.125000 +vt 0.187500 0.125000 +vt 0.208333 0.125000 +vt 0.583333 0.100000 +vt 0.562500 0.125000 +vt 0.583333 0.125000 +vt 0.020833 0.100000 +vt -0.000000 0.125000 +vt 0.750000 0.125000 +vt 0.750000 0.100000 +vt 0.583333 0.000000 +vt 0.750000 0.000000 +vt 0.187500 0.000000 +vt 0.208333 -0.000000 +vt 0.395833 -0.000000 +vt 0.375000 -0.000000 +vt 0.020833 0.000000 +vt -0.000000 0.100000 +vt 0.729167 0.900000 +vt 0.687500 0.950000 +vt 0.729167 0.950000 +vt 0.562500 0.900000 +vt 0.687500 0.900000 +vt 0.854167 0.950000 +vt 0.645833 0.850000 +vt 0.562500 0.800000 +vt 0.562500 0.850000 +vt 0.854167 0.850000 +vt 0.770833 0.800000 +vt 0.770833 0.850000 +vt 0.562500 0.950000 +vt 0.645833 1.000000 +vt 0.770833 1.000000 +vt 0.708333 1.000000 +vt 0.854167 0.900000 +vt 0.708333 0.850000 +vt 0.979167 0.225000 +vt 0.958333 -0.000000 +vt 0.770833 0.025000 +vt 0.750000 0.400000 +vt 1.000000 0.400000 +vt 0.562500 0.000000 +vt -0.000000 0.000000 +vt 0.645833 0.800000 +vt 0.854167 0.800000 +vt 0.562500 1.000000 +vt 0.854167 1.000000 +vn 0.0000 1.0000 -0.0000 +vn 0.0000 0.0000 -1.0000 +vn -0.0000 -0.7071 -0.7071 +vn 1.0000 0.0000 0.0000 +vn -1.0000 0.0000 0.0000 +vn -0.0000 -1.0000 0.0000 +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.7071 0.0000 0.7071 +vn 0.0000 -0.9397 -0.3420 +vn 0.9487 -0.2972 -0.1082 +vn -0.9487 -0.2972 -0.1082 +vn -0.9701 0.2279 0.0830 +vn 0.9701 0.2279 0.0830 +vn 0.0000 -0.3420 0.9397 +vn -0.0000 0.3420 -0.9397 +s off +f 23/1/1 22/2/1 18/3/1 +f 4/4/1 19/5/1 17/6/1 +f 3/7/2 2/8/2 1/9/2 +f 1/9/3 5/10/3 6/11/3 +f 17/12/4 2/8/4 4/4/4 +f 1/9/5 19/13/5 3/7/5 +f 6/14/6 16/15/6 15/16/6 +f 10/17/6 16/18/6 8/19/6 +f 8/20/6 16/15/6 5/21/6 +f 11/22/6 13/23/6 14/24/6 +f 11/25/6 14/26/6 10/17/6 +f 7/27/6 6/28/6 15/29/6 +f 12/30/6 9/31/6 13/23/6 +f 7/27/6 13/32/6 9/33/6 +f 20/34/7 6/14/7 7/27/7 +f 23/35/5 7/27/5 9/33/5 +f 22/36/8 12/30/8 11/22/8 +f 21/37/9 11/22/9 10/17/9 +f 17/38/10 8/19/10 5/21/10 +f 18/39/4 10/17/4 8/19/4 +f 24/40/11 9/41/11 12/30/11 +f 27/42/12 26/43/12 25/44/12 +f 32/45/13 26/43/13 28/46/13 +f 29/47/14 27/42/14 25/44/14 +f 38/48/15 33/49/15 34/50/15 +f 36/51/16 37/52/16 38/53/16 +f 30/54/17 37/55/17 26/43/17 +f 37/56/17 29/47/17 25/44/17 +f 26/43/17 37/57/17 25/44/17 +f 31/58/18 38/53/18 27/42/18 +f 32/45/18 38/48/18 34/50/18 +f 27/42/18 38/59/18 28/46/18 +f 18/3/1 17/6/1 19/5/1 +f 19/5/1 20/60/1 23/1/1 +f 23/1/1 24/61/1 22/2/1 +f 22/2/1 21/62/1 18/3/1 +f 18/3/1 19/5/1 23/1/1 +f 4/4/1 3/7/1 19/5/1 +f 3/7/2 4/4/2 2/8/2 +f 1/9/3 2/8/3 5/10/3 +f 17/12/4 5/63/4 2/8/4 +f 1/9/5 6/64/5 19/13/5 +f 6/14/6 5/21/6 16/15/6 +f 10/17/6 14/26/6 16/18/6 +f 11/22/6 12/30/6 13/23/6 +f 7/27/6 15/29/6 13/32/6 +f 20/34/7 19/65/7 6/14/7 +f 23/35/5 20/34/5 7/27/5 +f 22/36/8 24/40/8 12/30/8 +f 21/37/9 22/36/9 11/22/9 +f 17/38/10 18/39/10 8/19/10 +f 18/39/4 21/37/4 10/17/4 +f 24/40/11 23/66/11 9/41/11 +f 27/42/12 28/46/12 26/43/12 +f 32/45/13 30/54/13 26/43/13 +f 29/47/14 31/58/14 27/42/14 +f 38/48/15 37/67/15 33/49/15 +f 36/51/16 35/68/16 37/52/16 +f 30/54/17 33/69/17 37/55/17 +f 37/56/17 35/70/17 29/47/17 +f 31/58/18 36/51/18 38/53/18 +f 32/45/18 28/46/18 38/48/18 +o RightFoot +v 0.100000 23.250000 -3.675000 +v -4.100000 23.250000 -3.675000 +v 0.100000 24.299999 -3.675000 +v -4.100000 24.299999 -3.675000 +v -4.100000 22.200001 -2.625000 +v 0.100000 22.200001 -2.625000 +v 0.625000 22.200001 -2.100000 +v -4.625000 22.200001 -2.100000 +v 0.625000 22.200001 2.100000 +v -4.625000 22.200001 2.100000 +v -4.100000 22.200001 2.625000 +v 0.100000 22.200001 2.625000 +v 0.100000 22.200001 2.100000 +v -4.100000 22.200001 2.100000 +v 0.100000 22.200001 -2.100000 +v -4.100000 22.200001 -2.100000 +v -4.100000 24.299999 -2.625000 +v -4.625000 24.299999 -2.100000 +v 0.100000 24.299999 -2.625000 +v 0.625000 24.299999 -2.100000 +v -4.625000 24.299999 2.100000 +v -4.100000 24.299999 2.625000 +v 0.625000 24.299999 2.100000 +v 0.100000 24.299999 2.625000 +v -1.475000 20.110409 -3.209024 +v -2.525000 20.110409 -3.209024 +v -1.475000 20.469528 -4.195702 +v -2.525000 20.469528 -4.195702 +v -0.425000 23.070438 -2.131661 +v -3.575000 23.070440 -2.131661 +v -0.425000 23.429560 -3.118338 +v -3.575000 23.429560 -3.118338 +v -2.525000 23.070440 -2.131661 +v -2.525000 23.429560 -3.118338 +v -1.475000 23.070440 -2.131661 +v -1.475000 23.429560 -3.118338 +v -2.000000 21.097086 -2.849903 +v -2.000000 21.456205 -3.836581 +vt 0.791667 -0.000000 +vt 0.979167 0.025000 +vt 0.958333 0.250000 +vt 0.791667 0.300000 +vt 0.791667 0.250000 +vt 0.791667 0.350000 +vt 0.958333 0.300000 +vt 0.958333 0.350000 +vt 0.791667 0.400000 +vt 0.958333 0.400000 +vt 0.750000 0.300000 +vt 1.000000 0.300000 +vt 0.395833 0.125000 +vt 0.562500 0.100000 +vt 0.562500 0.125000 +vt 0.375000 0.125000 +vt 0.208333 0.100000 +vt 0.375000 0.100000 +vt 0.375000 0.125000 +vt 0.395833 0.100000 +vt 0.020833 0.125000 +vt 0.187500 0.100000 +vt 0.187500 0.125000 +vt 0.187500 0.125000 +vt 0.208333 0.125000 +vt 0.583333 0.100000 +vt 0.583333 0.125000 +vt 0.562500 0.125000 +vt 0.020833 0.100000 +vt -0.000000 0.125000 +vt 0.750000 0.125000 +vt 0.750000 0.100000 +vt 0.562500 0.000000 +vt 0.583333 0.000000 +vt 0.750000 0.000000 +vt 0.187500 0.000000 +vt 0.208333 -0.000000 +vt 0.395833 -0.000000 +vt 0.375000 -0.000000 +vt -0.000000 0.100000 +vt 0.020833 0.000000 +vt 0.687500 0.950000 +vt 0.729167 0.900000 +vt 0.729167 0.950000 +vt 0.562500 0.900000 +vt 0.687500 0.900000 +vt 0.854167 0.900000 +vt 0.854167 0.950000 +vt 0.562500 0.850000 +vt 0.645833 0.800000 +vt 0.645833 0.850000 +vt 0.854167 0.850000 +vt 0.770833 0.800000 +vt 0.854167 0.800000 +vt 0.645833 1.000000 +vt 0.562500 0.950000 +vt 0.770833 1.000000 +vt 0.708333 1.000000 +vt 0.770833 0.850000 +vt 0.708333 0.850000 +vt 0.770833 0.225000 +vt 0.770833 0.025000 +vt 0.958333 -0.000000 +vt 0.979167 0.225000 +vt 0.750000 0.400000 +vt 1.000000 0.400000 +vt -0.000000 0.000000 +vt 0.562500 0.800000 +vt 0.562500 1.000000 +vt 0.854167 1.000000 +vn 0.0000 1.0000 -0.0000 +vn 0.0000 0.0000 -1.0000 +vn 0.0000 -0.7071 -0.7071 +vn -1.0000 0.0000 0.0000 +vn 1.0000 -0.0000 0.0000 +vn 0.0000 -1.0000 0.0000 +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.7071 -0.0000 0.7071 +vn 0.0000 -0.9397 -0.3420 +vn -0.9487 -0.2972 -0.1082 +vn 0.9487 -0.2972 -0.1082 +vn 0.9701 0.2279 0.0830 +vn -0.9701 0.2279 0.0830 +vn -0.0000 -0.3420 0.9397 +vn 0.0000 0.3420 -0.9397 +s off +f 60/71/19 61/72/19 57/73/19 +f 57/73/19 42/74/19 55/75/19 +f 40/76/20 41/77/20 39/78/20 +f 43/79/21 39/78/21 44/80/21 +f 40/76/22 55/81/22 42/74/22 +f 57/82/23 39/78/23 41/77/23 +f 54/83/24 44/84/24 53/85/24 +f 54/86/24 48/87/24 46/88/24 +f 46/89/24 43/90/24 54/83/24 +f 51/91/24 49/92/24 52/93/24 +f 49/94/24 48/87/24 52/95/24 +f 45/96/24 53/97/24 44/98/24 +f 50/99/24 51/91/24 47/100/24 +f 51/101/24 45/96/24 47/102/24 +f 45/96/25 57/103/25 58/104/25 +f 45/96/23 61/105/23 47/102/23 +f 50/99/26 60/106/26 49/92/26 +f 49/92/27 59/107/27 48/87/27 +f 46/88/28 55/108/28 43/90/28 +f 48/87/22 56/109/22 46/88/22 +f 47/110/29 62/111/29 50/99/29 +f 64/112/30 65/113/30 63/114/30 +f 64/112/31 70/115/31 66/116/31 +f 63/114/32 69/117/32 67/118/32 +f 72/119/33 75/120/33 76/121/33 +f 74/122/34 75/123/34 73/124/34 +f 75/125/35 68/126/35 64/112/35 +f 67/118/35 75/127/35 63/114/35 +f 64/112/35 63/114/35 75/128/35 +f 76/129/36 69/117/36 65/113/36 +f 70/115/36 76/121/36 66/116/36 +f 65/113/36 66/116/36 76/130/36 +f 57/73/19 55/75/19 56/131/19 +f 56/131/19 59/132/19 60/71/19 +f 60/71/19 62/133/19 61/72/19 +f 61/72/19 58/134/19 57/73/19 +f 57/73/19 56/131/19 60/71/19 +f 57/73/19 41/77/19 42/74/19 +f 40/76/20 42/74/20 41/77/20 +f 43/79/21 40/76/21 39/78/21 +f 40/76/22 43/135/22 55/81/22 +f 57/82/23 44/136/23 39/78/23 +f 54/83/24 43/90/24 44/84/24 +f 54/86/24 52/95/24 48/87/24 +f 51/91/24 50/99/24 49/92/24 +f 51/101/24 53/97/24 45/96/24 +f 45/96/25 44/84/25 57/103/25 +f 45/96/23 58/104/23 61/105/23 +f 50/99/26 62/111/26 60/106/26 +f 49/92/27 60/106/27 59/107/27 +f 46/88/28 56/109/28 55/108/28 +f 48/87/22 59/107/22 56/109/22 +f 47/110/29 61/137/29 62/111/29 +f 64/112/30 66/116/30 65/113/30 +f 64/112/31 68/126/31 70/115/31 +f 63/114/32 65/113/32 69/117/32 +f 72/119/33 71/138/33 75/120/33 +f 74/122/34 76/129/34 75/123/34 +f 75/125/35 71/139/35 68/126/35 +f 67/118/35 73/140/35 75/127/35 +f 76/129/36 74/122/36 69/117/36 +f 70/115/36 72/119/36 76/121/36 o Lamps v 4.199997 -9.250000 -2.625000 v 2.099997 -9.250000 -2.625000 @@ -19,10 +399,10 @@ vt 0.535712 0.499897 vt 0.401809 0.500103 vn 0.0000 0.3162 -0.9487 s off -f 4/1/1 1/2/1 3/3/1 -f 7/4/1 6/5/1 5/6/1 -f 4/1/1 2/7/1 1/2/1 -f 7/4/1 8/8/1 6/5/1 +f 80/141/37 77/142/37 79/143/37 +f 83/144/37 82/145/37 81/146/37 +f 80/141/37 78/147/37 77/142/37 +f 83/144/37 84/148/37 82/145/37 o Chest v 4.199999 12.299999 2.100000 v -4.200001 12.299999 2.100000 @@ -271,131 +651,131 @@ vn 0.8321 0.0000 -0.5547 vn 0.0000 -0.4472 -0.8944 vn 0.0000 0.7071 -0.7071 s off -f 11/9/2 10/10/2 9/11/2 -f 14/12/3 15/13/3 16/14/3 -f 20/15/4 10/16/4 12/17/4 -f 19/18/3 12/17/3 11/9/3 -f 9/19/5 19/18/5 11/9/5 -f 10/16/6 17/20/6 9/21/6 -f 21/22/2 20/23/2 19/24/2 -f 24/25/2 17/26/2 18/27/2 -f 25/28/2 19/18/2 17/29/2 -f 19/18/2 26/30/2 21/31/2 -f 17/26/2 23/32/2 25/33/2 -f 20/34/2 27/35/2 18/36/2 -f 18/36/2 27/35/2 24/37/2 -f 22/38/2 28/39/2 20/23/2 -f 26/30/7 29/40/7 21/22/7 -f 30/41/8 28/42/8 22/38/8 -f 36/43/4 27/35/4 28/42/4 -f 31/44/9 25/45/9 23/32/9 -f 29/40/3 22/38/3 21/22/3 -f 33/46/5 26/30/5 25/28/5 -f 35/47/10 24/25/10 27/35/10 -f 32/48/6 23/32/6 24/25/6 -f 39/49/11 37/50/11 38/51/11 -f 37/50/12 30/41/12 29/40/12 -f 38/52/13 34/53/13 33/46/13 -f 39/54/14 31/44/14 32/48/14 -f 40/55/15 35/47/15 36/43/15 -f 35/47/16 39/56/16 32/48/16 -f 36/43/17 30/41/17 40/57/17 -f 34/53/18 37/58/18 29/40/18 -f 33/59/19 31/44/19 38/60/19 -f 42/61/20 43/62/20 41/63/20 -f 43/62/21 45/64/21 41/63/21 -f 41/63/11 45/65/11 42/66/11 -f 43/62/22 44/67/22 47/68/22 -f 46/69/23 43/62/23 47/68/23 -f 48/70/3 16/14/3 15/13/3 -f 52/71/6 51/72/6 53/73/6 -f 53/73/6 55/74/6 52/71/6 -f 14/75/11 50/76/11 13/77/11 -f 49/78/24 53/73/24 16/14/24 -f 48/79/2 54/80/2 49/81/2 -f 16/14/5 51/72/5 14/12/5 -f 13/82/4 52/71/4 15/83/4 -f 15/83/25 55/84/25 48/85/25 -f 62/86/11 60/87/11 61/88/11 -f 58/89/3 63/90/3 59/91/3 -f 57/92/6 61/88/6 56/93/6 -f 62/86/15 75/94/15 63/90/15 -f 71/95/25 65/96/25 67/97/25 -f 68/98/24 66/99/24 64/100/24 -f 75/94/4 69/101/4 71/95/4 -f 72/102/5 70/103/5 68/98/5 -f 62/86/6 57/104/6 73/105/6 -f 69/101/6 57/106/6 65/107/6 -f 59/108/3 63/90/3 75/94/3 -f 71/95/3 59/109/3 75/94/3 -f 60/87/13 72/102/13 61/88/13 -f 60/87/3 58/110/3 74/111/3 -f 70/103/3 58/112/3 66/113/3 -f 56/114/6 61/88/6 72/102/6 -f 68/98/6 56/115/6 72/102/6 -f 82/116/6 80/117/6 81/118/6 -f 78/119/11 83/120/11 79/121/11 -f 77/122/2 81/118/2 76/123/2 -f 79/124/4 82/116/4 77/125/4 -f 76/126/5 80/117/5 78/127/5 -f 86/128/26 88/129/26 84/130/26 -f 85/131/27 89/132/27 87/133/27 -f 89/134/28 86/135/28 87/136/28 -f 87/136/29 84/137/29 85/138/29 -f 11/9/2 12/17/2 10/10/2 -f 14/12/3 13/139/3 15/13/3 -f 20/15/4 18/140/4 10/16/4 -f 19/18/3 20/15/3 12/17/3 -f 9/19/5 17/29/5 19/18/5 -f 10/16/6 18/140/6 17/20/6 -f 21/22/2 22/38/2 20/23/2 -f 24/25/2 23/32/2 17/26/2 -f 25/28/2 26/30/2 19/18/2 -f 20/34/2 28/42/2 27/35/2 -f 26/30/7 34/53/7 29/40/7 -f 30/41/8 36/43/8 28/42/8 -f 36/43/4 35/47/4 27/35/4 -f 31/44/9 33/59/9 25/45/9 -f 29/40/3 30/41/3 22/38/3 -f 33/46/5 34/53/5 26/30/5 -f 35/47/10 32/48/10 24/25/10 -f 32/48/6 31/44/6 23/32/6 -f 39/49/11 40/57/11 37/50/11 -f 37/50/12 40/57/12 30/41/12 -f 38/52/13 37/58/13 34/53/13 -f 39/54/14 38/60/14 31/44/14 -f 40/55/15 39/56/15 35/47/15 -f 42/61/20 44/67/20 43/62/20 -f 43/62/21 46/69/21 45/64/21 -f 48/70/3 49/141/3 16/14/3 -f 52/71/6 50/76/6 51/72/6 -f 53/73/6 54/80/6 55/74/6 -f 14/75/11 51/72/11 50/76/11 -f 49/78/24 54/142/24 53/73/24 -f 48/79/2 55/74/2 54/80/2 -f 16/14/5 53/73/5 51/72/5 -f 13/82/4 50/76/4 52/71/4 -f 15/83/25 52/71/25 55/84/25 -f 62/86/11 63/90/11 60/87/11 -f 58/89/3 60/87/3 63/90/3 -f 57/92/6 62/86/6 61/88/6 -f 62/86/15 73/105/15 75/94/15 -f 71/95/25 69/101/25 65/96/25 -f 68/98/24 70/103/24 66/99/24 -f 75/94/4 73/105/4 69/101/4 -f 72/102/5 74/111/5 70/103/5 -f 69/101/6 73/105/6 57/106/6 -f 71/95/3 67/143/3 59/109/3 -f 60/87/13 74/111/13 72/102/13 -f 70/103/3 74/111/3 58/112/3 -f 68/98/6 64/144/6 56/115/6 -f 82/116/6 83/120/6 80/117/6 -f 78/119/11 80/117/11 83/120/11 -f 77/122/2 82/116/2 81/118/2 -f 79/124/4 83/120/4 82/116/4 -f 76/126/5 81/118/5 80/117/5 -f 89/134/28 88/145/28 86/135/28 -f 87/136/29 86/135/29 84/137/29 +f 87/149/38 86/150/38 85/151/38 +f 90/152/39 91/153/39 92/154/39 +f 96/155/40 86/156/40 88/157/40 +f 95/158/39 88/157/39 87/149/39 +f 85/159/41 95/158/41 87/149/41 +f 86/156/42 93/160/42 85/161/42 +f 97/162/38 96/163/38 95/164/38 +f 100/165/38 93/166/38 94/167/38 +f 101/168/38 95/158/38 93/169/38 +f 95/158/38 102/170/38 97/171/38 +f 93/166/38 99/172/38 101/173/38 +f 96/174/38 103/175/38 94/176/38 +f 94/176/38 103/175/38 100/177/38 +f 98/178/38 104/179/38 96/163/38 +f 102/170/43 105/180/43 97/162/43 +f 106/181/44 104/182/44 98/178/44 +f 112/183/40 103/175/40 104/182/40 +f 107/184/45 101/185/45 99/172/45 +f 105/180/39 98/178/39 97/162/39 +f 109/186/41 102/170/41 101/168/41 +f 111/187/46 100/165/46 103/175/46 +f 108/188/42 99/172/42 100/165/42 +f 115/189/47 113/190/47 114/191/47 +f 113/190/48 106/181/48 105/180/48 +f 114/192/49 110/193/49 109/186/49 +f 115/194/50 107/184/50 108/188/50 +f 116/195/51 111/187/51 112/183/51 +f 111/187/52 115/196/52 108/188/52 +f 112/183/53 106/181/53 116/197/53 +f 110/193/54 113/198/54 105/180/54 +f 109/199/55 107/184/55 114/200/55 +f 118/201/56 119/202/56 117/203/56 +f 119/202/57 121/204/57 117/203/57 +f 117/203/47 121/205/47 118/206/47 +f 119/202/58 120/207/58 123/208/58 +f 122/209/59 119/202/59 123/208/59 +f 124/210/39 92/154/39 91/153/39 +f 128/211/42 127/212/42 129/213/42 +f 129/213/42 131/214/42 128/211/42 +f 90/215/47 126/216/47 89/217/47 +f 125/218/60 129/213/60 92/154/60 +f 124/219/38 130/220/38 125/221/38 +f 92/154/41 127/212/41 90/152/41 +f 89/222/40 128/211/40 91/223/40 +f 91/223/61 131/224/61 124/225/61 +f 138/226/47 136/227/47 137/228/47 +f 134/229/39 139/230/39 135/231/39 +f 133/232/42 137/228/42 132/233/42 +f 138/226/51 151/234/51 139/230/51 +f 147/235/61 141/236/61 143/237/61 +f 144/238/60 142/239/60 140/240/60 +f 151/234/40 145/241/40 147/235/40 +f 148/242/41 146/243/41 144/238/41 +f 138/226/42 133/244/42 149/245/42 +f 145/241/42 133/246/42 141/247/42 +f 135/248/39 139/230/39 151/234/39 +f 147/235/39 135/249/39 151/234/39 +f 136/227/49 148/242/49 137/228/49 +f 136/227/39 134/250/39 150/251/39 +f 146/243/39 134/252/39 142/253/39 +f 132/254/42 137/228/42 148/242/42 +f 144/238/42 132/255/42 148/242/42 +f 158/256/42 156/257/42 157/258/42 +f 154/259/47 159/260/47 155/261/47 +f 153/262/38 157/258/38 152/263/38 +f 155/264/40 158/256/40 153/265/40 +f 152/266/41 156/257/41 154/267/41 +f 162/268/62 164/269/62 160/270/62 +f 161/271/63 165/272/63 163/273/63 +f 165/274/64 162/275/64 163/276/64 +f 163/276/65 160/277/65 161/278/65 +f 87/149/38 88/157/38 86/150/38 +f 90/152/39 89/279/39 91/153/39 +f 96/155/40 94/280/40 86/156/40 +f 95/158/39 96/155/39 88/157/39 +f 85/159/41 93/169/41 95/158/41 +f 86/156/42 94/280/42 93/160/42 +f 97/162/38 98/178/38 96/163/38 +f 100/165/38 99/172/38 93/166/38 +f 101/168/38 102/170/38 95/158/38 +f 96/174/38 104/182/38 103/175/38 +f 102/170/43 110/193/43 105/180/43 +f 106/181/44 112/183/44 104/182/44 +f 112/183/40 111/187/40 103/175/40 +f 107/184/45 109/199/45 101/185/45 +f 105/180/39 106/181/39 98/178/39 +f 109/186/41 110/193/41 102/170/41 +f 111/187/46 108/188/46 100/165/46 +f 108/188/42 107/184/42 99/172/42 +f 115/189/47 116/197/47 113/190/47 +f 113/190/48 116/197/48 106/181/48 +f 114/192/49 113/198/49 110/193/49 +f 115/194/50 114/200/50 107/184/50 +f 116/195/51 115/196/51 111/187/51 +f 118/201/56 120/207/56 119/202/56 +f 119/202/57 122/209/57 121/204/57 +f 124/210/39 125/281/39 92/154/39 +f 128/211/42 126/216/42 127/212/42 +f 129/213/42 130/220/42 131/214/42 +f 90/215/47 127/212/47 126/216/47 +f 125/218/60 130/282/60 129/213/60 +f 124/219/38 131/214/38 130/220/38 +f 92/154/41 129/213/41 127/212/41 +f 89/222/40 126/216/40 128/211/40 +f 91/223/61 128/211/61 131/224/61 +f 138/226/47 139/230/47 136/227/47 +f 134/229/39 136/227/39 139/230/39 +f 133/232/42 138/226/42 137/228/42 +f 138/226/51 149/245/51 151/234/51 +f 147/235/61 145/241/61 141/236/61 +f 144/238/60 146/243/60 142/239/60 +f 151/234/40 149/245/40 145/241/40 +f 148/242/41 150/251/41 146/243/41 +f 145/241/42 149/245/42 133/246/42 +f 147/235/39 143/283/39 135/249/39 +f 136/227/49 150/251/49 148/242/49 +f 146/243/39 150/251/39 134/252/39 +f 144/238/42 140/284/42 132/255/42 +f 158/256/42 159/260/42 156/257/42 +f 154/259/47 156/257/47 159/260/47 +f 153/262/38 158/256/38 157/258/38 +f 155/264/40 159/260/40 158/256/40 +f 152/266/41 157/258/41 156/257/41 +f 165/274/64 164/285/64 162/275/64 +f 163/276/65 162/275/65 160/277/65 o LeftArm v 3.899999 12.299999 2.100000 v 3.899999 12.299999 -2.100000 @@ -763,246 +1143,246 @@ vn 0.5000 -0.8660 0.0000 vn 0.8660 0.5000 0.0000 vn -0.8660 -0.5000 0.0000 s off -f 197/146/30 199/147/30 93/148/30 -f 197/149/31 90/150/31 196/151/31 -f 198/152/32 194/153/32 92/154/32 -f 90/155/33 92/156/33 91/157/33 -f 199/147/34 92/158/34 93/159/34 -f 91/157/35 194/153/35 195/160/35 -f 96/161/33 98/162/33 94/163/33 -f 95/164/33 101/165/33 97/166/33 -f 97/167/33 102/168/33 96/169/33 -f 104/170/33 95/171/33 94/172/33 -f 100/173/33 95/174/33 105/175/33 -f 94/176/33 98/177/33 104/170/33 -f 96/178/33 102/179/33 99/180/33 -f 97/181/33 101/182/33 103/183/33 -f 103/183/36 110/184/36 102/168/36 -f 101/182/37 111/185/37 103/183/37 -f 98/177/38 112/186/38 104/170/38 -f 99/180/39 106/187/39 98/162/39 -f 112/186/40 105/188/40 104/170/40 -f 102/179/41 107/189/41 99/180/41 -f 105/175/42 108/190/42 100/173/42 -f 100/173/43 109/191/43 101/165/43 -f 114/192/44 117/193/44 115/194/44 -f 107/189/45 114/192/45 106/187/45 -f 117/195/46 110/184/46 111/185/46 -f 110/196/47 116/197/47 107/189/47 -f 108/190/48 117/198/48 109/191/48 -f 111/185/49 109/199/49 117/200/49 -f 112/186/50 115/201/50 113/202/50 -f 113/203/51 115/204/51 108/190/51 -f 112/186/52 106/205/52 114/206/52 -f 122/207/44 120/208/44 118/209/44 -f 125/210/44 119/211/44 121/212/44 -f 126/213/44 121/214/44 120/215/44 -f 119/216/44 128/217/44 118/218/44 -f 124/219/44 129/220/44 119/221/44 -f 118/222/44 128/217/44 122/223/44 -f 120/224/44 123/225/44 126/226/44 -f 121/227/44 127/228/44 125/229/44 -f 132/230/43 149/231/43 133/232/43 -f 142/233/39 151/234/39 150/235/39 -f 144/236/36 153/237/36 145/238/36 -f 144/236/41 150/235/41 152/239/41 -f 145/238/44 137/240/44 139/241/44 -f 144/236/44 134/242/44 142/233/44 -f 138/243/44 145/238/44 139/241/44 -f 143/244/44 140/245/44 131/246/44 -f 125/210/43 136/247/43 124/219/43 -f 127/228/37 137/240/37 125/229/37 -f 122/207/39 134/242/39 123/225/39 -f 135/248/44 142/233/44 134/242/44 -f 124/219/42 141/249/42 129/220/42 -f 129/250/40 140/245/40 128/217/40 -f 126/213/36 139/241/36 127/228/36 -f 128/217/38 135/251/38 122/223/38 -f 141/249/44 133/232/44 130/252/44 -f 123/225/41 138/253/41 126/226/41 -f 141/254/44 131/246/44 140/245/44 -f 137/255/44 133/232/44 136/247/44 -f 130/256/40 147/257/40 131/246/40 -f 145/238/37 148/258/37 132/230/37 -f 131/246/38 151/234/38 143/244/38 -f 133/232/42 146/259/42 130/252/42 -f 155/260/33 150/235/33 151/234/33 -f 152/239/33 154/261/33 158/262/33 -f 152/239/33 159/263/33 153/237/33 -f 153/237/33 157/264/33 148/258/33 -f 157/265/33 149/231/33 148/258/33 -f 149/231/33 161/266/33 146/259/33 -f 161/267/33 147/257/33 146/268/33 -f 160/269/33 151/234/33 147/257/33 -f 156/270/42 169/271/42 161/266/42 -f 158/272/36 167/273/36 159/263/36 -f 154/261/39 163/274/39 162/275/39 -f 159/263/37 165/276/37 157/264/37 -f 155/277/38 168/278/38 163/279/38 -f 161/267/40 168/278/40 160/269/40 -f 157/265/43 164/280/43 156/270/43 -f 154/261/41 166/281/41 158/262/41 -f 175/282/44 162/275/44 163/274/44 -f 162/275/44 176/283/44 166/281/44 -f 166/284/44 177/285/44 167/273/44 -f 165/276/44 177/285/44 172/286/44 -f 172/286/44 164/280/44 165/287/44 -f 173/288/44 169/271/44 164/280/44 -f 170/289/44 168/278/44 169/290/44 -f 168/278/44 175/282/44 163/279/44 -f 171/291/38 183/292/38 175/282/38 -f 174/293/41 184/294/41 176/283/41 -f 173/288/42 178/295/42 170/296/42 -f 170/289/40 179/297/40 171/291/40 -f 176/283/36 185/298/36 177/285/36 -f 177/285/37 180/299/37 172/286/37 -f 175/282/39 182/300/39 174/293/39 -f 172/286/43 181/301/43 173/288/43 -f 187/302/33 182/300/33 183/292/33 -f 184/294/33 186/303/33 190/304/33 -f 184/294/33 191/305/33 185/298/33 -f 185/298/33 189/306/33 180/299/33 -f 189/307/33 181/301/33 180/299/33 -f 181/301/33 193/308/33 178/295/33 -f 193/309/33 179/297/33 178/310/33 -f 192/311/33 183/292/33 179/297/33 -f 186/303/41 198/152/41 190/304/41 -f 188/312/42 201/313/42 193/308/42 -f 190/314/36 199/147/36 191/305/36 -f 187/302/39 194/153/39 186/303/39 -f 191/305/37 197/146/37 189/306/37 -f 192/311/38 195/315/38 187/316/38 -f 193/309/40 200/317/40 192/311/40 -f 189/307/43 196/151/43 188/312/43 -f 91/318/53 201/319/53 90/320/53 -f 201/313/54 196/151/54 90/321/54 -f 200/317/55 91/322/55 195/315/55 -f 118/209/39 96/161/39 94/163/39 -f 96/169/36 121/214/36 97/167/36 -f 97/166/43 119/211/43 95/164/43 -f 119/216/40 94/172/40 95/171/40 -f 208/323/36 206/324/36 207/325/36 -f 204/326/39 209/327/39 205/328/39 -f 203/329/43 207/325/43 202/330/43 -f 205/331/44 208/323/44 203/332/44 -f 202/333/33 206/324/33 204/334/33 -f 216/335/56 214/336/56 215/337/56 -f 210/338/57 214/336/57 212/339/57 -f 213/340/39 214/336/39 217/341/39 -f 211/342/43 215/337/43 210/338/43 -f 213/340/58 216/343/58 211/344/58 -f 197/149/31 93/345/31 90/150/31 -f 90/155/33 93/346/33 92/156/33 -f 199/147/34 198/347/34 92/158/34 -f 91/157/35 92/156/35 194/153/35 -f 96/161/33 99/180/33 98/162/33 -f 95/164/33 100/173/33 101/165/33 -f 97/167/33 103/183/33 102/168/33 -f 104/170/33 105/188/33 95/171/33 -f 103/183/36 111/185/36 110/184/36 -f 101/182/37 109/199/37 111/185/37 -f 98/177/38 106/205/38 112/186/38 -f 99/180/39 107/189/39 106/187/39 -f 112/186/40 113/202/40 105/188/40 -f 102/179/41 110/196/41 107/189/41 -f 105/175/42 113/203/42 108/190/42 -f 100/173/43 108/190/43 109/191/43 -f 114/192/44 116/348/44 117/193/44 -f 107/189/45 116/348/45 114/192/45 -f 117/195/46 116/349/46 110/184/46 -f 108/190/48 115/350/48 117/198/48 -f 112/186/50 114/351/50 115/201/50 -f 122/207/44 123/225/44 120/208/44 -f 125/210/44 124/219/44 119/211/44 -f 126/213/44 127/228/44 121/214/44 -f 119/216/44 129/250/44 128/217/44 -f 132/230/43 148/258/43 149/231/43 -f 142/233/39 143/244/39 151/234/39 -f 144/236/36 152/239/36 153/237/36 -f 144/236/41 142/233/41 150/235/41 -f 145/238/44 132/230/44 137/240/44 -f 144/236/44 138/253/44 134/242/44 -f 138/243/44 144/236/44 145/238/44 -f 143/244/44 135/251/44 140/245/44 -f 125/210/43 137/255/43 136/247/43 -f 127/228/37 139/241/37 137/240/37 -f 122/207/39 135/248/39 134/242/39 -f 135/248/44 143/244/44 142/233/44 -f 124/219/42 136/247/42 141/249/42 -f 129/250/40 141/254/40 140/245/40 -f 126/213/36 138/243/36 139/241/36 -f 128/217/38 140/245/38 135/251/38 -f 141/249/44 136/247/44 133/232/44 -f 123/225/41 134/242/41 138/253/41 -f 141/254/44 130/256/44 131/246/44 -f 137/255/44 132/230/44 133/232/44 -f 130/256/40 146/268/40 147/257/40 -f 145/238/37 153/237/37 148/258/37 -f 131/246/38 147/257/38 151/234/38 -f 133/232/42 149/231/42 146/259/42 -f 155/260/33 154/261/33 150/235/33 -f 152/239/33 150/235/33 154/261/33 -f 152/239/33 158/272/33 159/263/33 -f 153/237/33 159/263/33 157/264/33 -f 157/265/33 156/270/33 149/231/33 -f 149/231/33 156/270/33 161/266/33 -f 161/267/33 160/269/33 147/257/33 -f 160/269/33 155/277/33 151/234/33 -f 156/270/42 164/280/42 169/271/42 -f 158/272/36 166/284/36 167/273/36 -f 154/261/39 155/260/39 163/274/39 -f 159/263/37 167/273/37 165/276/37 -f 155/277/38 160/269/38 168/278/38 -f 161/267/40 169/290/40 168/278/40 -f 157/265/43 165/287/43 164/280/43 -f 154/261/41 162/275/41 166/281/41 -f 175/282/44 174/293/44 162/275/44 -f 162/275/44 174/293/44 176/283/44 -f 166/284/44 176/283/44 177/285/44 -f 165/276/44 167/273/44 177/285/44 -f 172/286/44 173/288/44 164/280/44 -f 173/288/44 170/296/44 169/271/44 -f 170/289/44 171/291/44 168/278/44 -f 168/278/44 171/291/44 175/282/44 -f 171/291/38 179/297/38 183/292/38 -f 174/293/41 182/300/41 184/294/41 -f 173/288/42 181/301/42 178/295/42 -f 170/289/40 178/310/40 179/297/40 -f 176/283/36 184/294/36 185/298/36 -f 177/285/37 185/298/37 180/299/37 -f 175/282/39 183/292/39 182/300/39 -f 172/286/43 180/299/43 181/301/43 -f 187/302/33 186/303/33 182/300/33 -f 184/294/33 182/300/33 186/303/33 -f 184/294/33 190/314/33 191/305/33 -f 185/298/33 191/305/33 189/306/33 -f 189/307/33 188/312/33 181/301/33 -f 181/301/33 188/312/33 193/308/33 -f 193/309/33 192/311/33 179/297/33 -f 192/311/33 187/316/33 183/292/33 -f 186/303/41 194/153/41 198/152/41 -f 188/312/42 196/151/42 201/313/42 -f 190/314/36 198/347/36 199/147/36 -f 187/302/39 195/160/39 194/153/39 -f 191/305/37 199/147/37 197/146/37 -f 192/311/38 200/317/38 195/315/38 -f 193/309/40 201/319/40 200/317/40 -f 189/307/43 197/149/43 196/151/43 -f 91/318/53 200/317/53 201/319/53 -f 118/209/39 120/208/39 96/161/39 -f 96/169/36 120/215/36 121/214/36 -f 97/166/43 121/212/43 119/211/43 -f 119/216/40 118/218/40 94/172/40 -f 208/323/36 209/327/36 206/324/36 -f 204/326/39 206/324/39 209/327/39 -f 203/329/43 208/323/43 207/325/43 -f 205/331/44 209/327/44 208/323/44 -f 202/333/33 207/325/33 206/324/33 -f 216/335/56 217/352/56 214/336/56 -f 210/338/57 215/337/57 214/336/57 -f 213/340/39 212/339/39 214/336/39 -f 211/342/43 216/353/43 215/337/43 -f 213/340/58 217/341/58 216/343/58 +f 273/286/66 275/287/66 169/288/66 +f 273/289/67 166/290/67 272/291/67 +f 274/292/68 270/293/68 168/294/68 +f 166/295/69 168/296/69 167/297/69 +f 275/287/70 168/298/70 169/299/70 +f 167/297/71 270/293/71 271/300/71 +f 172/301/69 174/302/69 170/303/69 +f 171/304/69 177/305/69 173/306/69 +f 173/307/69 178/308/69 172/309/69 +f 180/310/69 171/311/69 170/312/69 +f 176/313/69 171/314/69 181/315/69 +f 170/316/69 174/317/69 180/310/69 +f 172/318/69 178/319/69 175/320/69 +f 173/321/69 177/322/69 179/323/69 +f 179/323/72 186/324/72 178/308/72 +f 177/322/73 187/325/73 179/323/73 +f 174/317/74 188/326/74 180/310/74 +f 175/320/75 182/327/75 174/302/75 +f 188/326/76 181/328/76 180/310/76 +f 178/319/77 183/329/77 175/320/77 +f 181/315/78 184/330/78 176/313/78 +f 176/313/79 185/331/79 177/305/79 +f 190/332/80 193/333/80 191/334/80 +f 183/329/81 190/332/81 182/327/81 +f 193/335/82 186/324/82 187/325/82 +f 186/336/83 192/337/83 183/329/83 +f 184/330/84 193/338/84 185/331/84 +f 187/325/85 185/339/85 193/340/85 +f 188/326/86 191/341/86 189/342/86 +f 189/343/87 191/344/87 184/330/87 +f 188/326/88 182/345/88 190/346/88 +f 198/347/80 196/348/80 194/349/80 +f 201/350/80 195/351/80 197/352/80 +f 202/353/80 197/354/80 196/355/80 +f 195/356/80 204/357/80 194/358/80 +f 200/359/80 205/360/80 195/361/80 +f 194/362/80 204/357/80 198/363/80 +f 196/364/80 199/365/80 202/366/80 +f 197/367/80 203/368/80 201/369/80 +f 208/370/79 225/371/79 209/372/79 +f 218/373/75 227/374/75 226/375/75 +f 220/376/72 229/377/72 221/378/72 +f 220/376/77 226/375/77 228/379/77 +f 221/378/80 213/380/80 215/381/80 +f 220/376/80 210/382/80 218/373/80 +f 214/383/80 221/378/80 215/381/80 +f 219/384/80 216/385/80 207/386/80 +f 201/350/79 212/387/79 200/359/79 +f 203/368/73 213/380/73 201/369/73 +f 198/347/75 210/382/75 199/365/75 +f 211/388/80 218/373/80 210/382/80 +f 200/359/78 217/389/78 205/360/78 +f 205/390/76 216/385/76 204/357/76 +f 202/353/72 215/381/72 203/368/72 +f 204/357/74 211/391/74 198/363/74 +f 217/389/80 209/372/80 206/392/80 +f 199/365/77 214/393/77 202/366/77 +f 217/394/80 207/386/80 216/385/80 +f 213/395/80 209/372/80 212/387/80 +f 206/396/76 223/397/76 207/386/76 +f 221/378/73 224/398/73 208/370/73 +f 207/386/74 227/374/74 219/384/74 +f 209/372/78 222/399/78 206/392/78 +f 231/400/69 226/375/69 227/374/69 +f 228/379/69 230/401/69 234/402/69 +f 228/379/69 235/403/69 229/377/69 +f 229/377/69 233/404/69 224/398/69 +f 233/405/69 225/371/69 224/398/69 +f 225/371/69 237/406/69 222/399/69 +f 237/407/69 223/397/69 222/408/69 +f 236/409/69 227/374/69 223/397/69 +f 232/410/78 245/411/78 237/406/78 +f 234/412/72 243/413/72 235/403/72 +f 230/401/75 239/414/75 238/415/75 +f 235/403/73 241/416/73 233/404/73 +f 231/417/74 244/418/74 239/419/74 +f 237/407/76 244/418/76 236/409/76 +f 233/405/79 240/420/79 232/410/79 +f 230/401/77 242/421/77 234/402/77 +f 251/422/80 238/415/80 239/414/80 +f 238/415/80 252/423/80 242/421/80 +f 242/424/80 253/425/80 243/413/80 +f 241/416/80 253/425/80 248/426/80 +f 248/426/80 240/420/80 241/427/80 +f 249/428/80 245/411/80 240/420/80 +f 246/429/80 244/418/80 245/430/80 +f 244/418/80 251/422/80 239/419/80 +f 247/431/74 259/432/74 251/422/74 +f 250/433/77 260/434/77 252/423/77 +f 249/428/78 254/435/78 246/436/78 +f 246/429/76 255/437/76 247/431/76 +f 252/423/72 261/438/72 253/425/72 +f 253/425/73 256/439/73 248/426/73 +f 251/422/75 258/440/75 250/433/75 +f 248/426/79 257/441/79 249/428/79 +f 263/442/69 258/440/69 259/432/69 +f 260/434/69 262/443/69 266/444/69 +f 260/434/69 267/445/69 261/438/69 +f 261/438/69 265/446/69 256/439/69 +f 265/447/69 257/441/69 256/439/69 +f 257/441/69 269/448/69 254/435/69 +f 269/449/69 255/437/69 254/450/69 +f 268/451/69 259/432/69 255/437/69 +f 262/443/77 274/292/77 266/444/77 +f 264/452/78 277/453/78 269/448/78 +f 266/454/72 275/287/72 267/445/72 +f 263/442/75 270/293/75 262/443/75 +f 267/445/73 273/286/73 265/446/73 +f 268/451/74 271/455/74 263/456/74 +f 269/449/76 276/457/76 268/451/76 +f 265/447/79 272/291/79 264/452/79 +f 167/458/89 277/459/89 166/460/89 +f 277/453/90 272/291/90 166/461/90 +f 276/457/91 167/462/91 271/455/91 +f 194/349/75 172/301/75 170/303/75 +f 172/309/72 197/354/72 173/307/72 +f 173/306/79 195/351/79 171/304/79 +f 195/356/76 170/312/76 171/311/76 +f 284/463/72 282/464/72 283/465/72 +f 280/466/75 285/467/75 281/468/75 +f 279/469/79 283/465/79 278/470/79 +f 281/471/80 284/463/80 279/472/80 +f 278/473/69 282/464/69 280/474/69 +f 292/475/92 290/476/92 291/477/92 +f 286/478/93 290/476/93 288/479/93 +f 289/480/75 290/476/75 293/481/75 +f 287/482/79 291/477/79 286/478/79 +f 289/480/94 292/483/94 287/484/94 +f 273/289/67 169/485/67 166/290/67 +f 166/295/69 169/486/69 168/296/69 +f 275/287/70 274/487/70 168/298/70 +f 167/297/71 168/296/71 270/293/71 +f 172/301/69 175/320/69 174/302/69 +f 171/304/69 176/313/69 177/305/69 +f 173/307/69 179/323/69 178/308/69 +f 180/310/69 181/328/69 171/311/69 +f 179/323/72 187/325/72 186/324/72 +f 177/322/73 185/339/73 187/325/73 +f 174/317/74 182/345/74 188/326/74 +f 175/320/75 183/329/75 182/327/75 +f 188/326/76 189/342/76 181/328/76 +f 178/319/77 186/336/77 183/329/77 +f 181/315/78 189/343/78 184/330/78 +f 176/313/79 184/330/79 185/331/79 +f 190/332/80 192/488/80 193/333/80 +f 183/329/81 192/488/81 190/332/81 +f 193/335/82 192/489/82 186/324/82 +f 184/330/84 191/490/84 193/338/84 +f 188/326/86 190/491/86 191/341/86 +f 198/347/80 199/365/80 196/348/80 +f 201/350/80 200/359/80 195/351/80 +f 202/353/80 203/368/80 197/354/80 +f 195/356/80 205/390/80 204/357/80 +f 208/370/79 224/398/79 225/371/79 +f 218/373/75 219/384/75 227/374/75 +f 220/376/72 228/379/72 229/377/72 +f 220/376/77 218/373/77 226/375/77 +f 221/378/80 208/370/80 213/380/80 +f 220/376/80 214/393/80 210/382/80 +f 214/383/80 220/376/80 221/378/80 +f 219/384/80 211/391/80 216/385/80 +f 201/350/79 213/395/79 212/387/79 +f 203/368/73 215/381/73 213/380/73 +f 198/347/75 211/388/75 210/382/75 +f 211/388/80 219/384/80 218/373/80 +f 200/359/78 212/387/78 217/389/78 +f 205/390/76 217/394/76 216/385/76 +f 202/353/72 214/383/72 215/381/72 +f 204/357/74 216/385/74 211/391/74 +f 217/389/80 212/387/80 209/372/80 +f 199/365/77 210/382/77 214/393/77 +f 217/394/80 206/396/80 207/386/80 +f 213/395/80 208/370/80 209/372/80 +f 206/396/76 222/408/76 223/397/76 +f 221/378/73 229/377/73 224/398/73 +f 207/386/74 223/397/74 227/374/74 +f 209/372/78 225/371/78 222/399/78 +f 231/400/69 230/401/69 226/375/69 +f 228/379/69 226/375/69 230/401/69 +f 228/379/69 234/412/69 235/403/69 +f 229/377/69 235/403/69 233/404/69 +f 233/405/69 232/410/69 225/371/69 +f 225/371/69 232/410/69 237/406/69 +f 237/407/69 236/409/69 223/397/69 +f 236/409/69 231/417/69 227/374/69 +f 232/410/78 240/420/78 245/411/78 +f 234/412/72 242/424/72 243/413/72 +f 230/401/75 231/400/75 239/414/75 +f 235/403/73 243/413/73 241/416/73 +f 231/417/74 236/409/74 244/418/74 +f 237/407/76 245/430/76 244/418/76 +f 233/405/79 241/427/79 240/420/79 +f 230/401/77 238/415/77 242/421/77 +f 251/422/80 250/433/80 238/415/80 +f 238/415/80 250/433/80 252/423/80 +f 242/424/80 252/423/80 253/425/80 +f 241/416/80 243/413/80 253/425/80 +f 248/426/80 249/428/80 240/420/80 +f 249/428/80 246/436/80 245/411/80 +f 246/429/80 247/431/80 244/418/80 +f 244/418/80 247/431/80 251/422/80 +f 247/431/74 255/437/74 259/432/74 +f 250/433/77 258/440/77 260/434/77 +f 249/428/78 257/441/78 254/435/78 +f 246/429/76 254/450/76 255/437/76 +f 252/423/72 260/434/72 261/438/72 +f 253/425/73 261/438/73 256/439/73 +f 251/422/75 259/432/75 258/440/75 +f 248/426/79 256/439/79 257/441/79 +f 263/442/69 262/443/69 258/440/69 +f 260/434/69 258/440/69 262/443/69 +f 260/434/69 266/454/69 267/445/69 +f 261/438/69 267/445/69 265/446/69 +f 265/447/69 264/452/69 257/441/69 +f 257/441/69 264/452/69 269/448/69 +f 269/449/69 268/451/69 255/437/69 +f 268/451/69 263/456/69 259/432/69 +f 262/443/77 270/293/77 274/292/77 +f 264/452/78 272/291/78 277/453/78 +f 266/454/72 274/487/72 275/287/72 +f 263/442/75 271/300/75 270/293/75 +f 267/445/73 275/287/73 273/286/73 +f 268/451/74 276/457/74 271/455/74 +f 269/449/76 277/459/76 276/457/76 +f 265/447/79 273/289/79 272/291/79 +f 167/458/89 276/457/89 277/459/89 +f 194/349/75 196/348/75 172/301/75 +f 172/309/72 196/355/72 197/354/72 +f 173/306/79 197/352/79 195/351/79 +f 195/356/76 194/358/76 170/312/76 +f 284/463/72 285/467/72 282/464/72 +f 280/466/75 282/464/75 285/467/75 +f 279/469/79 284/463/79 283/465/79 +f 281/471/80 285/467/80 284/463/80 +f 278/473/69 283/465/69 282/464/69 +f 292/475/92 293/492/92 290/476/92 +f 286/478/93 291/477/93 290/476/93 +f 289/480/75 288/479/75 290/476/75 +f 287/482/79 292/493/79 291/477/79 +f 289/480/94 293/481/94 292/483/94 o RightArm v -3.900001 12.299999 2.100000 v -3.900001 12.299999 -2.100000 @@ -1370,246 +1750,246 @@ vn -0.5000 -0.8660 0.0000 vn -0.8660 0.5000 0.0000 vn 0.8660 -0.5000 0.0000 s off -f 325/354/59 221/355/59 327/356/59 -f 218/357/60 325/358/60 324/359/60 -f 326/360/61 220/361/61 322/362/61 -f 220/363/62 218/364/62 219/365/62 -f 220/366/63 327/356/63 221/367/63 -f 322/362/64 219/365/64 323/368/64 -f 226/369/62 224/370/62 222/371/62 -f 229/372/62 223/373/62 225/374/62 -f 230/375/62 225/376/62 224/377/62 -f 223/378/62 232/379/62 222/380/62 -f 228/381/62 233/382/62 223/383/62 -f 222/384/62 232/379/62 226/385/62 -f 224/386/62 227/387/62 230/388/62 -f 225/389/62 231/390/62 229/391/62 -f 238/392/65 231/390/65 230/375/65 -f 239/393/66 229/391/66 231/390/66 -f 240/394/67 226/385/67 232/379/67 -f 234/395/68 227/387/68 226/369/68 -f 233/396/69 240/394/69 232/379/69 -f 235/397/70 230/388/70 227/387/70 -f 236/398/71 233/382/71 228/381/71 -f 237/399/72 228/381/72 229/372/72 -f 245/400/73 242/401/73 243/402/73 -f 242/401/74 235/397/74 234/395/74 -f 238/392/75 245/403/75 239/393/75 -f 238/404/76 235/397/76 244/405/76 -f 245/406/77 236/398/77 237/399/77 -f 239/393/78 245/407/78 237/408/78 -f 243/409/79 240/394/79 241/410/79 -f 241/411/80 236/398/80 243/412/80 -f 240/394/81 242/413/81 234/414/81 -f 248/415/73 250/416/73 246/417/73 -f 247/418/73 253/419/73 249/420/73 -f 249/421/73 254/422/73 248/423/73 -f 256/424/73 247/425/73 246/426/73 -f 252/427/73 247/428/73 257/429/73 -f 246/430/73 250/431/73 256/424/73 -f 248/432/73 254/433/73 251/434/73 -f 249/435/73 253/436/73 255/437/73 -f 261/438/72 276/439/72 260/440/72 -f 278/441/68 271/442/68 270/443/68 -f 281/444/65 272/445/65 273/446/65 -f 280/447/70 270/443/70 272/445/70 -f 273/446/73 265/448/73 260/440/73 -f 272/445/73 262/449/73 266/450/73 -f 273/446/73 266/451/73 267/452/73 -f 268/453/73 271/442/73 259/454/73 -f 264/455/72 253/419/72 252/427/72 -f 265/448/66 255/437/66 253/436/66 -f 262/449/68 250/416/68 251/434/68 -f 270/443/73 263/456/73 262/449/73 -f 269/457/71 252/427/71 257/429/71 -f 268/453/69 257/458/69 256/424/69 -f 267/452/65 254/422/65 255/437/65 -f 263/459/67 256/424/67 250/431/67 -f 261/438/73 269/457/73 258/460/73 -f 266/450/70 251/434/70 254/433/70 -f 259/454/73 269/461/73 268/453/73 -f 261/438/73 265/462/73 264/455/73 -f 275/463/69 258/464/69 259/454/69 -f 260/440/66 281/444/66 273/446/66 -f 279/465/67 259/454/67 271/442/67 -f 274/466/71 261/438/71 258/460/71 -f 278/441/62 283/467/62 279/465/62 -f 280/447/62 282/468/62 278/441/62 -f 287/469/62 280/447/62 281/444/62 -f 281/444/62 285/470/62 287/469/62 -f 277/471/62 285/472/62 276/439/62 -f 289/473/62 277/471/62 274/466/62 -f 275/463/62 289/474/62 274/475/62 -f 279/465/62 288/476/62 275/463/62 -f 289/473/71 292/477/71 284/478/71 -f 295/479/65 286/480/65 287/469/65 -f 290/481/68 283/467/68 282/468/68 -f 293/482/66 287/469/66 285/470/66 -f 291/483/67 288/476/67 283/484/67 -f 296/485/69 289/474/69 288/476/69 -f 284/478/72 293/486/72 285/472/72 -f 294/487/70 282/468/70 286/488/70 -f 290/481/73 303/489/73 291/490/73 -f 290/481/73 304/491/73 302/492/73 -f 305/493/73 294/494/73 295/479/73 -f 293/482/73 305/493/73 295/479/73 -f 292/477/73 300/495/73 293/486/73 -f 297/496/73 301/497/73 292/477/73 -f 296/485/73 298/498/73 297/499/73 -f 303/489/73 296/485/73 291/483/73 -f 311/500/67 299/501/67 303/489/67 -f 312/502/70 302/492/70 304/491/70 -f 306/503/71 301/497/71 298/504/71 -f 307/505/69 298/498/69 299/501/69 -f 313/506/65 304/491/65 305/493/65 -f 308/507/66 305/493/66 300/495/66 -f 310/508/68 303/489/68 302/492/68 -f 309/509/72 300/495/72 301/497/72 -f 310/508/62 315/510/62 311/500/62 -f 312/502/62 314/511/62 310/508/62 -f 319/512/62 312/502/62 313/506/62 -f 313/506/62 317/513/62 319/512/62 -f 309/509/62 317/514/62 308/507/62 -f 321/515/62 309/509/62 306/503/62 -f 307/505/62 321/516/62 306/517/62 -f 311/500/62 320/518/62 307/505/62 -f 326/360/70 314/511/70 318/519/70 -f 329/520/71 316/521/71 321/515/71 -f 327/356/65 318/522/65 319/512/65 -f 314/511/68 323/368/68 315/510/68 -f 325/354/66 319/512/66 317/513/66 -f 323/523/67 320/518/67 315/524/67 -f 328/525/69 321/516/69 320/518/69 -f 324/359/72 317/514/72 316/521/72 -f 329/526/82 219/527/82 218/528/82 -f 329/520/83 218/529/83 324/359/83 -f 328/525/84 323/523/84 219/530/84 -f 224/370/68 246/417/68 222/371/68 -f 249/421/65 224/377/65 225/376/65 -f 223/373/72 249/420/72 225/374/72 -f 222/380/69 247/425/69 223/378/69 -f 334/531/65 336/532/65 335/533/65 -f 337/534/68 332/535/68 333/536/68 -f 335/533/72 331/537/72 330/538/72 -f 336/532/73 333/539/73 331/540/73 -f 334/531/62 330/541/62 332/542/62 -f 342/543/85 344/544/85 343/545/85 -f 342/543/86 338/546/86 340/547/86 -f 341/548/68 342/543/68 340/547/68 -f 343/545/72 339/549/72 338/546/72 -f 344/550/87 341/548/87 339/551/87 -f 218/357/60 221/552/60 325/358/60 -f 220/363/62 221/553/62 218/364/62 -f 220/366/63 326/554/63 327/356/63 -f 322/362/64 220/363/64 219/365/64 -f 226/369/62 227/387/62 224/370/62 -f 229/372/62 228/381/62 223/373/62 -f 230/375/62 231/390/62 225/376/62 -f 223/378/62 233/396/62 232/379/62 -f 238/392/65 239/393/65 231/390/65 -f 239/393/66 237/408/66 229/391/66 -f 240/394/67 234/414/67 226/385/67 -f 234/395/68 235/397/68 227/387/68 -f 233/396/69 241/410/69 240/394/69 -f 235/397/70 238/404/70 230/388/70 -f 236/398/71 241/411/71 233/382/71 -f 237/399/72 236/398/72 228/381/72 -f 245/400/73 244/555/73 242/401/73 -f 242/401/74 244/555/74 235/397/74 -f 238/392/75 244/556/75 245/403/75 -f 245/406/77 243/557/77 236/398/77 -f 243/409/79 242/558/79 240/394/79 -f 248/415/73 251/434/73 250/416/73 -f 247/418/73 252/427/73 253/419/73 -f 249/421/73 255/437/73 254/422/73 -f 256/424/73 257/458/73 247/425/73 -f 261/438/72 277/471/72 276/439/72 -f 278/441/68 279/465/68 271/442/68 -f 281/444/65 280/447/65 272/445/65 -f 280/447/70 278/441/70 270/443/70 -f 273/446/73 267/452/73 265/448/73 -f 272/445/73 270/443/73 262/449/73 -f 273/446/73 272/445/73 266/451/73 -f 268/453/73 263/459/73 271/442/73 -f 264/455/72 265/462/72 253/419/72 -f 265/448/66 267/452/66 255/437/66 -f 262/449/68 263/456/68 250/416/68 -f 270/443/73 271/442/73 263/456/73 -f 269/457/71 264/455/71 252/427/71 -f 268/453/69 269/461/69 257/458/69 -f 267/452/65 266/451/65 254/422/65 -f 263/459/67 268/453/67 256/424/67 -f 261/438/73 264/455/73 269/457/73 -f 266/450/70 262/449/70 251/434/70 -f 259/454/73 258/464/73 269/461/73 -f 261/438/73 260/440/73 265/462/73 -f 275/463/69 274/475/69 258/464/69 -f 260/440/66 276/439/66 281/444/66 -f 279/465/67 275/463/67 259/454/67 -f 274/466/71 277/471/71 261/438/71 -f 278/441/62 282/468/62 283/467/62 -f 280/447/62 286/488/62 282/468/62 -f 287/469/62 286/480/62 280/447/62 -f 281/444/62 276/439/62 285/470/62 -f 277/471/62 284/478/62 285/472/62 -f 289/473/62 284/478/62 277/471/62 -f 275/463/62 288/476/62 289/474/62 -f 279/465/62 283/484/62 288/476/62 -f 289/473/71 297/496/71 292/477/71 -f 295/479/65 294/494/65 286/480/65 -f 290/481/68 291/490/68 283/467/68 -f 293/482/66 295/479/66 287/469/66 -f 291/483/67 296/485/67 288/476/67 -f 296/485/69 297/499/69 289/474/69 -f 284/478/72 292/477/72 293/486/72 -f 294/487/70 290/481/70 282/468/70 -f 290/481/73 302/492/73 303/489/73 -f 290/481/73 294/487/73 304/491/73 -f 305/493/73 304/491/73 294/494/73 -f 293/482/73 300/495/73 305/493/73 -f 292/477/73 301/497/73 300/495/73 -f 297/496/73 298/504/73 301/497/73 -f 296/485/73 299/501/73 298/498/73 -f 303/489/73 299/501/73 296/485/73 -f 311/500/67 307/505/67 299/501/67 -f 312/502/70 310/508/70 302/492/70 -f 306/503/71 309/509/71 301/497/71 -f 307/505/69 306/517/69 298/498/69 -f 313/506/65 312/502/65 304/491/65 -f 308/507/66 313/506/66 305/493/66 -f 310/508/68 311/500/68 303/489/68 -f 309/509/72 308/507/72 300/495/72 -f 310/508/62 314/511/62 315/510/62 -f 312/502/62 318/519/62 314/511/62 -f 319/512/62 318/522/62 312/502/62 -f 313/506/62 308/507/62 317/513/62 -f 309/509/62 316/521/62 317/514/62 -f 321/515/62 316/521/62 309/509/62 -f 307/505/62 320/518/62 321/516/62 -f 311/500/62 315/524/62 320/518/62 -f 326/360/70 322/362/70 314/511/70 -f 329/520/71 324/359/71 316/521/71 -f 327/356/65 326/554/65 318/522/65 -f 314/511/68 322/362/68 323/368/68 -f 325/354/66 327/356/66 319/512/66 -f 323/523/67 328/525/67 320/518/67 -f 328/525/69 329/526/69 321/516/69 -f 324/359/72 325/358/72 317/514/72 -f 329/526/82 328/525/82 219/527/82 -f 224/370/68 248/415/68 246/417/68 -f 249/421/65 248/423/65 224/377/65 -f 223/373/72 247/418/72 249/420/72 -f 222/380/69 246/426/69 247/425/69 -f 334/531/65 337/534/65 336/532/65 -f 337/534/68 334/531/68 332/535/68 -f 335/533/72 336/532/72 331/537/72 -f 336/532/73 337/534/73 333/539/73 -f 334/531/62 335/533/62 330/541/62 -f 342/543/85 345/559/85 344/544/85 -f 342/543/86 343/545/86 338/546/86 -f 341/548/68 345/560/68 342/543/68 -f 343/545/72 344/561/72 339/549/72 -f 344/550/87 345/560/87 341/548/87 +f 401/494/95 297/495/95 403/496/95 +f 294/497/96 401/498/96 400/499/96 +f 402/500/97 296/501/97 398/502/97 +f 296/503/98 294/504/98 295/505/98 +f 296/506/99 403/496/99 297/507/99 +f 398/502/100 295/505/100 399/508/100 +f 302/509/98 300/510/98 298/511/98 +f 305/512/98 299/513/98 301/514/98 +f 306/515/98 301/516/98 300/517/98 +f 299/518/98 308/519/98 298/520/98 +f 304/521/98 309/522/98 299/523/98 +f 298/524/98 308/519/98 302/525/98 +f 300/526/98 303/527/98 306/528/98 +f 301/529/98 307/530/98 305/531/98 +f 314/532/101 307/530/101 306/515/101 +f 315/533/102 305/531/102 307/530/102 +f 316/534/103 302/525/103 308/519/103 +f 310/535/104 303/527/104 302/509/104 +f 309/536/105 316/534/105 308/519/105 +f 311/537/106 306/528/106 303/527/106 +f 312/538/107 309/522/107 304/521/107 +f 313/539/108 304/521/108 305/512/108 +f 321/540/109 318/541/109 319/542/109 +f 318/541/110 311/537/110 310/535/110 +f 314/532/111 321/543/111 315/533/111 +f 314/544/112 311/537/112 320/545/112 +f 321/546/113 312/538/113 313/539/113 +f 315/533/114 321/547/114 313/548/114 +f 319/549/115 316/534/115 317/550/115 +f 317/551/116 312/538/116 319/552/116 +f 316/534/117 318/553/117 310/554/117 +f 324/555/109 326/556/109 322/557/109 +f 323/558/109 329/559/109 325/560/109 +f 325/561/109 330/562/109 324/563/109 +f 332/564/109 323/565/109 322/566/109 +f 328/567/109 323/568/109 333/569/109 +f 322/570/109 326/571/109 332/564/109 +f 324/572/109 330/573/109 327/574/109 +f 325/575/109 329/576/109 331/577/109 +f 337/578/108 352/579/108 336/580/108 +f 354/581/104 347/582/104 346/583/104 +f 357/584/101 348/585/101 349/586/101 +f 356/587/106 346/583/106 348/585/106 +f 349/586/109 341/588/109 336/580/109 +f 348/585/109 338/589/109 342/590/109 +f 349/586/109 342/591/109 343/592/109 +f 344/593/109 347/582/109 335/594/109 +f 340/595/108 329/559/108 328/567/108 +f 341/588/102 331/577/102 329/576/102 +f 338/589/104 326/556/104 327/574/104 +f 346/583/109 339/596/109 338/589/109 +f 345/597/107 328/567/107 333/569/107 +f 344/593/105 333/598/105 332/564/105 +f 343/592/101 330/562/101 331/577/101 +f 339/599/103 332/564/103 326/571/103 +f 337/578/109 345/597/109 334/600/109 +f 342/590/106 327/574/106 330/573/106 +f 335/594/109 345/601/109 344/593/109 +f 337/578/109 341/602/109 340/595/109 +f 351/603/105 334/604/105 335/594/105 +f 336/580/102 357/584/102 349/586/102 +f 355/605/103 335/594/103 347/582/103 +f 350/606/107 337/578/107 334/600/107 +f 354/581/98 359/607/98 355/605/98 +f 356/587/98 358/608/98 354/581/98 +f 363/609/98 356/587/98 357/584/98 +f 357/584/98 361/610/98 363/609/98 +f 353/611/98 361/612/98 352/579/98 +f 365/613/98 353/611/98 350/606/98 +f 351/603/98 365/614/98 350/615/98 +f 355/605/98 364/616/98 351/603/98 +f 365/613/107 368/617/107 360/618/107 +f 371/619/101 362/620/101 363/609/101 +f 366/621/104 359/607/104 358/608/104 +f 369/622/102 363/609/102 361/610/102 +f 367/623/103 364/616/103 359/624/103 +f 372/625/105 365/614/105 364/616/105 +f 360/618/108 369/626/108 361/612/108 +f 370/627/106 358/608/106 362/628/106 +f 366/621/109 379/629/109 367/630/109 +f 366/621/109 380/631/109 378/632/109 +f 381/633/109 370/634/109 371/619/109 +f 369/622/109 381/633/109 371/619/109 +f 368/617/109 376/635/109 369/626/109 +f 373/636/109 377/637/109 368/617/109 +f 372/625/109 374/638/109 373/639/109 +f 379/629/109 372/625/109 367/623/109 +f 387/640/103 375/641/103 379/629/103 +f 388/642/106 378/632/106 380/631/106 +f 382/643/107 377/637/107 374/644/107 +f 383/645/105 374/638/105 375/641/105 +f 389/646/101 380/631/101 381/633/101 +f 384/647/102 381/633/102 376/635/102 +f 386/648/104 379/629/104 378/632/104 +f 385/649/108 376/635/108 377/637/108 +f 386/648/98 391/650/98 387/640/98 +f 388/642/98 390/651/98 386/648/98 +f 395/652/98 388/642/98 389/646/98 +f 389/646/98 393/653/98 395/652/98 +f 385/649/98 393/654/98 384/647/98 +f 397/655/98 385/649/98 382/643/98 +f 383/645/98 397/656/98 382/657/98 +f 387/640/98 396/658/98 383/645/98 +f 402/500/106 390/651/106 394/659/106 +f 405/660/107 392/661/107 397/655/107 +f 403/496/101 394/662/101 395/652/101 +f 390/651/104 399/508/104 391/650/104 +f 401/494/102 395/652/102 393/653/102 +f 399/663/103 396/658/103 391/664/103 +f 404/665/105 397/656/105 396/658/105 +f 400/499/108 393/654/108 392/661/108 +f 405/666/118 295/667/118 294/668/118 +f 405/660/119 294/669/119 400/499/119 +f 404/665/120 399/663/120 295/670/120 +f 300/510/104 322/557/104 298/511/104 +f 325/561/101 300/517/101 301/516/101 +f 299/513/108 325/560/108 301/514/108 +f 298/520/105 323/565/105 299/518/105 +f 410/671/101 412/672/101 411/673/101 +f 413/674/104 408/675/104 409/676/104 +f 411/673/108 407/677/108 406/678/108 +f 412/672/109 409/679/109 407/680/109 +f 410/671/98 406/681/98 408/682/98 +f 418/683/121 420/684/121 419/685/121 +f 418/683/122 414/686/122 416/687/122 +f 417/688/104 418/683/104 416/687/104 +f 419/685/108 415/689/108 414/686/108 +f 420/690/123 417/688/123 415/691/123 +f 294/497/96 297/692/96 401/498/96 +f 296/503/98 297/693/98 294/504/98 +f 296/506/99 402/694/99 403/496/99 +f 398/502/100 296/503/100 295/505/100 +f 302/509/98 303/527/98 300/510/98 +f 305/512/98 304/521/98 299/513/98 +f 306/515/98 307/530/98 301/516/98 +f 299/518/98 309/536/98 308/519/98 +f 314/532/101 315/533/101 307/530/101 +f 315/533/102 313/548/102 305/531/102 +f 316/534/103 310/554/103 302/525/103 +f 310/535/104 311/537/104 303/527/104 +f 309/536/105 317/550/105 316/534/105 +f 311/537/106 314/544/106 306/528/106 +f 312/538/107 317/551/107 309/522/107 +f 313/539/108 312/538/108 304/521/108 +f 321/540/109 320/695/109 318/541/109 +f 318/541/110 320/695/110 311/537/110 +f 314/532/111 320/696/111 321/543/111 +f 321/546/113 319/697/113 312/538/113 +f 319/549/115 318/698/115 316/534/115 +f 324/555/109 327/574/109 326/556/109 +f 323/558/109 328/567/109 329/559/109 +f 325/561/109 331/577/109 330/562/109 +f 332/564/109 333/598/109 323/565/109 +f 337/578/108 353/611/108 352/579/108 +f 354/581/104 355/605/104 347/582/104 +f 357/584/101 356/587/101 348/585/101 +f 356/587/106 354/581/106 346/583/106 +f 349/586/109 343/592/109 341/588/109 +f 348/585/109 346/583/109 338/589/109 +f 349/586/109 348/585/109 342/591/109 +f 344/593/109 339/599/109 347/582/109 +f 340/595/108 341/602/108 329/559/108 +f 341/588/102 343/592/102 331/577/102 +f 338/589/104 339/596/104 326/556/104 +f 346/583/109 347/582/109 339/596/109 +f 345/597/107 340/595/107 328/567/107 +f 344/593/105 345/601/105 333/598/105 +f 343/592/101 342/591/101 330/562/101 +f 339/599/103 344/593/103 332/564/103 +f 337/578/109 340/595/109 345/597/109 +f 342/590/106 338/589/106 327/574/106 +f 335/594/109 334/604/109 345/601/109 +f 337/578/109 336/580/109 341/602/109 +f 351/603/105 350/615/105 334/604/105 +f 336/580/102 352/579/102 357/584/102 +f 355/605/103 351/603/103 335/594/103 +f 350/606/107 353/611/107 337/578/107 +f 354/581/98 358/608/98 359/607/98 +f 356/587/98 362/628/98 358/608/98 +f 363/609/98 362/620/98 356/587/98 +f 357/584/98 352/579/98 361/610/98 +f 353/611/98 360/618/98 361/612/98 +f 365/613/98 360/618/98 353/611/98 +f 351/603/98 364/616/98 365/614/98 +f 355/605/98 359/624/98 364/616/98 +f 365/613/107 373/636/107 368/617/107 +f 371/619/101 370/634/101 362/620/101 +f 366/621/104 367/630/104 359/607/104 +f 369/622/102 371/619/102 363/609/102 +f 367/623/103 372/625/103 364/616/103 +f 372/625/105 373/639/105 365/614/105 +f 360/618/108 368/617/108 369/626/108 +f 370/627/106 366/621/106 358/608/106 +f 366/621/109 378/632/109 379/629/109 +f 366/621/109 370/627/109 380/631/109 +f 381/633/109 380/631/109 370/634/109 +f 369/622/109 376/635/109 381/633/109 +f 368/617/109 377/637/109 376/635/109 +f 373/636/109 374/644/109 377/637/109 +f 372/625/109 375/641/109 374/638/109 +f 379/629/109 375/641/109 372/625/109 +f 387/640/103 383/645/103 375/641/103 +f 388/642/106 386/648/106 378/632/106 +f 382/643/107 385/649/107 377/637/107 +f 383/645/105 382/657/105 374/638/105 +f 389/646/101 388/642/101 380/631/101 +f 384/647/102 389/646/102 381/633/102 +f 386/648/104 387/640/104 379/629/104 +f 385/649/108 384/647/108 376/635/108 +f 386/648/98 390/651/98 391/650/98 +f 388/642/98 394/659/98 390/651/98 +f 395/652/98 394/662/98 388/642/98 +f 389/646/98 384/647/98 393/653/98 +f 385/649/98 392/661/98 393/654/98 +f 397/655/98 392/661/98 385/649/98 +f 383/645/98 396/658/98 397/656/98 +f 387/640/98 391/664/98 396/658/98 +f 402/500/106 398/502/106 390/651/106 +f 405/660/107 400/499/107 392/661/107 +f 403/496/101 402/694/101 394/662/101 +f 390/651/104 398/502/104 399/508/104 +f 401/494/102 403/496/102 395/652/102 +f 399/663/103 404/665/103 396/658/103 +f 404/665/105 405/666/105 397/656/105 +f 400/499/108 401/498/108 393/654/108 +f 405/666/118 404/665/118 295/667/118 +f 300/510/104 324/555/104 322/557/104 +f 325/561/101 324/563/101 300/517/101 +f 299/513/108 323/558/108 325/560/108 +f 298/520/105 322/566/105 323/565/105 +f 410/671/101 413/674/101 412/672/101 +f 413/674/104 410/671/104 408/675/104 +f 411/673/108 412/672/108 407/677/108 +f 412/672/109 413/674/109 409/679/109 +f 410/671/98 411/673/98 406/681/98 +f 418/683/121 421/699/121 420/684/121 +f 418/683/122 419/685/122 414/686/122 +f 417/688/104 421/700/104 418/683/104 +f 419/685/108 420/701/108 415/689/108 +f 420/690/123 421/700/123 417/688/123 o Tail v -2.100001 9.150000 13.650000 v 2.099998 9.150000 13.650000 @@ -1749,69 +2129,65 @@ vn 0.9899 0.0000 -0.1414 vn -0.9899 0.0000 -0.1414 vn -0.9864 0.0000 0.1644 s off -f 348/562/88 352/563/88 349/564/88 -f 355/565/89 353/566/89 354/567/89 -f 357/568/90 351/569/90 350/570/90 -f 356/571/91 353/566/91 351/569/91 -f 357/572/92 352/573/92 355/574/92 -f 346/575/93 353/576/93 348/562/93 -f 347/577/94 351/569/94 346/575/94 -f 349/578/95 350/570/95 347/577/95 -f 349/579/96 360/580/96 348/581/96 -f 346/582/97 359/583/97 347/584/97 -f 349/585/98 359/586/98 361/587/98 -f 346/588/99 360/580/99 358/589/99 -f 371/590/100 363/591/100 372/592/100 -f 361/587/101 364/593/101 360/580/101 -f 376/594/102 362/595/102 373/596/102 -f 365/597/88 366/598/88 364/593/88 -f 365/599/103 363/600/103 367/601/103 -f 364/602/104 366/598/104 362/603/104 -f 367/601/105 368/604/105 366/598/105 -f 369/605/106 370/606/106 368/604/106 -f 358/607/107 363/608/107 359/583/107 -f 374/609/108 376/610/108 375/611/108 -f 359/586/109 363/612/109 361/587/109 -f 369/605/110 363/613/110 371/614/110 -f 372/592/111 375/615/111 373/596/111 -f 371/590/112 373/596/112 370/606/112 -f 368/604/113 370/616/113 362/617/113 -f 367/601/95 363/618/95 369/605/95 -f 366/598/93 368/604/93 362/619/93 -f 376/610/114 363/620/114 362/621/114 -f 373/596/115 375/622/115 376/594/115 -f 374/623/116 372/592/116 377/624/116 -f 358/589/102 360/580/102 362/625/102 -f 372/592/109 363/591/109 377/624/109 -f 361/587/117 363/612/117 365/597/117 -f 362/625/118 360/580/118 364/593/118 -f 373/596/119 362/595/119 370/606/119 -f 348/562/88 353/576/88 352/563/88 -f 355/565/89 352/626/89 353/566/89 -f 357/568/90 356/627/90 351/569/90 -f 356/571/91 354/628/91 353/566/91 -f 357/572/92 350/570/92 352/573/92 -f 346/575/93 351/569/93 353/576/93 -f 347/577/94 350/570/94 351/569/94 -f 349/578/95 352/629/95 350/570/95 -f 349/579/96 361/587/96 360/580/96 -f 346/582/97 358/607/97 359/583/97 -f 349/585/98 347/630/98 359/586/98 -f 346/588/99 348/631/99 360/580/99 -f 361/587/101 365/597/101 364/593/101 -f 365/597/88 367/601/88 366/598/88 -f 367/601/105 369/605/105 368/604/105 -f 369/605/106 371/590/106 370/606/106 -f 358/607/107 362/632/107 363/608/107 -f 374/609/108 377/633/108 376/610/108 -f 372/592/111 374/634/111 375/615/111 -f 371/590/112 372/592/112 373/596/112 -f 376/610/114 377/633/114 363/620/114 +f 424/702/124 428/703/124 425/704/124 +f 431/705/125 429/706/125 430/707/125 +f 433/708/126 427/709/126 426/710/126 +f 432/711/127 429/706/127 427/709/127 +f 433/712/128 428/713/128 431/714/128 +f 422/715/129 429/716/129 424/702/129 +f 423/717/130 427/709/130 422/715/130 +f 425/718/131 426/710/131 423/717/131 +f 425/719/132 436/720/132 424/721/132 +f 422/722/133 435/723/133 423/724/133 +f 425/725/134 435/726/134 437/727/134 +f 422/728/135 436/720/135 434/729/135 +f 447/730/136 439/731/136 448/732/136 +f 437/727/137 440/733/137 436/720/137 +f 452/734/138 438/735/138 449/736/138 +f 441/737/124 442/738/124 440/733/124 +f 441/739/139 439/740/139 443/741/139 +f 440/742/140 442/738/140 438/743/140 +f 443/741/141 444/744/141 442/738/141 +f 445/745/142 446/746/142 444/744/142 +f 434/747/143 439/748/143 435/723/143 +f 450/749/144 452/750/144 451/751/144 +f 435/726/145 439/752/145 437/727/145 +f 445/745/146 439/753/146 447/754/146 +f 448/732/147 451/755/147 449/736/147 +f 447/730/148 449/736/148 446/746/148 +f 444/744/149 446/756/149 438/757/149 +f 443/741/131 439/758/131 445/745/131 +f 442/738/129 444/744/129 438/759/129 +f 452/750/150 439/760/150 438/761/150 +f 449/736/151 451/762/151 452/734/151 +f 450/763/152 448/732/152 453/764/152 +f 434/729/138 436/720/138 438/765/138 +f 448/732/145 439/731/145 453/764/145 +f 437/727/153 439/752/153 441/737/153 +f 438/765/154 436/720/154 440/733/154 +f 449/736/155 438/735/155 446/746/155 +f 424/702/124 429/716/124 428/703/124 +f 431/705/125 428/766/125 429/706/125 +f 433/708/126 432/767/126 427/709/126 +f 432/711/127 430/768/127 429/706/127 +f 433/712/128 426/710/128 428/713/128 +f 422/715/129 427/709/129 429/716/129 +f 423/717/130 426/710/130 427/709/130 +f 425/718/131 428/769/131 426/710/131 +f 425/719/132 437/727/132 436/720/132 +f 422/722/133 434/747/133 435/723/133 +f 425/725/134 423/770/134 435/726/134 +f 422/728/135 424/771/135 436/720/135 +f 437/727/137 441/737/137 440/733/137 +f 441/737/124 443/741/124 442/738/124 +f 443/741/141 445/745/141 444/744/141 +f 445/745/142 447/730/142 446/746/142 +f 434/747/143 438/772/143 439/748/143 +f 450/749/144 453/773/144 452/750/144 +f 448/732/147 450/774/147 451/755/147 +f 447/730/148 448/732/148 449/736/148 +f 452/750/150 453/773/150 439/760/150 o RightLeg -v 0.100000 23.250000 -3.675000 -v -4.100000 23.250000 -3.675000 -v 0.100000 24.299999 -3.675000 -v -4.100000 24.299999 -3.675000 v 0.099999 11.700001 2.100000 v -4.100001 11.700001 2.100000 v 0.099999 11.700001 -2.100000 @@ -1884,51 +2260,16 @@ v 0.100000 21.674999 2.100000 v -4.100000 21.674999 2.100000 v 0.100000 21.674999 -2.100000 v -4.100000 21.674999 -2.100000 -v -4.100000 22.200001 -2.625000 -v 0.100000 22.200001 -2.625000 -v 0.625000 22.200001 -2.100000 -v -4.625000 22.200001 -2.100000 -v 0.625000 22.200001 2.100000 -v -4.625000 22.200001 2.100000 -v -4.100000 22.200001 2.625000 -v 0.100000 22.200001 2.625000 v 0.100000 22.200001 2.100000 v -4.100000 22.200001 2.100000 v 0.100000 22.200001 -2.100000 v -4.100000 22.200001 -2.100000 -v -4.100000 24.299999 -2.625000 -v -4.625000 24.299999 -2.100000 -v 0.100000 24.299999 -2.625000 -v 0.625000 24.299999 -2.100000 -v -4.625000 24.299999 2.100000 -v -4.100000 24.299999 2.625000 -v 0.625000 24.299999 2.100000 -v 0.100000 24.299999 2.625000 -v -1.475000 20.110409 -3.209024 -v -2.525000 20.110409 -3.209024 -v -1.475000 20.469528 -4.195702 -v -2.525000 20.469528 -4.195702 -v -0.425000 23.070438 -2.131661 -v -3.575000 23.070440 -2.131661 -v -0.425000 23.429560 -3.118338 -v -3.575000 23.429560 -3.118338 -v -2.525000 23.070440 -2.131661 -v -2.525000 23.429560 -3.118338 -v -1.475000 23.070440 -2.131661 -v -1.475000 23.429560 -3.118338 -v -2.000000 21.097086 -2.849903 -v -2.000000 21.456205 -3.836581 vt 0.395833 1.000000 vt 0.562500 0.800000 vt 0.562500 1.000000 vt 0.375000 0.150000 vt 0.208333 0.125000 vt 0.375000 0.125000 -vt 0.791667 -0.000000 -vt 0.979167 0.025000 -vt 0.958333 0.250000 -vt 0.791667 0.300000 -vt 0.791667 0.250000 vt 0.770833 0.525000 vt 0.833333 0.425000 vt 0.854167 0.525000 @@ -2011,16 +2352,9 @@ vt 0.208333 0.725000 vt 0.187500 0.725000 vt 0.000000 0.725000 vt 0.020833 0.700000 -vt 0.791667 0.350000 -vt 0.958333 0.300000 -vt 0.958333 0.350000 vt -0.000000 0.700000 vt -0.000000 0.550000 vt 0.750000 0.550000 -vt 0.791667 0.400000 -vt 0.958333 0.400000 -vt 0.750000 0.300000 -vt 1.000000 0.300000 vt 0.583333 0.175000 vt 0.375000 0.175000 vt 0.395833 0.175000 @@ -2044,33 +2378,11 @@ vt 0.562500 0.150000 vt 0.583333 0.150000 vt -0.000000 0.150000 vt 0.750000 0.150000 +vt 0.562500 0.125000 vt 0.395833 0.125000 -vt 0.562500 0.100000 -vt 0.562500 0.125000 -vt 0.208333 0.100000 -vt 0.375000 0.100000 -vt 0.375000 0.125000 -vt 0.395833 0.100000 -vt 0.020833 0.125000 -vt 0.187500 0.100000 -vt 0.187500 0.125000 -vt 0.187500 0.125000 -vt 0.583333 0.100000 -vt 0.583333 0.125000 -vt 0.562500 0.125000 -vt 0.020833 0.100000 -vt -0.000000 0.125000 vt 0.750000 0.125000 -vt 0.750000 0.100000 -vt 0.562500 0.000000 -vt 0.583333 0.000000 -vt 0.750000 0.000000 -vt 0.187500 0.000000 -vt 0.208333 -0.000000 -vt 0.395833 -0.000000 -vt 0.375000 -0.000000 -vt -0.000000 0.100000 -vt 0.020833 0.000000 +vt 0.020833 0.125000 +vt 0.187500 0.125000 vt 0.187500 0.400000 vt 0.020833 0.400000 vt 0.208333 0.400000 @@ -2085,48 +2397,20 @@ vt 0.187500 0.800000 vt 0.020833 0.800000 vt 0.750000 0.800000 vt 0.583333 0.800000 -vt 0.687500 0.950000 -vt 0.729167 0.900000 -vt 0.729167 0.950000 -vt 0.562500 0.900000 -vt 0.687500 0.900000 -vt 0.854167 0.900000 -vt 0.854167 0.950000 -vt 0.562500 0.850000 -vt 0.645833 0.800000 -vt 0.645833 0.850000 -vt 0.854167 0.850000 -vt 0.770833 0.800000 -vt 0.854167 0.800000 -vt 0.645833 1.000000 -vt 0.562500 0.950000 -vt 0.770833 1.000000 -vt 0.708333 1.000000 -vt 0.770833 0.850000 -vt 0.708333 0.850000 -vt 0.770833 0.225000 -vt 0.770833 0.025000 -vt 0.958333 -0.000000 -vt 0.979167 0.225000 vt 0.770833 0.425000 vt 0.750000 0.700000 -vt 0.750000 0.400000 -vt 1.000000 0.400000 vt 0.500000 0.275000 vt 0.000000 0.175000 -vt -0.000000 0.000000 +vt 0.583333 0.125000 vt 0.375000 0.450000 vt 0.583333 0.450000 vt 0.750000 0.400000 vt 0.395833 0.450000 vt 0.562500 0.450000 -vt 0.562500 0.800000 -vt 0.562500 1.000000 -vt 0.854167 1.000000 vn 0.0000 -1.0000 0.0000 vn -1.0000 0.0000 0.0000 -vn 0.0000 1.0000 -0.0000 vn 0.0000 0.0000 -1.0000 +vn 0.0000 1.0000 0.0000 vn -0.9701 0.2425 0.0000 vn 0.9701 0.2425 0.0000 vn 0.9487 -0.3162 0.0000 @@ -2137,223 +2421,149 @@ vn 0.0000 0.0000 1.0000 vn 0.7071 -0.0000 -0.7071 vn 0.7071 -0.0000 0.7071 vn 1.0000 -0.0000 0.0000 -vn 0.0000 -0.7071 -0.7071 vn -0.7071 0.0000 -0.7071 -vn 0.0000 -0.9397 -0.3420 -vn -0.9487 -0.2972 -0.1082 -vn 0.9487 -0.2972 -0.1082 -vn 0.9701 0.2279 0.0830 -vn -0.9701 0.2279 0.0830 -vn -0.0000 -0.3420 0.9397 -vn 0.0000 0.3420 -0.9397 s off -f 383/635/120 384/636/120 382/637/120 -f 453/638/121 463/639/121 465/640/121 -f 471/641/122 472/642/122 468/643/122 -f 468/643/122 381/644/122 466/645/122 -f 396/646/123 394/647/123 395/648/123 -f 388/649/122 397/650/122 389/651/122 -f 387/652/120 395/648/120 386/653/120 -f 389/654/124 396/646/124 387/655/124 -f 386/656/125 394/657/125 388/658/125 -f 390/659/120 409/660/120 399/661/120 -f 391/662/126 407/663/126 393/664/126 -f 393/664/120 406/665/120 392/666/120 -f 392/666/127 404/667/127 390/659/127 -f 398/668/120 405/669/120 391/662/120 -f 401/670/128 412/671/128 403/672/128 -f 399/673/120 411/674/120 401/670/120 -f 402/675/128 414/676/128 400/677/128 -f 400/677/120 413/678/120 398/679/120 -f 417/680/120 402/681/120 403/682/120 -f 415/683/120 402/675/120 416/684/120 -f 403/682/120 412/685/120 417/680/120 -f 398/668/120 413/686/120 408/687/120 -f 399/673/120 409/688/120 410/689/120 -f 418/690/122 420/691/122 423/692/122 -f 419/693/122 422/694/122 421/695/122 -f 420/691/122 419/696/122 421/697/122 -f 427/698/122 418/699/122 423/700/122 -f 425/701/122 422/694/122 419/693/122 -f 428/702/122 425/703/122 424/704/122 -f 424/705/122 427/698/122 428/706/122 -f 426/707/122 425/703/122 429/708/122 -f 432/709/120 435/710/120 433/711/120 -f 431/712/120 430/713/120 434/714/120 -f 431/715/120 433/711/120 430/716/120 -f 432/717/120 438/718/120 435/719/120 -f 434/714/120 436/720/120 431/712/120 -f 436/721/120 440/722/120 439/723/120 -f 439/724/120 440/725/120 438/718/120 -f 437/726/120 441/727/120 436/721/120 -f 427/698/129 440/722/129 428/702/129 -f 428/702/130 441/727/130 429/708/130 -f 421/697/131 434/714/131 430/716/131 -f 379/728/123 380/729/123 378/730/123 -f 429/708/132 437/731/132 426/732/132 -f 421/697/123 433/711/123 420/691/123 -f 426/733/133 434/714/133 422/694/133 -f 423/700/121 438/718/121 427/698/121 -f 454/734/134 378/730/134 455/735/134 -f 379/728/121 466/736/121 381/644/121 -f 420/691/135 435/719/135 423/700/135 -f 468/737/133 378/730/133 380/729/133 -f 409/660/131 444/738/131 410/689/131 -f 408/687/135 445/739/135 442/740/135 -f 407/741/123 442/740/123 443/742/123 -f 412/743/132 449/744/132 417/680/132 -f 416/745/129 447/746/129 415/747/129 -f 446/748/133 412/749/133 411/674/133 -f 417/680/130 448/750/130 416/745/130 -f 445/739/121 414/676/121 447/746/121 -f 443/742/122 453/751/122 452/752/122 -f 447/746/122 453/638/122 445/739/122 -f 445/753/122 453/751/122 442/740/122 -f 448/750/122 450/754/122 451/755/122 -f 448/750/122 451/756/122 447/746/122 -f 444/738/122 443/757/122 452/758/122 -f 449/744/122 446/759/122 450/754/122 -f 444/738/122 450/760/122 446/748/122 -f 465/761/120 455/762/120 464/763/120 -f 465/640/120 459/764/120 457/765/120 -f 457/766/120 454/767/120 465/761/120 -f 462/768/120 460/769/120 463/770/120 -f 460/771/120 459/764/120 463/639/120 -f 456/772/120 464/773/120 455/774/120 -f 461/775/120 462/768/120 458/776/120 -f 462/777/120 456/772/120 458/778/120 -f 456/772/131 468/779/131 469/780/131 -f 456/772/133 472/781/133 458/778/133 -f 464/763/123 453/751/123 465/761/123 -f 461/775/130 471/782/130 460/769/130 -f 460/769/129 470/783/129 459/764/129 -f 457/765/135 466/784/135 454/767/135 -f 459/764/121 467/785/121 457/765/121 -f 458/786/132 473/787/132 461/775/132 -f 452/758/133 462/777/133 450/760/133 -f 451/755/130 462/768/130 463/770/130 -f 402/788/130 425/703/130 403/789/130 -f 424/705/121 402/790/121 400/791/121 -f 401/792/133 425/701/133 419/693/133 -f 390/793/123 393/664/123 392/666/123 -f 391/794/123 390/793/123 419/696/123 -f 432/709/123 384/636/123 385/795/123 -f 439/724/121 385/796/121 383/797/121 -f 436/721/130 383/798/130 382/799/130 -f 431/712/133 382/800/133 384/801/133 -f 475/802/136 476/803/136 474/804/136 -f 475/802/137 481/805/137 477/806/137 -f 474/804/138 480/807/138 478/808/138 -f 483/809/139 486/810/139 487/811/139 -f 485/812/140 486/813/140 484/814/140 -f 486/815/141 479/816/141 475/802/141 -f 478/808/141 486/817/141 474/804/141 -f 475/802/141 474/804/141 486/818/141 -f 487/819/142 480/807/142 476/803/142 -f 481/805/142 487/811/142 477/806/142 -f 476/803/142 477/806/142 487/820/142 -f 383/635/120 385/795/120 384/636/120 -f 453/638/121 451/756/121 463/639/121 -f 468/643/122 466/645/122 467/821/122 -f 467/821/122 470/822/122 471/641/122 -f 471/641/122 473/823/122 472/642/122 -f 472/642/122 469/824/122 468/643/122 -f 468/643/122 467/821/122 471/641/122 -f 468/643/122 380/729/122 381/644/122 -f 396/646/123 397/650/123 394/647/123 -f 388/649/122 394/647/122 397/650/122 -f 387/652/120 396/646/120 395/648/120 -f 389/654/124 397/825/124 396/646/124 -f 386/656/125 395/648/125 394/657/125 -f 390/659/120 404/667/120 409/660/120 -f 391/662/126 405/669/126 407/663/126 -f 393/664/120 407/663/120 406/665/120 -f 392/666/127 406/665/127 404/667/127 -f 398/668/120 408/687/120 405/669/120 -f 401/670/128 411/674/128 412/671/128 -f 399/673/120 410/689/120 411/674/120 -f 402/675/128 415/683/128 414/676/128 -f 400/677/120 414/676/120 413/678/120 -f 417/680/120 416/745/120 402/681/120 -f 420/691/122 418/690/122 419/696/122 -f 427/698/122 424/705/122 418/699/122 -f 425/701/122 426/733/122 422/694/122 -f 428/702/122 429/708/122 425/703/122 -f 431/715/120 432/709/120 433/711/120 -f 432/717/120 439/724/120 438/718/120 -f 434/714/120 437/826/120 436/720/120 -f 436/721/120 441/727/120 440/722/120 -f 427/698/129 438/718/129 440/722/129 -f 428/702/130 440/722/130 441/727/130 -f 421/697/131 422/694/131 434/714/131 -f 379/728/123 381/644/123 380/729/123 -f 429/708/132 441/727/132 437/731/132 -f 421/697/123 430/716/123 433/711/123 -f 426/733/133 437/826/133 434/714/133 -f 423/700/121 435/719/121 438/718/121 -f 454/734/134 379/728/134 378/730/134 -f 379/728/121 454/827/121 466/736/121 -f 420/691/135 433/711/135 435/719/135 -f 468/737/133 455/828/133 378/730/133 -f 409/660/131 443/742/131 444/738/131 -f 408/687/135 413/678/135 445/739/135 -f 407/741/123 405/669/123 408/687/123 -f 443/742/123 409/660/123 406/829/123 -f 409/660/123 404/667/123 406/829/123 -f 407/741/123 408/687/123 442/740/123 -f 443/742/123 406/829/123 407/741/123 -f 412/743/132 446/830/132 449/744/132 -f 416/745/129 448/750/129 447/746/129 -f 411/674/133 410/689/133 444/738/133 -f 444/738/133 446/748/133 411/674/133 -f 417/680/130 449/744/130 448/750/130 -f 413/678/121 414/676/121 445/739/121 -f 414/676/121 415/747/121 447/746/121 -f 443/742/122 442/740/122 453/751/122 -f 447/746/122 451/756/122 453/638/122 -f 448/750/122 449/744/122 450/754/122 -f 444/738/122 452/758/122 450/760/122 -f 465/761/120 454/767/120 455/762/120 -f 465/640/120 463/639/120 459/764/120 -f 462/768/120 461/775/120 460/769/120 -f 462/777/120 464/773/120 456/772/120 -f 456/772/131 455/762/131 468/779/131 -f 456/772/133 469/780/133 472/781/133 -f 464/763/123 452/752/123 453/751/123 -f 461/775/130 473/787/130 471/782/130 -f 460/769/129 471/782/129 470/783/129 -f 457/765/135 467/785/135 466/784/135 -f 459/764/121 470/783/121 467/785/121 -f 458/786/132 472/831/132 473/787/132 -f 452/758/133 464/773/133 462/777/133 -f 451/755/130 450/754/130 462/768/130 -f 402/788/130 424/704/130 425/703/130 -f 400/791/121 398/832/121 418/699/121 -f 418/699/121 424/705/121 400/791/121 -f 419/693/133 399/833/133 401/792/133 -f 401/792/133 403/834/133 425/701/133 -f 390/793/123 391/794/123 393/664/123 -f 418/690/123 398/835/123 391/794/123 -f 390/793/123 399/836/123 419/696/123 -f 418/690/123 391/794/123 419/696/123 -f 432/709/123 431/715/123 384/636/123 -f 439/724/121 432/717/121 385/796/121 -f 436/721/130 439/723/130 383/798/130 -f 431/712/133 436/720/133 382/800/133 -f 475/802/136 477/806/136 476/803/136 -f 475/802/137 479/816/137 481/805/137 -f 474/804/138 476/803/138 480/807/138 -f 483/809/139 482/837/139 486/810/139 -f 485/812/140 487/819/140 486/813/140 -f 486/815/141 482/838/141 479/816/141 -f 478/808/141 484/839/141 486/817/141 -f 487/819/142 485/812/142 480/807/142 -f 481/805/142 483/809/142 487/811/142 +f 455/775/156 456/776/156 454/777/156 +f 525/778/157 527/779/157 529/780/157 +f 468/781/158 466/782/158 467/783/158 +f 460/784/159 469/785/159 461/786/159 +f 459/787/156 467/783/156 458/788/156 +f 461/789/160 468/781/160 459/790/160 +f 458/791/161 466/792/161 460/793/161 +f 462/794/156 481/795/156 471/796/156 +f 463/797/162 479/798/162 465/799/162 +f 465/799/156 478/800/156 464/801/156 +f 464/801/163 476/802/163 462/794/163 +f 470/803/156 477/804/156 463/797/156 +f 473/805/164 484/806/164 475/807/164 +f 471/808/156 483/809/156 473/805/156 +f 474/810/164 486/811/164 472/812/164 +f 472/812/156 485/813/156 470/814/156 +f 489/815/156 474/816/156 475/817/156 +f 487/818/156 474/810/156 488/819/156 +f 475/817/156 484/820/156 489/815/156 +f 470/803/156 485/821/156 480/822/156 +f 471/808/156 481/823/156 482/824/156 +f 490/825/159 492/826/159 495/827/159 +f 491/828/159 494/829/159 493/830/159 +f 492/826/159 491/831/159 493/832/159 +f 499/833/159 490/834/159 495/835/159 +f 497/836/159 494/829/159 491/828/159 +f 500/837/159 497/838/159 496/839/159 +f 496/840/159 499/833/159 500/841/159 +f 498/842/159 497/838/159 501/843/159 +f 504/844/156 507/845/156 505/846/156 +f 503/847/156 502/848/156 506/849/156 +f 503/850/156 505/846/156 502/851/156 +f 504/852/156 510/853/156 507/854/156 +f 506/849/156 508/855/156 503/847/156 +f 508/856/156 512/857/156 511/858/156 +f 511/859/156 512/860/156 510/853/156 +f 509/861/156 513/862/156 508/856/156 +f 499/833/165 512/857/165 500/837/165 +f 500/837/166 513/862/166 501/843/166 +f 493/832/167 506/849/167 502/851/167 +f 501/843/168 509/863/168 498/864/168 +f 493/832/158 505/846/158 492/826/158 +f 498/865/169 506/849/169 494/829/169 +f 495/835/157 510/853/157 499/833/157 +f 492/826/170 507/854/170 495/835/170 +f 481/795/167 516/866/167 482/824/167 +f 480/822/170 517/867/170 514/868/170 +f 479/869/158 514/868/158 515/870/158 +f 484/871/168 521/872/168 489/815/168 +f 488/873/165 519/874/165 487/875/165 +f 518/876/169 484/877/169 483/809/169 +f 489/815/166 520/878/166 488/873/166 +f 517/867/157 486/811/157 519/874/157 +f 515/870/159 525/879/159 524/880/159 +f 519/874/159 525/778/159 517/867/159 +f 517/881/159 525/879/159 514/868/159 +f 520/878/159 522/882/159 523/883/159 +f 520/878/159 523/884/159 519/874/159 +f 516/866/159 515/885/159 524/886/159 +f 521/872/159 518/887/159 522/882/159 +f 516/866/159 522/888/159 518/876/159 +f 528/889/158 525/879/158 529/890/158 +f 524/886/169 526/891/169 522/888/169 +f 523/883/166 526/892/166 527/893/166 +f 474/894/166 497/838/166 475/895/166 +f 496/840/157 474/896/157 472/897/157 +f 473/898/169 497/836/169 491/828/169 +f 462/899/158 465/799/158 464/801/158 +f 463/900/158 462/899/158 491/831/158 +f 504/844/158 456/776/158 457/901/158 +f 511/859/157 457/902/157 455/903/157 +f 508/856/166 455/904/166 454/905/166 +f 503/847/169 454/906/169 456/907/169 +f 455/775/156 457/901/156 456/776/156 +f 525/778/157 523/884/157 527/779/157 +f 468/781/158 469/785/158 466/782/158 +f 460/784/159 466/782/159 469/785/159 +f 459/787/156 468/781/156 467/783/156 +f 461/789/160 469/908/160 468/781/160 +f 458/791/161 467/783/161 466/792/161 +f 462/794/156 476/802/156 481/795/156 +f 463/797/162 477/804/162 479/798/162 +f 465/799/156 479/798/156 478/800/156 +f 464/801/163 478/800/163 476/802/163 +f 470/803/156 480/822/156 477/804/156 +f 473/805/164 483/809/164 484/806/164 +f 471/808/156 482/824/156 483/809/156 +f 474/810/164 487/818/164 486/811/164 +f 472/812/156 486/811/156 485/813/156 +f 489/815/156 488/873/156 474/816/156 +f 492/826/159 490/825/159 491/831/159 +f 499/833/159 496/840/159 490/834/159 +f 497/836/159 498/865/159 494/829/159 +f 500/837/159 501/843/159 497/838/159 +f 503/850/156 504/844/156 505/846/156 +f 504/852/156 511/859/156 510/853/156 +f 506/849/156 509/909/156 508/855/156 +f 508/856/156 513/862/156 512/857/156 +f 499/833/165 510/853/165 512/857/165 +f 500/837/166 512/857/166 513/862/166 +f 493/832/167 494/829/167 506/849/167 +f 501/843/168 513/862/168 509/863/168 +f 493/832/158 502/851/158 505/846/158 +f 498/865/169 509/909/169 506/849/169 +f 495/835/157 507/854/157 510/853/157 +f 492/826/170 505/846/170 507/854/170 +f 481/795/167 515/870/167 516/866/167 +f 480/822/170 485/813/170 517/867/170 +f 479/869/158 477/804/158 480/822/158 +f 515/870/158 481/795/158 478/910/158 +f 481/795/158 476/802/158 478/910/158 +f 479/869/158 480/822/158 514/868/158 +f 515/870/158 478/910/158 479/869/158 +f 484/871/168 518/911/168 521/872/168 +f 488/873/165 520/878/165 519/874/165 +f 483/809/169 482/824/169 516/866/169 +f 516/866/169 518/876/169 483/809/169 +f 489/815/166 521/872/166 520/878/166 +f 485/813/157 486/811/157 517/867/157 +f 486/811/157 487/875/157 519/874/157 +f 515/870/159 514/868/159 525/879/159 +f 519/874/159 523/884/159 525/778/159 +f 520/878/159 521/872/159 522/882/159 +f 516/866/159 524/886/159 522/888/159 +f 528/889/158 524/880/158 525/879/158 +f 524/886/169 528/912/169 526/891/169 +f 523/883/166 522/882/166 526/892/166 +f 474/894/166 496/839/166 497/838/166 +f 472/897/157 470/913/157 490/834/157 +f 490/834/157 496/840/157 472/897/157 +f 491/828/169 471/914/169 473/898/169 +f 473/898/169 475/915/169 497/836/169 +f 462/899/158 463/900/158 465/799/158 +f 490/825/158 470/916/158 463/900/158 +f 462/899/158 471/917/158 491/831/158 +f 490/825/158 463/900/158 491/831/158 +f 504/844/158 503/850/158 456/776/158 +f 511/859/157 504/852/157 457/902/157 +f 508/856/166 511/858/166 455/904/166 +f 503/847/169 508/855/169 454/906/169 o LeftLeg -v -0.100000 23.250000 -3.675000 -v 4.100000 23.250000 -3.675000 -v -0.100000 24.299999 -3.675000 -v 4.100000 24.299999 -3.675000 v -0.100001 11.700001 2.100000 v 4.099999 11.700001 2.100000 v -0.100001 11.700001 -2.100000 @@ -2426,52 +2636,16 @@ v -0.100000 21.674999 2.100000 v 4.100000 21.674999 2.100000 v -0.100000 21.674999 -2.100000 v 4.100000 21.674999 -2.100000 -v 4.100000 22.199999 -2.625000 -v -0.100000 22.200001 -2.625000 -v -0.625000 22.200001 -2.100000 -v 4.625000 22.199999 -2.100000 -v -0.625000 22.200001 2.100000 -v 4.625000 22.199999 2.100000 -v 4.100000 22.199999 2.625000 -v -0.100000 22.200001 2.625000 v -0.100000 22.200001 2.100000 v 4.100000 22.199999 2.100000 v -0.100000 22.200001 -2.100000 v 4.100000 22.199999 -2.100000 -v 4.100000 24.299999 -2.625000 -v 4.625000 24.299999 -2.100000 -v -0.100000 24.299999 -2.625000 -v -0.625000 24.299999 -2.100000 -v 4.625000 24.299999 2.100000 -v 4.100000 24.299999 2.625000 -v -0.625000 24.299999 2.100000 -v -0.100000 24.299999 2.625000 -v 1.475000 20.110407 -3.209024 -v 2.525000 20.110407 -3.209024 -v 1.475000 20.469528 -4.195702 -v 2.525000 20.469528 -4.195702 -v 0.425000 23.070438 -2.131661 -v 3.575000 23.070438 -2.131661 -v 0.425000 23.429560 -3.118338 -v 3.575000 23.429560 -3.118338 -v 2.525000 23.070438 -2.131661 -v 2.525000 23.429560 -3.118338 -v 1.475000 23.070438 -2.131661 -v 1.475000 23.429560 -3.118338 -v 2.000000 21.097084 -2.849903 -v 2.000000 21.456205 -3.836581 vt 0.562500 0.800000 vt 0.395833 1.000000 vt 0.562500 1.000000 vt 0.208333 0.125000 vt 0.375000 0.150000 vt 0.375000 0.125000 -vt 0.979167 0.025000 -vt 0.791667 -0.000000 -vt 0.770833 0.225000 -vt 0.791667 0.300000 -vt 0.958333 0.250000 -vt 0.791667 0.250000 vt 0.833333 0.425000 vt 0.770833 0.525000 vt 0.854167 0.525000 @@ -2554,15 +2728,8 @@ vt 0.208333 0.725000 vt 0.187500 0.725000 vt 0.000000 0.725000 vt 0.020833 0.700000 -vt 0.958333 0.300000 -vt 0.791667 0.350000 -vt 0.958333 0.350000 vt -0.000000 0.550000 vt 0.750000 0.550000 -vt 0.791667 0.400000 -vt 0.958333 0.400000 -vt 0.750000 0.300000 -vt 1.000000 0.300000 vt 0.583333 0.175000 vt 0.395833 0.175000 vt 0.500000 0.275000 @@ -2585,32 +2752,11 @@ vt 0.583333 0.150000 vt 0.562500 0.150000 vt -0.000000 0.150000 vt 0.750000 0.150000 -vt 0.562500 0.100000 -vt 0.395833 0.125000 vt 0.562500 0.125000 -vt 0.208333 0.100000 -vt 0.375000 0.100000 -vt 0.375000 0.125000 -vt 0.395833 0.100000 -vt 0.187500 0.100000 +vt 0.395833 0.125000 +vt 0.750000 0.125000 vt 0.020833 0.125000 vt 0.187500 0.125000 -vt 0.187500 0.125000 -vt 0.583333 0.100000 -vt 0.562500 0.125000 -vt 0.583333 0.125000 -vt 0.020833 0.100000 -vt -0.000000 0.125000 -vt 0.750000 0.125000 -vt 0.750000 0.100000 -vt 0.583333 0.000000 -vt 0.750000 0.000000 -vt 0.187500 0.000000 -vt 0.208333 -0.000000 -vt 0.395833 -0.000000 -vt 0.375000 -0.000000 -vt 0.020833 0.000000 -vt -0.000000 0.100000 vt 0.187500 0.400000 vt 0.020833 0.400000 vt 0.375000 0.450000 @@ -2626,49 +2772,21 @@ vt 0.187500 0.800000 vt 0.020833 0.800000 vt 0.750000 0.800000 vt 0.583333 0.800000 -vt 0.729167 0.900000 -vt 0.687500 0.950000 -vt 0.729167 0.950000 -vt 0.562500 0.900000 -vt 0.687500 0.900000 -vt 0.854167 0.950000 -vt 0.645833 0.850000 -vt 0.562500 0.800000 -vt 0.562500 0.850000 -vt 0.854167 0.850000 -vt 0.770833 0.800000 -vt 0.770833 0.850000 -vt 0.562500 0.950000 -vt 0.645833 1.000000 -vt 0.770833 1.000000 -vt 0.708333 1.000000 -vt 0.854167 0.900000 -vt 0.708333 0.850000 -vt 0.979167 0.225000 -vt 0.958333 -0.000000 -vt 0.770833 0.025000 vt 0.770833 0.425000 vt 0.750000 0.700000 vt -0.000000 0.700000 -vt 0.750000 0.400000 -vt 1.000000 0.400000 vt 0.458333 0.275000 vt 0.000000 0.175000 vt 0.750000 0.300000 -vt 0.562500 0.000000 -vt -0.000000 0.000000 +vt 0.583333 0.125000 vt 0.208333 0.400000 vt 0.583333 0.450000 vt 0.395833 0.450000 vt 0.562500 0.450000 -vt 0.645833 0.800000 -vt 0.854167 0.800000 -vt 0.562500 1.000000 -vt 0.854167 1.000000 vn 0.0000 -1.0000 0.0000 vn 1.0000 0.0000 0.0000 -vn 0.0000 1.0000 -0.0000 vn 0.0000 0.0000 -1.0000 +vn 0.0000 1.0000 0.0000 vn 0.9701 0.2425 0.0000 vn -0.9701 0.2425 0.0000 vn -0.9487 -0.3162 0.0000 @@ -2679,218 +2797,148 @@ vn 0.0000 0.0000 1.0000 vn -0.7071 0.0000 -0.7071 vn -0.7071 0.0000 0.7071 vn -1.0000 0.0000 0.0000 -vn -0.0000 -0.7071 -0.7071 vn 0.7071 0.0000 -0.7071 -vn 0.0000 -0.9397 -0.3420 -vn 0.9487 -0.2972 -0.1082 -vn -0.9487 -0.2972 -0.1082 -vn -0.9701 0.2279 0.0830 -vn 0.9701 0.2279 0.0830 -vn 0.0000 -0.3420 0.9397 -vn -0.0000 0.3420 -0.9397 s off -f 494/840/143 493/841/143 492/842/143 -f 573/843/144 563/844/144 575/845/144 -f 582/846/145 581/847/145 577/848/145 -f 491/849/145 578/850/145 576/851/145 -f 504/852/146 506/853/146 505/854/146 -f 507/855/145 498/856/145 499/857/145 -f 505/854/143 497/858/143 496/859/143 -f 506/853/147 499/860/147 497/861/147 -f 504/862/148 496/863/148 498/864/148 -f 519/865/143 500/866/143 509/867/143 -f 517/868/149 501/869/149 503/870/149 -f 516/871/143 503/870/143 502/872/143 -f 514/873/150 502/872/150 500/866/150 -f 515/874/143 508/875/143 501/869/143 -f 522/876/151 511/877/151 513/878/151 -f 521/879/143 509/880/143 511/877/143 -f 524/881/151 512/882/151 510/883/151 -f 523/884/143 510/883/143 508/885/143 -f 512/886/143 527/887/143 513/888/143 -f 525/889/143 526/890/143 512/882/143 -f 513/888/143 527/887/143 522/891/143 -f 508/875/143 518/892/143 523/893/143 -f 509/880/143 520/894/143 519/895/143 -f 528/896/145 533/897/145 530/898/145 -f 529/899/145 531/900/145 532/901/145 -f 529/902/145 530/898/145 531/903/145 -f 528/904/145 537/905/145 533/906/145 -f 532/901/145 535/907/145 529/899/145 -f 535/908/145 538/909/145 534/910/145 -f 534/911/145 538/912/145 537/905/145 -f 536/913/145 539/914/145 535/908/145 -f 542/915/143 543/916/143 545/917/143 -f 541/918/143 544/919/143 540/920/143 -f 543/916/143 541/921/143 540/922/143 -f 548/923/143 542/924/143 545/925/143 -f 546/926/143 544/919/143 541/918/143 -f 550/927/143 546/928/143 549/929/143 -f 549/930/143 548/923/143 550/931/143 -f 547/932/143 546/928/143 551/933/143 -f 550/927/152 537/905/152 538/909/152 -f 551/933/153 538/909/153 539/914/153 -f 540/922/154 532/901/154 531/903/154 -f 490/934/146 489/935/146 488/936/146 -f 536/937/155 551/933/155 539/914/155 -f 543/916/146 531/903/146 530/898/146 -f 544/919/156 536/938/156 532/901/156 -f 548/923/144 533/906/144 537/905/144 -f 488/936/157 564/939/157 565/940/157 -f 576/941/144 489/935/144 491/849/144 -f 545/925/158 530/898/158 533/906/158 -f 488/936/156 578/942/156 490/934/156 -f 554/943/154 519/865/154 520/894/154 -f 552/944/158 523/884/158 518/892/158 -f 516/945/146 553/946/146 552/944/146 -f 559/947/155 522/948/155 527/887/155 -f 525/949/152 558/950/152 526/951/152 -f 521/879/156 556/952/156 554/943/156 -f 526/951/153 559/947/153 527/887/153 -f 557/953/144 524/881/144 555/954/144 -f 563/955/145 553/946/145 562/956/145 -f 563/844/145 557/953/145 555/954/145 -f 555/957/145 552/944/145 563/955/145 -f 560/958/145 558/950/145 561/959/145 -f 558/950/145 557/953/145 561/960/145 -f 554/943/145 562/961/145 553/962/145 -f 559/947/145 560/958/145 556/963/145 -f 560/964/145 554/943/145 556/952/145 -f 565/965/143 575/966/143 574/967/143 -f 569/968/143 575/845/143 567/969/143 -f 567/970/143 575/966/143 564/971/143 -f 570/972/143 572/973/143 573/974/143 -f 570/975/143 573/843/143 569/968/143 -f 566/976/143 565/977/143 574/978/143 -f 571/979/143 568/980/143 572/973/143 -f 566/976/143 572/981/143 568/982/143 -f 579/983/154 565/965/154 566/976/154 -f 582/984/156 566/976/156 568/982/156 -f 563/955/146 574/967/146 575/966/146 -f 581/985/153 571/979/153 570/972/153 -f 580/986/152 570/972/152 569/968/152 -f 576/987/158 567/969/158 564/971/158 -f 577/988/144 569/968/144 567/969/144 -f 583/989/155 568/990/155 571/979/155 -f 572/981/156 562/961/156 560/964/156 -f 572/973/153 561/959/153 573/974/153 -f 535/908/153 512/991/153 513/992/153 -f 528/904/144 508/993/144 510/994/144 -f 535/907/156 513/995/156 511/996/156 -f 503/870/146 500/997/146 502/872/146 -f 500/997/146 501/998/146 528/896/146 -f 494/840/146 542/915/146 495/999/146 -f 495/1000/144 549/930/144 493/1001/144 -f 493/1002/153 546/928/153 492/1003/153 -f 492/1004/156 541/918/156 494/1005/156 -f 586/1006/159 585/1007/159 584/1008/159 -f 591/1009/160 585/1007/160 587/1010/160 -f 588/1011/161 586/1006/161 584/1008/161 -f 597/1012/162 592/1013/162 593/1014/162 -f 595/1015/163 596/1016/163 597/1017/163 -f 589/1018/164 596/1019/164 585/1007/164 -f 596/1020/164 588/1011/164 584/1008/164 -f 585/1007/164 596/1021/164 584/1008/164 -f 590/1022/165 597/1017/165 586/1006/165 -f 591/1009/165 597/1012/165 593/1014/165 -f 586/1006/165 597/1023/165 587/1010/165 -f 494/840/143 495/999/143 493/841/143 -f 573/843/144 561/960/144 563/844/144 -f 577/848/145 576/851/145 578/850/145 -f 578/850/145 579/1024/145 582/846/145 -f 582/846/145 583/1025/145 581/847/145 -f 581/847/145 580/1026/145 577/848/145 -f 577/848/145 578/850/145 582/846/145 -f 491/849/145 490/934/145 578/850/145 -f 504/852/146 507/855/146 506/853/146 -f 507/855/145 504/852/145 498/856/145 -f 505/854/143 506/853/143 497/858/143 -f 506/853/147 507/1027/147 499/860/147 -f 504/862/148 505/854/148 496/863/148 -f 519/865/143 514/873/143 500/866/143 -f 517/868/149 515/874/149 501/869/149 -f 516/871/143 517/868/143 503/870/143 -f 514/873/150 516/871/150 502/872/150 -f 515/874/143 518/892/143 508/875/143 -f 522/876/151 521/879/151 511/877/151 -f 521/879/143 520/894/143 509/880/143 -f 524/881/151 525/889/151 512/882/151 -f 523/884/143 524/881/143 510/883/143 -f 512/886/143 526/951/143 527/887/143 -f 529/902/145 528/896/145 530/898/145 -f 528/904/145 534/911/145 537/905/145 -f 532/901/145 536/938/145 535/907/145 -f 535/908/145 539/914/145 538/909/145 -f 543/916/143 542/915/143 541/921/143 -f 548/923/143 549/930/143 542/924/143 -f 546/926/143 547/1028/143 544/919/143 -f 550/927/143 551/933/143 546/928/143 -f 550/927/152 548/923/152 537/905/152 -f 551/933/153 550/927/153 538/909/153 -f 540/922/154 544/919/154 532/901/154 -f 490/934/146 491/849/146 489/935/146 -f 536/937/155 547/1029/155 551/933/155 -f 543/916/146 540/922/146 531/903/146 -f 544/919/156 547/1028/156 536/938/156 -f 548/923/144 545/925/144 533/906/144 -f 488/936/157 489/935/157 564/939/157 -f 576/941/144 564/1030/144 489/935/144 -f 545/925/158 543/916/158 530/898/158 -f 488/936/156 565/1031/156 578/942/156 -f 554/943/154 553/946/154 519/865/154 -f 552/944/158 555/954/158 523/884/158 -f 516/945/146 514/873/146 519/865/146 -f 552/944/146 518/892/146 517/1032/146 -f 518/892/146 515/874/146 517/1032/146 -f 516/945/146 519/865/146 553/946/146 -f 552/944/146 517/1032/146 516/945/146 -f 559/947/155 556/1033/155 522/948/155 -f 525/949/152 557/953/152 558/950/152 -f 554/943/156 520/894/156 521/879/156 -f 521/879/156 522/1034/156 556/952/156 -f 526/951/153 558/950/153 559/947/153 -f 525/949/144 524/881/144 557/953/144 -f 524/881/144 523/884/144 555/954/144 -f 563/955/145 552/944/145 553/946/145 -f 563/844/145 561/960/145 557/953/145 -f 560/958/145 559/947/145 558/950/145 -f 560/964/145 562/961/145 554/943/145 -f 565/965/143 564/971/143 575/966/143 -f 569/968/143 573/843/143 575/845/143 -f 570/972/143 571/979/143 572/973/143 -f 566/976/143 574/978/143 572/981/143 -f 579/983/154 578/1035/154 565/965/154 -f 582/984/156 579/983/156 566/976/156 -f 563/955/146 562/956/146 574/967/146 -f 581/985/153 583/989/153 571/979/153 -f 580/986/152 581/985/152 570/972/152 -f 576/987/158 577/988/158 567/969/158 -f 577/988/144 580/986/144 569/968/144 -f 583/989/155 582/1036/155 568/990/155 -f 572/981/156 574/978/156 562/961/156 -f 572/973/153 560/958/153 561/959/153 -f 535/908/153 534/910/153 512/991/153 -f 510/994/144 512/1037/144 534/911/144 -f 534/911/144 528/904/144 510/994/144 -f 511/996/156 509/1038/156 529/899/156 -f 529/899/156 535/907/156 511/996/156 -f 503/870/146 501/998/146 500/997/146 -f 501/998/146 508/1039/146 528/896/146 -f 528/896/146 529/902/146 500/997/146 -f 529/902/146 509/1040/146 500/997/146 -f 494/840/146 541/921/146 542/915/146 -f 495/1000/144 542/924/144 549/930/144 -f 493/1002/153 549/929/153 546/928/153 -f 492/1004/156 546/926/156 541/918/156 -f 586/1006/159 587/1010/159 585/1007/159 -f 591/1009/160 589/1018/160 585/1007/160 -f 588/1011/161 590/1022/161 586/1006/161 -f 597/1012/162 596/1041/162 592/1013/162 -f 595/1015/163 594/1042/163 596/1016/163 -f 589/1018/164 592/1043/164 596/1019/164 -f 596/1020/164 594/1044/164 588/1011/164 -f 590/1022/165 595/1015/165 597/1017/165 -f 591/1009/165 587/1010/165 597/1012/165 +f 532/918/171 531/919/171 530/920/171 +f 603/921/172 601/922/172 605/923/172 +f 542/924/173 544/925/173 543/926/173 +f 545/927/174 536/928/174 537/929/174 +f 543/926/171 535/930/171 534/931/171 +f 544/925/175 537/932/175 535/933/175 +f 542/934/176 534/935/176 536/936/176 +f 557/937/171 538/938/171 547/939/171 +f 555/940/177 539/941/177 541/942/177 +f 554/943/171 541/942/171 540/944/171 +f 552/945/178 540/944/178 538/938/178 +f 553/946/171 546/947/171 539/941/171 +f 560/948/179 549/949/179 551/950/179 +f 559/951/171 547/952/171 549/949/171 +f 562/953/179 550/954/179 548/955/179 +f 561/956/171 548/955/171 546/957/171 +f 550/958/171 565/959/171 551/960/171 +f 563/961/171 564/962/171 550/954/171 +f 551/960/171 565/959/171 560/963/171 +f 546/947/171 556/964/171 561/965/171 +f 547/952/171 558/966/171 557/967/171 +f 566/968/174 571/969/174 568/970/174 +f 567/971/174 569/972/174 570/973/174 +f 567/974/174 568/970/174 569/975/174 +f 566/976/174 575/977/174 571/978/174 +f 570/973/174 573/979/174 567/971/174 +f 573/980/174 576/981/174 572/982/174 +f 572/983/174 576/984/174 575/977/174 +f 574/985/174 577/986/174 573/980/174 +f 580/987/171 581/988/171 583/989/171 +f 579/990/171 582/991/171 578/992/171 +f 581/988/171 579/993/171 578/994/171 +f 586/995/171 580/996/171 583/997/171 +f 584/998/171 582/991/171 579/990/171 +f 588/999/171 584/1000/171 587/1001/171 +f 587/1002/171 586/995/171 588/1003/171 +f 585/1004/171 584/1000/171 589/1005/171 +f 588/999/180 575/977/180 576/981/180 +f 589/1005/181 576/981/181 577/986/181 +f 578/994/182 570/973/182 569/975/182 +f 574/1006/183 589/1005/183 577/986/183 +f 581/988/173 569/975/173 568/970/173 +f 582/991/184 574/1007/184 570/973/184 +f 586/995/172 571/978/172 575/977/172 +f 583/997/185 568/970/185 571/978/185 +f 592/1008/182 557/937/182 558/966/182 +f 590/1009/185 561/956/185 556/964/185 +f 554/1010/173 591/1011/173 590/1009/173 +f 597/1012/183 560/1013/183 565/959/183 +f 563/1014/180 596/1015/180 564/1016/180 +f 559/951/184 594/1017/184 592/1008/184 +f 564/1016/181 597/1012/181 565/959/181 +f 595/1018/172 562/953/172 593/1019/172 +f 601/1020/174 591/1011/174 600/1021/174 +f 601/922/174 595/1018/174 593/1019/174 +f 593/1022/174 590/1009/174 601/1020/174 +f 598/1023/174 596/1015/174 599/1024/174 +f 596/1015/174 595/1018/174 599/1025/174 +f 592/1008/174 600/1026/174 591/1027/174 +f 597/1012/174 598/1023/174 594/1028/174 +f 598/1029/174 592/1008/174 594/1017/174 +f 601/1020/173 604/1030/173 605/1031/173 +f 602/1032/184 600/1026/184 598/1029/184 +f 602/1033/181 599/1024/181 603/1034/181 +f 573/980/181 550/1035/181 551/1036/181 +f 566/976/172 546/1037/172 548/1038/172 +f 573/979/184 551/1039/184 549/1040/184 +f 541/942/173 538/1041/173 540/944/173 +f 538/1041/173 539/1042/173 566/968/173 +f 532/918/173 580/987/173 533/1043/173 +f 533/1044/172 587/1002/172 531/1045/172 +f 531/1046/181 584/1000/181 530/1047/181 +f 530/1048/184 579/990/184 532/1049/184 +f 532/918/171 533/1043/171 531/919/171 +f 603/921/172 599/1025/172 601/922/172 +f 542/924/173 545/927/173 544/925/173 +f 545/927/174 542/924/174 536/928/174 +f 543/926/171 544/925/171 535/930/171 +f 544/925/175 545/1050/175 537/932/175 +f 542/934/176 543/926/176 534/935/176 +f 557/937/171 552/945/171 538/938/171 +f 555/940/177 553/946/177 539/941/177 +f 554/943/171 555/940/171 541/942/171 +f 552/945/178 554/943/178 540/944/178 +f 553/946/171 556/964/171 546/947/171 +f 560/948/179 559/951/179 549/949/179 +f 559/951/171 558/966/171 547/952/171 +f 562/953/179 563/961/179 550/954/179 +f 561/956/171 562/953/171 548/955/171 +f 550/958/171 564/1016/171 565/959/171 +f 567/974/174 566/968/174 568/970/174 +f 566/976/174 572/983/174 575/977/174 +f 570/973/174 574/1007/174 573/979/174 +f 573/980/174 577/986/174 576/981/174 +f 581/988/171 580/987/171 579/993/171 +f 586/995/171 587/1002/171 580/996/171 +f 584/998/171 585/1051/171 582/991/171 +f 588/999/171 589/1005/171 584/1000/171 +f 588/999/180 586/995/180 575/977/180 +f 589/1005/181 588/999/181 576/981/181 +f 578/994/182 582/991/182 570/973/182 +f 574/1006/183 585/1052/183 589/1005/183 +f 581/988/173 578/994/173 569/975/173 +f 582/991/184 585/1051/184 574/1007/184 +f 586/995/172 583/997/172 571/978/172 +f 583/997/185 581/988/185 568/970/185 +f 592/1008/182 591/1011/182 557/937/182 +f 590/1009/185 593/1019/185 561/956/185 +f 554/1010/173 552/945/173 557/937/173 +f 590/1009/173 556/964/173 555/1053/173 +f 556/964/173 553/946/173 555/1053/173 +f 554/1010/173 557/937/173 591/1011/173 +f 590/1009/173 555/1053/173 554/1010/173 +f 597/1012/183 594/1054/183 560/1013/183 +f 563/1014/180 595/1018/180 596/1015/180 +f 592/1008/184 558/966/184 559/951/184 +f 559/951/184 560/1055/184 594/1017/184 +f 564/1016/181 596/1015/181 597/1012/181 +f 563/1014/172 562/953/172 595/1018/172 +f 562/953/172 561/956/172 593/1019/172 +f 601/1020/174 590/1009/174 591/1011/174 +f 601/922/174 599/1025/174 595/1018/174 +f 598/1023/174 597/1012/174 596/1015/174 +f 598/1029/174 600/1026/174 592/1008/174 +f 601/1020/173 600/1021/173 604/1030/173 +f 602/1032/184 604/1056/184 600/1026/184 +f 602/1033/181 598/1023/181 599/1024/181 +f 573/980/181 572/982/181 550/1035/181 +f 548/1038/172 550/1057/172 572/983/172 +f 572/983/172 566/976/172 548/1038/172 +f 549/1040/184 547/1058/184 567/971/184 +f 567/971/184 573/979/184 549/1040/184 +f 541/942/173 539/1042/173 538/1041/173 +f 539/1042/173 546/1059/173 566/968/173 +f 566/968/173 567/974/173 538/1041/173 +f 567/974/173 547/1060/173 538/1041/173 +f 532/918/173 579/993/173 580/987/173 +f 533/1044/172 580/996/172 587/1002/172 +f 531/1046/181 587/1001/181 584/1000/181 +f 530/1048/184 584/998/184 579/990/184 o Helmet v -4.725003 -2.950001 -4.725000 v 25.451866 4.962900 4.881973 @@ -3353,243 +3401,243 @@ vn 0.3827 -0.9239 0.0000 vn 0.7022 -0.1170 -0.7022 vn -0.7493 -0.0937 -0.6556 s off -f 616/1045/166 605/1046/166 604/1047/166 -f 614/1048/167 603/1049/167 602/1050/167 -f 612/1051/168 601/1052/168 600/1053/168 -f 617/1054/169 600/1053/169 605/1046/169 -f 615/1055/170 604/1047/170 603/1056/170 -f 613/1057/171 602/1050/171 601/1052/171 -f 611/1058/171 622/1059/171 610/1060/171 -f 609/1061/169 620/1062/169 608/1063/169 -f 607/1064/170 618/1065/170 606/1066/170 -f 606/1067/167 623/1068/167 611/1069/167 -f 610/1070/168 621/1071/168 609/1072/168 -f 608/1073/166 619/1074/166 607/1075/166 -f 617/1054/172 618/1076/172 612/1051/172 -f 618/1065/172 613/1057/172 612/1051/172 -f 619/1074/172 614/1048/172 613/1057/172 -f 614/1048/172 621/1077/172 615/1078/172 -f 621/1071/172 616/1045/172 615/1055/172 -f 622/1059/172 617/1054/172 616/1045/172 -f 610/1079/172 609/1080/172 608/1081/172 -f 624/1082/166 627/1083/166 625/1084/166 -f 634/1085/167 645/1086/167 633/1087/167 -f 626/1088/166 631/1089/166 628/1090/166 -f 636/1091/166 647/1092/166 635/1093/166 -f 626/1088/166 624/1094/166 630/1095/166 -f 632/1096/168 643/1097/168 629/1098/168 -f 629/1098/169 648/1099/169 636/1091/169 -f 635/1093/170 646/1100/170 634/1101/170 -f 633/1087/171 644/1102/171 632/1096/171 -f 653/1103/171 642/1104/171 641/1105/171 -f 651/1106/169 640/1107/169 639/1108/169 -f 649/1109/170 638/1110/170 637/1111/170 -f 654/1112/167 637/1113/167 642/1114/167 -f 652/1115/168 641/1116/168 640/1117/168 -f 650/1118/166 639/1119/166 638/1120/166 -f 648/1099/173 649/1121/173 654/1112/173 -f 644/1102/173 649/1109/173 643/1097/173 -f 645/1086/173 650/1118/173 644/1102/173 -f 645/1086/173 652/1122/173 651/1106/173 -f 647/1092/173 652/1115/173 646/1100/173 -f 648/1099/173 653/1103/173 647/1092/173 -f 641/1123/173 642/1124/173 637/1125/173 -f 655/1126/166 657/1127/166 656/1128/166 -f 625/1084/174 676/1129/174 624/1082/174 -f 627/1130/166 655/1126/166 625/1131/166 -f 660/1132/175 661/1133/175 659/1134/175 -f 664/1135/176 658/1136/176 659/1134/176 -f 659/1134/175 661/1133/175 664/1135/175 -f 662/1137/166 665/1138/166 661/1133/166 -f 666/1139/177 667/1140/177 665/1138/177 -f 668/1141/178 669/1142/178 667/1140/178 -f 670/1143/179 671/1144/179 669/1145/179 -f 672/1146/171 673/1147/171 671/1144/171 -f 674/1148/180 675/1149/180 673/1147/180 -f 669/1150/181 678/1151/181 667/1152/181 -f 669/1150/182 671/1144/182 677/1153/182 -f 665/1138/183 667/1152/183 678/1151/183 -f 661/1133/184 678/1151/184 664/1135/184 -f 677/1153/185 673/1147/185 679/1154/185 -f 673/1147/186 675/1155/186 679/1154/186 -f 679/1154/187 625/1156/187 655/1126/187 -f 663/1157/166 680/1158/166 658/1159/166 -f 663/1157/173 677/1153/173 679/1154/173 -f 682/1160/166 685/1161/166 683/1162/166 -f 668/1163/188 687/1164/188 670/1165/188 -f 668/1163/189 666/1139/189 686/1166/189 -f 670/1143/190 687/1167/190 672/1146/190 -f 624/1168/191 688/1169/191 630/1095/191 -f 676/1129/192 674/1148/192 688/1170/192 -f 672/1146/193 688/1170/193 674/1148/193 -f 662/1137/175 660/1132/175 689/1171/175 -f 662/1137/194 686/1166/194 666/1139/194 -f 689/1171/176 684/1172/176 682/1173/176 -f 687/1164/172 682/1160/172 683/1162/172 -f 692/1174/195 707/1175/195 706/1176/195 -f 695/1177/175 690/1178/175 691/1179/175 -f 697/1180/174 694/1181/174 695/1177/174 -f 699/1182/191 694/1183/191 696/1184/191 -f 694/1181/196 698/1185/196 690/1178/196 -f 701/1186/172 700/1187/172 708/1188/172 -f 706/1176/197 700/1189/197 692/1174/197 -f 702/1190/187 697/1191/187 695/1192/187 -f 695/1177/198 691/1179/198 702/1193/198 -f 598/1194/173 705/1195/173 703/1196/173 -f 691/1179/199 598/1194/199 702/1193/199 -f 706/1176/200 691/1179/200 690/1178/200 -f 709/1197/171 712/1198/171 710/1199/171 -f 708/1188/201 690/1178/201 698/1185/201 -f 707/1175/202 704/1200/202 598/1194/202 -f 714/1201/166 716/1202/166 713/1203/166 -f 711/1204/174 716/1202/174 712/1205/174 -f 710/1206/178 714/1201/178 709/1207/178 -f 712/1208/173 715/1209/173 710/1210/173 -f 709/1197/172 713/1203/172 711/1211/172 -f 718/1212/178 719/1213/178 717/1214/178 -f 718/1212/203 724/1215/203 720/1216/203 -f 717/1214/204 723/1217/204 721/1218/204 -f 721/1219/179 718/1212/179 717/1214/179 -f 720/1216/175 725/1220/175 719/1213/175 -f 720/1216/205 724/1215/205 726/1221/205 -f 719/1213/206 725/1222/206 723/1217/206 -f 728/1223/178 729/1224/178 727/1225/178 -f 728/1223/203 734/1226/203 730/1227/203 -f 727/1225/204 733/1228/204 731/1229/204 -f 727/1225/179 732/1230/179 728/1223/179 -f 730/1227/175 735/1231/175 729/1224/175 -f 730/1227/205 734/1226/205 736/1232/205 -f 729/1224/206 735/1233/206 733/1228/206 -f 738/1234/207 739/1235/207 737/1236/207 -f 740/1237/208 741/1238/208 739/1235/208 -f 742/1239/209 743/1240/209 741/1238/209 -f 744/1241/210 745/1242/210 743/1240/210 -f 746/1243/211 747/1244/211 745/1245/211 -f 748/1246/212 749/1247/212 747/1244/212 -f 750/1248/171 746/1249/171 742/1250/171 -f 750/1251/213 751/1252/213 749/1247/213 -f 752/1253/214 737/1236/214 751/1252/214 -f 747/1254/166 749/1255/166 751/1256/166 -f 616/1045/166 617/1054/166 605/1046/166 -f 614/1048/167 615/1078/167 603/1049/167 -f 612/1051/168 613/1057/168 601/1052/168 -f 617/1054/169 612/1051/169 600/1053/169 -f 615/1055/170 616/1045/170 604/1047/170 -f 613/1057/171 614/1048/171 602/1050/171 -f 611/1058/171 623/1257/171 622/1059/171 -f 609/1061/169 621/1077/169 620/1062/169 -f 607/1064/170 619/1258/170 618/1065/170 -f 606/1067/167 618/1076/167 623/1068/167 -f 610/1070/168 622/1259/168 621/1071/168 -f 608/1073/166 620/1260/166 619/1074/166 -f 617/1054/172 623/1068/172 618/1076/172 -f 618/1065/172 619/1258/172 613/1057/172 -f 619/1074/172 620/1260/172 614/1048/172 -f 614/1048/172 620/1062/172 621/1077/172 -f 621/1071/172 622/1259/172 616/1045/172 -f 622/1059/172 623/1257/172 617/1054/172 -f 608/1081/172 607/1261/172 610/1079/172 -f 607/1261/172 606/1262/172 610/1079/172 -f 606/1262/172 611/1263/172 610/1079/172 -f 624/1082/166 626/1264/166 627/1083/166 -f 634/1085/167 646/1265/167 645/1086/167 -f 626/1088/166 630/1095/166 631/1089/166 -f 636/1091/166 648/1099/166 647/1092/166 -f 632/1096/168 644/1102/168 643/1097/168 -f 629/1098/169 643/1097/169 648/1099/169 -f 635/1093/170 647/1092/170 646/1100/170 -f 633/1087/171 645/1086/171 644/1102/171 -f 653/1103/171 654/1266/171 642/1104/171 -f 651/1106/169 652/1122/169 640/1107/169 -f 649/1109/170 650/1267/170 638/1110/170 -f 654/1112/167 649/1121/167 637/1113/167 -f 652/1115/168 653/1268/168 641/1116/168 -f 650/1118/166 651/1269/166 639/1119/166 -f 648/1099/173 643/1097/173 649/1121/173 -f 644/1102/173 650/1267/173 649/1109/173 -f 645/1086/173 651/1269/173 650/1118/173 -f 645/1086/173 646/1265/173 652/1122/173 -f 647/1092/173 653/1268/173 652/1115/173 -f 648/1099/173 654/1266/173 653/1103/173 -f 637/1125/173 638/1270/173 641/1123/173 -f 638/1270/173 639/1271/173 641/1123/173 -f 639/1271/173 640/1272/173 641/1123/173 -f 655/1126/166 627/1130/166 657/1127/166 -f 625/1084/174 675/1149/174 676/1129/174 -f 660/1132/175 662/1137/175 661/1133/175 -f 664/1135/176 663/1273/176 658/1136/176 -f 662/1137/166 666/1139/166 665/1138/166 -f 666/1139/177 668/1141/177 667/1140/177 -f 668/1141/178 670/1274/178 669/1142/178 -f 670/1143/179 672/1146/179 671/1144/179 -f 672/1146/171 674/1148/171 673/1147/171 -f 674/1148/180 676/1129/180 675/1149/180 -f 669/1150/181 677/1153/181 678/1151/181 -f 661/1133/184 665/1138/184 678/1151/184 -f 677/1153/185 671/1144/185 673/1147/185 -f 679/1154/187 675/1155/187 625/1156/187 -f 663/1157/166 681/1275/166 680/1158/166 -f 679/1154/173 655/1126/173 656/1128/173 -f 679/1154/173 656/1128/173 681/1275/173 -f 664/1135/173 678/1151/173 663/1157/173 -f 678/1151/173 677/1153/173 663/1157/173 -f 679/1154/173 681/1275/173 663/1157/173 -f 682/1160/166 684/1276/166 685/1161/166 -f 668/1163/188 686/1166/188 687/1164/188 -f 624/1168/191 676/1277/191 688/1169/191 -f 672/1146/193 687/1167/193 688/1170/193 -f 662/1137/194 689/1171/194 686/1166/194 -f 689/1171/176 660/1132/176 684/1172/176 -f 683/1162/172 631/1089/172 688/1169/172 -f 631/1089/172 630/1095/172 688/1169/172 -f 683/1162/172 688/1169/172 687/1164/172 -f 687/1164/172 686/1166/172 682/1160/172 -f 686/1166/172 689/1171/172 682/1160/172 -f 692/1174/195 693/1278/195 707/1175/195 -f 695/1177/175 694/1181/175 690/1178/175 -f 697/1180/174 696/1279/174 694/1181/174 -f 699/1182/191 698/1280/191 694/1183/191 -f 698/1280/172 699/1182/172 708/1188/172 -f 699/1182/172 701/1186/172 708/1188/172 -f 706/1176/215 708/1188/215 700/1189/215 -f 702/1190/187 703/1196/187 697/1191/187 -f 703/1196/173 702/1190/173 598/1194/173 -f 598/1194/173 704/1281/173 705/1195/173 -f 691/1179/199 707/1175/199 598/1194/199 -f 706/1176/200 707/1175/200 691/1179/200 -f 709/1197/171 711/1211/171 712/1198/171 -f 708/1188/201 706/1176/201 690/1178/201 -f 707/1175/216 693/1278/216 704/1200/216 -f 714/1201/166 715/1209/166 716/1202/166 -f 711/1204/174 713/1203/174 716/1202/174 -f 710/1206/178 715/1209/178 714/1201/178 -f 712/1208/173 716/1202/173 715/1209/173 -f 709/1197/172 714/1201/172 713/1203/172 -f 718/1212/178 720/1216/178 719/1213/178 -f 718/1212/203 722/1282/203 724/1215/203 -f 717/1214/204 719/1213/204 723/1217/204 -f 721/1219/179 722/1283/179 718/1212/179 -f 720/1216/175 726/1284/175 725/1220/175 -f 728/1223/178 730/1227/178 729/1224/178 -f 728/1223/203 732/1285/203 734/1226/203 -f 727/1225/204 729/1224/204 733/1228/204 -f 727/1225/179 731/1286/179 732/1230/179 -f 730/1227/175 736/1287/175 735/1231/175 -f 738/1234/207 740/1237/207 739/1235/207 -f 740/1237/208 742/1239/208 741/1238/208 -f 742/1239/209 744/1241/209 743/1240/209 -f 744/1241/210 746/1288/210 745/1242/210 -f 746/1243/211 748/1246/211 747/1244/211 -f 748/1246/212 750/1251/212 749/1247/212 -f 742/1250/171 740/1289/171 738/1290/171 -f 738/1290/171 752/1291/171 742/1250/171 -f 752/1291/171 750/1248/171 742/1250/171 -f 750/1248/171 748/1292/171 746/1249/171 -f 746/1249/171 744/1293/171 742/1250/171 -f 750/1251/213 752/1253/213 751/1252/213 -f 752/1253/214 738/1234/214 737/1236/214 -f 751/1256/166 737/1294/166 739/1295/166 -f 739/1295/166 741/1296/166 751/1256/166 -f 741/1296/166 743/1297/166 751/1256/166 -f 743/1297/166 745/1298/166 751/1256/166 -f 745/1298/166 747/1254/166 751/1256/166 +f 624/1061/186 613/1062/186 612/1063/186 +f 622/1064/187 611/1065/187 610/1066/187 +f 620/1067/188 609/1068/188 608/1069/188 +f 625/1070/189 608/1069/189 613/1062/189 +f 623/1071/190 612/1063/190 611/1072/190 +f 621/1073/191 610/1066/191 609/1068/191 +f 619/1074/191 630/1075/191 618/1076/191 +f 617/1077/189 628/1078/189 616/1079/189 +f 615/1080/190 626/1081/190 614/1082/190 +f 614/1083/187 631/1084/187 619/1085/187 +f 618/1086/188 629/1087/188 617/1088/188 +f 616/1089/186 627/1090/186 615/1091/186 +f 625/1070/192 626/1092/192 620/1067/192 +f 626/1081/192 621/1073/192 620/1067/192 +f 627/1090/192 622/1064/192 621/1073/192 +f 622/1064/192 629/1093/192 623/1094/192 +f 629/1087/192 624/1061/192 623/1071/192 +f 630/1075/192 625/1070/192 624/1061/192 +f 618/1095/192 617/1096/192 616/1097/192 +f 632/1098/186 635/1099/186 633/1100/186 +f 642/1101/187 653/1102/187 641/1103/187 +f 634/1104/186 639/1105/186 636/1106/186 +f 644/1107/186 655/1108/186 643/1109/186 +f 634/1104/186 632/1110/186 638/1111/186 +f 640/1112/188 651/1113/188 637/1114/188 +f 637/1114/189 656/1115/189 644/1107/189 +f 643/1109/190 654/1116/190 642/1117/190 +f 641/1103/191 652/1118/191 640/1112/191 +f 661/1119/191 650/1120/191 649/1121/191 +f 659/1122/189 648/1123/189 647/1124/189 +f 657/1125/190 646/1126/190 645/1127/190 +f 662/1128/187 645/1129/187 650/1130/187 +f 660/1131/188 649/1132/188 648/1133/188 +f 658/1134/186 647/1135/186 646/1136/186 +f 656/1115/193 657/1137/193 662/1128/193 +f 652/1118/193 657/1125/193 651/1113/193 +f 653/1102/193 658/1134/193 652/1118/193 +f 653/1102/193 660/1138/193 659/1122/193 +f 655/1108/193 660/1131/193 654/1116/193 +f 656/1115/193 661/1119/193 655/1108/193 +f 649/1139/193 650/1140/193 645/1141/193 +f 663/1142/186 665/1143/186 664/1144/186 +f 633/1100/194 684/1145/194 632/1098/194 +f 635/1146/186 663/1142/186 633/1147/186 +f 668/1148/195 669/1149/195 667/1150/195 +f 672/1151/196 666/1152/196 667/1150/196 +f 667/1150/195 669/1149/195 672/1151/195 +f 670/1153/186 673/1154/186 669/1149/186 +f 674/1155/197 675/1156/197 673/1154/197 +f 676/1157/198 677/1158/198 675/1156/198 +f 678/1159/199 679/1160/199 677/1161/199 +f 680/1162/191 681/1163/191 679/1160/191 +f 682/1164/200 683/1165/200 681/1163/200 +f 677/1166/201 686/1167/201 675/1168/201 +f 677/1166/202 679/1160/202 685/1169/202 +f 673/1154/203 675/1168/203 686/1167/203 +f 669/1149/204 686/1167/204 672/1151/204 +f 685/1169/205 681/1163/205 687/1170/205 +f 681/1163/206 683/1171/206 687/1170/206 +f 687/1170/207 633/1172/207 663/1142/207 +f 671/1173/186 688/1174/186 666/1175/186 +f 671/1173/193 685/1169/193 687/1170/193 +f 690/1176/186 693/1177/186 691/1178/186 +f 676/1179/208 695/1180/208 678/1181/208 +f 676/1179/209 674/1155/209 694/1182/209 +f 678/1159/210 695/1183/210 680/1162/210 +f 632/1184/211 696/1185/211 638/1111/211 +f 684/1145/212 682/1164/212 696/1186/212 +f 680/1162/213 696/1186/213 682/1164/213 +f 670/1153/195 668/1148/195 697/1187/195 +f 670/1153/214 694/1182/214 674/1155/214 +f 697/1187/196 692/1188/196 690/1189/196 +f 695/1180/192 690/1176/192 691/1178/192 +f 700/1190/215 715/1191/215 714/1192/215 +f 703/1193/195 698/1194/195 699/1195/195 +f 705/1196/194 702/1197/194 703/1193/194 +f 707/1198/211 702/1199/211 704/1200/211 +f 702/1197/216 706/1201/216 698/1194/216 +f 709/1202/192 708/1203/192 716/1204/192 +f 714/1192/217 708/1205/217 700/1190/217 +f 710/1206/207 705/1207/207 703/1208/207 +f 703/1193/218 699/1195/218 710/1209/218 +f 606/1210/193 713/1211/193 711/1212/193 +f 699/1195/219 606/1210/219 710/1209/219 +f 714/1192/220 699/1195/220 698/1194/220 +f 717/1213/191 720/1214/191 718/1215/191 +f 716/1204/221 698/1194/221 706/1201/221 +f 715/1191/222 712/1216/222 606/1210/222 +f 722/1217/186 724/1218/186 721/1219/186 +f 719/1220/194 724/1218/194 720/1221/194 +f 718/1222/198 722/1217/198 717/1223/198 +f 720/1224/193 723/1225/193 718/1226/193 +f 717/1213/192 721/1219/192 719/1227/192 +f 726/1228/198 727/1229/198 725/1230/198 +f 726/1228/223 732/1231/223 728/1232/223 +f 725/1230/224 731/1233/224 729/1234/224 +f 729/1235/199 726/1228/199 725/1230/199 +f 728/1232/195 733/1236/195 727/1229/195 +f 728/1232/225 732/1231/225 734/1237/225 +f 727/1229/226 733/1238/226 731/1233/226 +f 736/1239/198 737/1240/198 735/1241/198 +f 736/1239/223 742/1242/223 738/1243/223 +f 735/1241/224 741/1244/224 739/1245/224 +f 735/1241/199 740/1246/199 736/1239/199 +f 738/1243/195 743/1247/195 737/1240/195 +f 738/1243/225 742/1242/225 744/1248/225 +f 737/1240/226 743/1249/226 741/1244/226 +f 746/1250/227 747/1251/227 745/1252/227 +f 748/1253/228 749/1254/228 747/1251/228 +f 750/1255/229 751/1256/229 749/1254/229 +f 752/1257/230 753/1258/230 751/1256/230 +f 754/1259/231 755/1260/231 753/1261/231 +f 756/1262/232 757/1263/232 755/1260/232 +f 758/1264/191 754/1265/191 750/1266/191 +f 758/1267/233 759/1268/233 757/1263/233 +f 760/1269/234 745/1252/234 759/1268/234 +f 755/1270/186 757/1271/186 759/1272/186 +f 624/1061/186 625/1070/186 613/1062/186 +f 622/1064/187 623/1094/187 611/1065/187 +f 620/1067/188 621/1073/188 609/1068/188 +f 625/1070/189 620/1067/189 608/1069/189 +f 623/1071/190 624/1061/190 612/1063/190 +f 621/1073/191 622/1064/191 610/1066/191 +f 619/1074/191 631/1273/191 630/1075/191 +f 617/1077/189 629/1093/189 628/1078/189 +f 615/1080/190 627/1274/190 626/1081/190 +f 614/1083/187 626/1092/187 631/1084/187 +f 618/1086/188 630/1275/188 629/1087/188 +f 616/1089/186 628/1276/186 627/1090/186 +f 625/1070/192 631/1084/192 626/1092/192 +f 626/1081/192 627/1274/192 621/1073/192 +f 627/1090/192 628/1276/192 622/1064/192 +f 622/1064/192 628/1078/192 629/1093/192 +f 629/1087/192 630/1275/192 624/1061/192 +f 630/1075/192 631/1273/192 625/1070/192 +f 616/1097/192 615/1277/192 618/1095/192 +f 615/1277/192 614/1278/192 618/1095/192 +f 614/1278/192 619/1279/192 618/1095/192 +f 632/1098/186 634/1280/186 635/1099/186 +f 642/1101/187 654/1281/187 653/1102/187 +f 634/1104/186 638/1111/186 639/1105/186 +f 644/1107/186 656/1115/186 655/1108/186 +f 640/1112/188 652/1118/188 651/1113/188 +f 637/1114/189 651/1113/189 656/1115/189 +f 643/1109/190 655/1108/190 654/1116/190 +f 641/1103/191 653/1102/191 652/1118/191 +f 661/1119/191 662/1282/191 650/1120/191 +f 659/1122/189 660/1138/189 648/1123/189 +f 657/1125/190 658/1283/190 646/1126/190 +f 662/1128/187 657/1137/187 645/1129/187 +f 660/1131/188 661/1284/188 649/1132/188 +f 658/1134/186 659/1285/186 647/1135/186 +f 656/1115/193 651/1113/193 657/1137/193 +f 652/1118/193 658/1283/193 657/1125/193 +f 653/1102/193 659/1285/193 658/1134/193 +f 653/1102/193 654/1281/193 660/1138/193 +f 655/1108/193 661/1284/193 660/1131/193 +f 656/1115/193 662/1282/193 661/1119/193 +f 645/1141/193 646/1286/193 649/1139/193 +f 646/1286/193 647/1287/193 649/1139/193 +f 647/1287/193 648/1288/193 649/1139/193 +f 663/1142/186 635/1146/186 665/1143/186 +f 633/1100/194 683/1165/194 684/1145/194 +f 668/1148/195 670/1153/195 669/1149/195 +f 672/1151/196 671/1289/196 666/1152/196 +f 670/1153/186 674/1155/186 673/1154/186 +f 674/1155/197 676/1157/197 675/1156/197 +f 676/1157/198 678/1290/198 677/1158/198 +f 678/1159/199 680/1162/199 679/1160/199 +f 680/1162/191 682/1164/191 681/1163/191 +f 682/1164/200 684/1145/200 683/1165/200 +f 677/1166/201 685/1169/201 686/1167/201 +f 669/1149/204 673/1154/204 686/1167/204 +f 685/1169/205 679/1160/205 681/1163/205 +f 687/1170/207 683/1171/207 633/1172/207 +f 671/1173/186 689/1291/186 688/1174/186 +f 687/1170/193 663/1142/193 664/1144/193 +f 687/1170/193 664/1144/193 689/1291/193 +f 672/1151/193 686/1167/193 671/1173/193 +f 686/1167/193 685/1169/193 671/1173/193 +f 687/1170/193 689/1291/193 671/1173/193 +f 690/1176/186 692/1292/186 693/1177/186 +f 676/1179/208 694/1182/208 695/1180/208 +f 632/1184/211 684/1293/211 696/1185/211 +f 680/1162/213 695/1183/213 696/1186/213 +f 670/1153/214 697/1187/214 694/1182/214 +f 697/1187/196 668/1148/196 692/1188/196 +f 691/1178/192 639/1105/192 696/1185/192 +f 639/1105/192 638/1111/192 696/1185/192 +f 691/1178/192 696/1185/192 695/1180/192 +f 695/1180/192 694/1182/192 690/1176/192 +f 694/1182/192 697/1187/192 690/1176/192 +f 700/1190/215 701/1294/215 715/1191/215 +f 703/1193/195 702/1197/195 698/1194/195 +f 705/1196/194 704/1295/194 702/1197/194 +f 707/1198/211 706/1296/211 702/1199/211 +f 706/1296/192 707/1198/192 716/1204/192 +f 707/1198/192 709/1202/192 716/1204/192 +f 714/1192/235 716/1204/235 708/1205/235 +f 710/1206/207 711/1212/207 705/1207/207 +f 711/1212/193 710/1206/193 606/1210/193 +f 606/1210/193 712/1297/193 713/1211/193 +f 699/1195/219 715/1191/219 606/1210/219 +f 714/1192/220 715/1191/220 699/1195/220 +f 717/1213/191 719/1227/191 720/1214/191 +f 716/1204/221 714/1192/221 698/1194/221 +f 715/1191/236 701/1294/236 712/1216/236 +f 722/1217/186 723/1225/186 724/1218/186 +f 719/1220/194 721/1219/194 724/1218/194 +f 718/1222/198 723/1225/198 722/1217/198 +f 720/1224/193 724/1218/193 723/1225/193 +f 717/1213/192 722/1217/192 721/1219/192 +f 726/1228/198 728/1232/198 727/1229/198 +f 726/1228/223 730/1298/223 732/1231/223 +f 725/1230/224 727/1229/224 731/1233/224 +f 729/1235/199 730/1299/199 726/1228/199 +f 728/1232/195 734/1300/195 733/1236/195 +f 736/1239/198 738/1243/198 737/1240/198 +f 736/1239/223 740/1301/223 742/1242/223 +f 735/1241/224 737/1240/224 741/1244/224 +f 735/1241/199 739/1302/199 740/1246/199 +f 738/1243/195 744/1303/195 743/1247/195 +f 746/1250/227 748/1253/227 747/1251/227 +f 748/1253/228 750/1255/228 749/1254/228 +f 750/1255/229 752/1257/229 751/1256/229 +f 752/1257/230 754/1304/230 753/1258/230 +f 754/1259/231 756/1262/231 755/1260/231 +f 756/1262/232 758/1267/232 757/1263/232 +f 750/1266/191 748/1305/191 746/1306/191 +f 746/1306/191 760/1307/191 750/1266/191 +f 760/1307/191 758/1264/191 750/1266/191 +f 758/1264/191 756/1308/191 754/1265/191 +f 754/1265/191 752/1309/191 750/1266/191 +f 758/1267/233 760/1269/233 759/1268/233 +f 760/1269/234 746/1250/234 745/1252/234 +f 759/1272/186 745/1310/186 747/1311/186 +f 747/1311/186 749/1312/186 759/1272/186 +f 749/1312/186 751/1313/186 759/1272/186 +f 751/1313/186 753/1314/186 759/1272/186 +f 753/1314/186 755/1270/186 759/1272/186 diff --git a/src/main/resources/assets/hbm/models/armor/test.obj b/src/main/resources/assets/hbm/models/armor/test.obj new file mode 100644 index 000000000..614588e3e --- /dev/null +++ b/src/main/resources/assets/hbm/models/armor/test.obj @@ -0,0 +1,219 @@ +# Blender v2.79 (sub 0) OBJ File: 'test.blend' +# www.blender.org +o Chest +v -4.000000 12.000000 2.000000 +v 4.000000 12.000000 2.000000 +v -4.000000 12.000000 -2.000000 +v 4.000000 12.000000 -2.000000 +v 4.000000 0.000000 -2.000000 +v -4.000000 0.000000 -2.000000 +v 4.000000 0.000000 2.000000 +v -4.000000 0.000000 2.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vn 1.0000 0.0000 0.0000 +vn -1.0000 0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 0.0000 0.0000 1.0000 +vn 0.0000 1.0000 0.0000 +vn 0.0000 -1.0000 0.0000 +s off +f 5/1/1 2/2/1 7/3/1 +f 8/4/2 3/5/2 6/6/2 +f 6/6/3 4/7/3 5/1/3 +f 7/3/4 1/8/4 8/4/4 +f 2/2/5 3/5/5 1/8/5 +f 6/6/6 7/3/6 8/4/6 +f 5/1/1 4/7/1 2/2/1 +f 8/4/2 1/8/2 3/5/2 +f 6/6/3 3/5/3 4/7/3 +f 7/3/4 2/2/4 1/8/4 +f 2/2/5 4/7/5 3/5/5 +f 6/6/6 5/1/6 7/3/6 +o LeftArm +v 4.000000 12.000000 2.000000 +v 8.000000 12.000000 2.000000 +v 4.000000 12.000000 -2.000000 +v 8.000000 12.000000 -2.000000 +v 8.000000 0.000000 -2.000000 +v 4.000000 0.000000 -2.000000 +v 8.000000 0.000000 2.000000 +v 4.000000 0.000000 2.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vn 1.0000 0.0000 0.0000 +vn -1.0000 0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 0.0000 0.0000 1.0000 +vn 0.0000 1.0000 0.0000 +vn 0.0000 -1.0000 0.0000 +s off +f 13/9/7 10/10/7 15/11/7 +f 16/12/8 11/13/8 14/14/8 +f 14/14/9 12/15/9 13/9/9 +f 15/11/10 9/16/10 16/12/10 +f 10/10/11 11/13/11 9/16/11 +f 14/14/12 15/11/12 16/12/12 +f 13/9/7 12/15/7 10/10/7 +f 16/12/8 9/16/8 11/13/8 +f 14/14/9 11/13/9 12/15/9 +f 15/11/10 10/10/10 9/16/10 +f 10/10/11 12/15/11 11/13/11 +f 14/14/12 13/9/12 15/11/12 +o RightArm +v -8.000000 12.000000 2.000000 +v -4.000000 12.000000 2.000000 +v -8.000000 12.000000 -2.000000 +v -4.000000 12.000000 -2.000000 +v -4.000000 0.000000 -2.000000 +v -8.000000 0.000000 -2.000000 +v -4.000000 0.000000 2.000000 +v -8.000000 0.000000 2.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vn 1.0000 0.0000 0.0000 +vn -1.0000 0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 0.0000 0.0000 1.0000 +vn 0.0000 1.0000 0.0000 +vn 0.0000 -1.0000 0.0000 +s off +f 21/17/13 18/18/13 23/19/13 +f 24/20/14 19/21/14 22/22/14 +f 22/22/15 20/23/15 21/17/15 +f 23/19/16 17/24/16 24/20/16 +f 18/18/17 19/21/17 17/24/17 +f 22/22/18 23/19/18 24/20/18 +f 21/17/13 20/23/13 18/18/13 +f 24/20/14 17/24/14 19/21/14 +f 22/22/15 19/21/15 20/23/15 +f 23/19/16 18/18/16 17/24/16 +f 18/18/17 20/23/17 19/21/17 +f 22/22/18 21/17/18 23/19/18 +o RightLeg +v -4.000000 24.000000 2.000000 +v 0.000000 24.000000 2.000000 +v -4.000000 24.000000 -2.000000 +v 0.000000 24.000000 -2.000000 +v 0.000000 12.000000 -2.000000 +v -4.000000 12.000000 -2.000000 +v 0.000000 12.000000 2.000000 +v -4.000000 12.000000 2.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vn 1.0000 0.0000 0.0000 +vn -1.0000 0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 0.0000 0.0000 1.0000 +vn 0.0000 1.0000 0.0000 +vn 0.0000 -1.0000 0.0000 +s off +f 29/25/19 26/26/19 31/27/19 +f 32/28/20 27/29/20 30/30/20 +f 30/30/21 28/31/21 29/25/21 +f 31/27/22 25/32/22 32/28/22 +f 26/26/23 27/29/23 25/32/23 +f 30/30/24 31/27/24 32/28/24 +f 29/25/19 28/31/19 26/26/19 +f 32/28/20 25/32/20 27/29/20 +f 30/30/21 27/29/21 28/31/21 +f 31/27/22 26/26/22 25/32/22 +f 26/26/23 28/31/23 27/29/23 +f 30/30/24 29/25/24 31/27/24 +o LeftLeg +v 0.000000 24.000000 2.000000 +v 4.000000 24.000000 2.000000 +v 0.000000 24.000000 -2.000000 +v 4.000000 24.000000 -2.000000 +v 4.000000 12.000000 -2.000000 +v 0.000000 12.000000 -2.000000 +v 4.000000 12.000000 2.000000 +v 0.000000 12.000000 2.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vn 1.0000 0.0000 0.0000 +vn -1.0000 0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 0.0000 0.0000 1.0000 +vn 0.0000 1.0000 0.0000 +vn 0.0000 -1.0000 0.0000 +s off +f 37/33/25 34/34/25 39/35/25 +f 40/36/26 35/37/26 38/38/26 +f 38/38/27 36/39/27 37/33/27 +f 39/35/28 33/40/28 40/36/28 +f 34/34/29 35/37/29 33/40/29 +f 38/38/30 39/35/30 40/36/30 +f 37/33/25 36/39/25 34/34/25 +f 40/36/26 33/40/26 35/37/26 +f 38/38/27 35/37/27 36/39/27 +f 39/35/28 34/34/28 33/40/28 +f 34/34/29 36/39/29 35/37/29 +f 38/38/30 37/33/30 39/35/30 +o Helmet +v 25.451866 -3.037100 4.881973 +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 -8.000000 -4.000000 +v -4.000000 -8.000000 -4.000000 +v 4.000000 -8.000000 4.000000 +v -4.000000 -8.000000 4.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vn 1.0000 0.0000 0.0000 +vn -1.0000 0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 0.0000 0.0000 1.0000 +vn 0.0000 1.0000 0.0000 +vn 0.0000 -1.0000 0.0000 +s off +f 46/41/31 43/42/31 48/43/31 +f 49/44/32 44/45/32 47/46/32 +f 47/46/33 45/47/33 46/41/33 +f 48/43/34 42/48/34 49/44/34 +f 43/42/35 44/45/35 42/48/35 +f 47/46/36 48/43/36 49/44/36 +f 46/41/31 45/47/31 43/42/31 +f 49/44/32 42/48/32 44/45/32 +f 47/46/33 44/45/33 45/47/33 +f 48/43/34 43/42/34 42/48/34 +f 43/42/35 45/47/35 44/45/35 +f 47/46/36 46/41/36 48/43/36 diff --git a/src/main/resources/assets/hbm/textures/items/circuit_targeting_tier1.png b/src/main/resources/assets/hbm/textures/items/circuit_targeting_tier1.png index 5e65de4c294714daca65f98997131cf4a3417feb..88f593cc1323cd133034e4ebb947cd5f0d115a24 100644 GIT binary patch delta 317 zcmV-D0mA;w0@wnOB!2{RLP=Bz2nYy#2xN!=009q4L_t(IjqQ;kZo@zjMZc?R0+y#& zac|)E1_@i(mDbcSt`wO$B$5x311w(dQ*4Nd4ZP$R*~&JlN(=g>)zg4CtC<1*v!*Bt zI_K!UXW#eKS~G;eaU4mK)>=ODo)%d|&~+V@QaGJX5D^@YM}H`#P?jZPjL=%&HF*XA z5rK$cv)Mo?mDJNTA;!2qV+^<3Ee;<<_VSr!0N}mn`Fvi*MV{w5k*&4J^E|s7;Z|~=dEW5{se-3THArBw3sG)+l;xm+>;=(=yqu-1|!$8lr`fm&bE!!RVgUatv%ZLoh&`Sv;_{G0g#0jab*=;5T5 P00000NkvXXu0mjfmZp&t delta 305 zcmV-10nYx|0?Y!CB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pF8FWQhbW?9;ba!ELWdLwtX>N2bZe?^JG%heMGBNQWX_Wu~0K7>= zK~y+T?UJz#!Y~j;y{1>l5_kd%izbx|B-|RMvsi#pnBwp=Ie%~>ESEGy`uaNg?&;qt z#{9qc1un)&jIk=EB)3xIDCaEqQg_eAunNGn)JP#XfG#AIM+781jiKs#CyL*0QR00000NkvXXu0mjf D&?74iG-+D6$pVvNgt2U z8#K=lI6|+Gui&B=2n@<73f$GIXi-8frjNlX`_Mbw7UK-w6xz1vz~$VtI6pZ2fqxPI zGqIhL)odLs#KA%wD-Xjs$wa*z=2-f?!_jn&^aW(hw4@pZ9e<)Yp87!E;-DG@)hJGr z6n=Z~*FBAv^0LB@pM!_@+7Un^w8in|BARG|@48xGRuA{IeK@vqm0N}C0 z<=WF&Q1W4-Q}W;b=sn_jhxAOC-J6ttu{xq-x&0E9Dp7&ljSOHjwRyy1G3*xNAc-PT zCeY3V@oWVE5n^%BZVbYG_j0*hCIC<>{kX#7<(xc>q`l282MbpX93)>MT3*hbrEtAd z@412^!!TsGo2IFFKMiyT+qM00000NkvXX Hu0mjfims{e delta 323 zcmV-J0lfZ{1MUKlG=C*YL_t(IjqQ;?OT$1I#(!5L=1(bPu>Amjhf2jogn~tfj_KCX zo86P_S1qmePPWesntnr3;f$P;R9NYdYD^v1QWbf zNjkP#$nvfrIdNKu_jHcyx?K5th*2o&3a<)w1yoRN8g$jE+o_bMsQ`%MZUTUrspgMW zJ6=yLyj58TGdv(Uv>_?JZ9$WiQguBD0?mI?uRG*b2LA4#Wu`^^pa1{>07*qoM6N<$f>3UmH2?qr delta 307 zcmV-30nGm80?q=EB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pF8FWQhbW?9;ba!ELWdLwtX>N2bZe?^JG%heMGBNQWX_Wu~0KQ2? zK~y+T?UFGH0x=XsQ+P%p7B)5#h>#{t3R9)aDLjIw5(^6(8-MvSUuMlNhLko2hGE&C z$IK_j{Li$3l#)DlM)lkqDW#}Ga#%^NRl4iKWeR|tvx*Qn09{CoQ6NC>Tcb`0fB+EU zoYQ}DIerq|Hbwz0sD&^Ms(h^xLJ$Z5!dMB3+Dg`1L5f)d@4W(`>w2DMS*g27KyaC2 z8YCiQ_-GLgLo9Se$2WZlKtBx8m%t(5e0l?VJ_P(^-~~s)-3e|^SF`{C002ovPDHLk FV1mBja6kY6 diff --git a/src/main/resources/assets/hbm/textures/items/circuit_targeting_tier4.png b/src/main/resources/assets/hbm/textures/items/circuit_targeting_tier4.png index b5188f3c53d0f7bf7f867920ea47098a50bd5d67..9f0ade52dfcc4e19dd8ace11aea925dfdc461918 100644 GIT binary patch delta 301 zcmV+|0n+~40@wnOG=C3CL_t(IjqQ;=PQySDg};fMm7E5N!ldII6gdFgz)1Wk9h)F3 z>V%q-kP;FoTyY9cfqwI#!OlV?S_)qC_7&foSq=P4s#m9{dS}1{U;?Dy zMkk-E+(b^=@NguX3pzc;gwSlE_a)MAv&*U>ob@U2l4z57DN*u>( ztyO&+X#E9ma?_veN^n#qNsMhe$B(Mh*$S8=r(5V~25!F0T?fy%Kd#`(TC3|m z91cC-q{e#4vL?*)G)+DKwczl;_x-)h^S`MDxEO+T@-^D?00000NkvXXu0mjfhNh6K delta 304 zcmV-00nh%}0^0(RG=CCFL_t(IjqQ&=OT$1Iho38MX{AoCrHgwv!7pHN%9hp-5Dpy0 z(X8Ss#V^oi>lFML-CVOdBuFo4j*hQG{xqQhR|kJ^Jlws!55I%|v=U2_AW4E)8wkU9 zu{IEE0}*)^b&*Qn)}USnm`-B=9Oo7agL8fdfEu|adnA?MtA9F>=Ky*6To}^y6#)78 z1VC#oVHk>}j{=|oHXFqA)-CU8#qr^3c!qqxq13%PYT$VZQjZ`wf4c6-&dQ6m@M z_eE>nG&m`z7I1(a`+e=MCH0raP#B^pQUJ?kIce2-lGW;=xh)p!strsgFq_4|O{e}* zwARvQ7=|78Whv0U7-KrjvaG{j1#`E{>r2z&-^>r9jd++K8#2`Z00009-euzzND7xp zjek5Gu#O@S5r_!J7}n$rKzmq9iNN!iudQvvL1EtjaRMKGIzh)@*8k6&QYTDvaOG-d45plhnCVl2y&@z(~= gPn_{x#rQY%4Xa3?JZXPq_y7O^07*qoM6N<$g8M*~jsO4v delta 316 zcmV-C0mJ_30@nhNB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pF8FWQhbW?9;ba!ELWdLwtX>N2bZe?^JG%heMGBNQWX_Wu~0LMv0 zK~y+T?UFGH0x=Xs|3OluNRuYjUM5#aV{2zB58w#|J6l0)J%51*@B~}fc!4jIWi-1O zQrZ|8hQQBb<`a?sd2e8M7xms3g%I@kkmArV40?WwHrIv66af2CiU@%N(1dJnq7Wd? zx#ENX2mm1|CCxdjj+;*+Yi$A4pc=w7sPeVO`YH+mKo~0_QC%sL7yyXPf~UPZ zC5ng=opZQpF8FWQhbW?9;ba!ELWdLwtX>N2bZe?^JG%heMGBNQWX_Wu~0MAK8 zK~y+T?UEr1LO~QoUv(D-i$OsIK`cMnT)=dL3|K5Cae_Pf)qiHOSpNca16G4>;mLh+ zb^ga;qQ!yBW#G->-p7di&wB&?$x17^nl5tJ@pNMjJzA>8Y^TX};V}ikuvnW2fdi0) zbVo~t06EIpoDcv3AjEsGAq3Ui_LFEYl>uT<3}G5n`C6khSSSPlVXTBiaV6)RB1J7h zyEiugRLZHAraf6Hxky0pm|_|vA|(515e-9hEDLvf7Jz;jqBntAz@dBrQl16;WZ(%+ WkHpO-zkbvJ0000Yj6;7IvC-z?9#`7?jm~+Mr2;wzt@|+e*!~DD5H+=b^gd-l~O;ayk|2qR?S`7 z!Qi=XV;QgN!MlOK^w(I{8Esy@dixub56-&#q!s7O#Y?UO8qVP9>gTe~DWM4f8>TZ& literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/envsuit_helmet.png b/src/main/resources/assets/hbm/textures/items/envsuit_helmet.png new file mode 100644 index 0000000000000000000000000000000000000000..e0b2d4a0774c307d25528f8afd7499a255b8d602 GIT binary patch literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf+o)#?<5wM97@y&|OYDK(U5mcf@RYlRH!vREC(&yt#2@ y78}FuZMA9z4i`wEpaOp${iSV^LIX0;}CRei7J0!fCyJ7EU8SkyGa}O8Z$ge6=aE--FFpHVtDgB zdCoN9jh>HPJ9gjJ=BSB~(syuqGbj1EjIiMUN3LuQax;!~^Yj>=%)k8OMB`So*U@jR e1K$6azPBbe^Y>+4Ay%O07(8A5T-G@yGywo!5O9D1 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/envsuit_plate.png b/src/main/resources/assets/hbm/textures/items/envsuit_plate.png new file mode 100644 index 0000000000000000000000000000000000000000..de43d9705a96b1888466fdf4d3a264154ae7599d GIT binary patch literal 258 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vfbf6=RF2tFvGOEO)unBl$g-Y%!R3rkIZgA-`&mp z$CicR*0#6F%}Z|FQkp+;ipqjj9EvKNR`E^y9Ld3`vUEmKQ0SCY%U978JD3>0J-1%9 z% Date: Sat, 5 Aug 2023 20:09:21 +0200 Subject: [PATCH 2/2] NEI handlers, more suffering --- changelog | 4 +++ .../handler/nei/ElectrolyserFluidHandler.java | 27 +++++++++++++++++++ .../handler/nei/ElectrolyserMetalHandler.java | 27 +++++++++++++++++++ .../inventory/recipes/ChemplantRecipes.java | 9 +------ .../recipes/ElectrolyserFluidRecipes.java | 23 ++++++++++++++++ .../recipes/ElectrolyserMetalRecipes.java | 23 ++++++++++++++++ .../hbm/inventory/recipes/MixerRecipes.java | 2 +- src/main/java/com/hbm/main/NEIConfig.java | 2 ++ 8 files changed, 108 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/hbm/handler/nei/ElectrolyserFluidHandler.java create mode 100644 src/main/java/com/hbm/handler/nei/ElectrolyserMetalHandler.java diff --git a/changelog b/changelog index 34c06cd90..b2534b4d8 100644 --- a/changelog +++ b/changelog @@ -14,6 +14,10 @@ * All current nether bedrock ores are tier 1 and do not require any bore fluid * Custom machines now show their recipes in NEI * All it took was battling NEI's source code for 3 hours and my sanity +* The chlorocalcite centrifugation process now requires 8,000mB of sulfuric acid instead of 100mB of water +* Mixed chlorocalcite solution now requires flux as a reducing agent +* All chlorine producing electrolysis recipes have been moved to the electrolysis machine and can no longer be done in the chemical plant + * If only there was a much simpler recipe that may have existed at some point, life could be a dream ## Fixed * Fixed custom machines not sending fluid diff --git a/src/main/java/com/hbm/handler/nei/ElectrolyserFluidHandler.java b/src/main/java/com/hbm/handler/nei/ElectrolyserFluidHandler.java new file mode 100644 index 000000000..11af20db8 --- /dev/null +++ b/src/main/java/com/hbm/handler/nei/ElectrolyserFluidHandler.java @@ -0,0 +1,27 @@ +package com.hbm.handler.nei; + +import java.awt.Rectangle; + +import com.hbm.blocks.ModBlocks; +import com.hbm.inventory.gui.GUIElectrolyserFluid; +import com.hbm.inventory.recipes.ElectrolyserFluidRecipes; + +public class ElectrolyserFluidHandler extends NEIUniversalHandler { + + public ElectrolyserFluidHandler() { + super("Electrolysis", ModBlocks.machine_electrolyser, ElectrolyserFluidRecipes.getRecipes()); + } + + @Override + public String getKey() { + return "ntmElectrolysisFluid"; + } + + @Override + public void loadTransferRects() { + super.loadTransferRects(); + transferRectsGui.add(new RecipeTransferRect(new Rectangle(57, 15, 12, 40), "ntmElectrolysisFluid")); + guiGui.add(GUIElectrolyserFluid.class); + RecipeTransferRectHandler.registerRectsToGuis(guiGui, transferRectsGui); + } +} diff --git a/src/main/java/com/hbm/handler/nei/ElectrolyserMetalHandler.java b/src/main/java/com/hbm/handler/nei/ElectrolyserMetalHandler.java new file mode 100644 index 000000000..f1d5b6e68 --- /dev/null +++ b/src/main/java/com/hbm/handler/nei/ElectrolyserMetalHandler.java @@ -0,0 +1,27 @@ +package com.hbm.handler.nei; + +import java.awt.Rectangle; + +import com.hbm.blocks.ModBlocks; +import com.hbm.inventory.gui.GUIElectrolyserMetal; +import com.hbm.inventory.recipes.ElectrolyserMetalRecipes; + +public class ElectrolyserMetalHandler extends NEIUniversalHandler { + + public ElectrolyserMetalHandler() { + super("Electrolysis", ModBlocks.machine_electrolyser, ElectrolyserMetalRecipes.getRecipes()); + } + + @Override + public String getKey() { + return "ntmElectrolysisMetal"; + } + + @Override + public void loadTransferRects() { + super.loadTransferRects(); + transferRectsGui.add(new RecipeTransferRect(new Rectangle(2, 35, 22, 25), "ntmElectrolysisMetal")); + guiGui.add(GUIElectrolyserMetal.class); + RecipeTransferRectHandler.registerRectsToGuis(guiGui, transferRectsGui); + } +} diff --git a/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java b/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java index 62ba87dfa..a8a582fe6 100644 --- a/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java @@ -399,15 +399,8 @@ public class ChemplantRecipes extends SerializableRecipe { .inputFluids(new FluidStack(Fluids.MUSTARDGAS, 4000)) .outputItems(new ItemStack(ModItems.ammo_arty, 1, 11))); recipes.add(new ChemRecipe(101, "CC_CENTRIFUGE", 200) - .inputFluids(new FluidStack(Fluids.CHLOROCALCITE_CLEANED, 500), new FluidStack(Fluids.WATER, 1_000)) + .inputFluids(new FluidStack(Fluids.CHLOROCALCITE_CLEANED, 500), new FluidStack(Fluids.SULFURIC_ACID, 8_000)) .outputFluids(new FluidStack(Fluids.POTASSIUM_CHLORIDE, 250), new FluidStack(Fluids.CALCIUM_CHLORIDE, 250))); - recipes.add(new ChemRecipe(102, "PC_ELECTROLYSIS", 200) - .inputFluids(new FluidStack(Fluids.POTASSIUM_CHLORIDE, 250)) - .outputItems(new ItemStack(ModItems.dust)) - .outputFluids(new FluidStack(Fluids.CHLORINE, 125))); - recipes.add(new ChemRecipe(103, "CC_ELECTROLYSIS", 200) - .inputFluids(new FluidStack(Fluids.CALCIUM_CHLORIDE, 250)) - .outputFluids(new FluidStack(Fluids.CHLORINE, 125), new FluidStack(Fluids.CALCIUM_SOLUTION, 125))); } public static void registerFuelProcessing() { diff --git a/src/main/java/com/hbm/inventory/recipes/ElectrolyserFluidRecipes.java b/src/main/java/com/hbm/inventory/recipes/ElectrolyserFluidRecipes.java index 6eee6ba55..0f783b9f9 100644 --- a/src/main/java/com/hbm/inventory/recipes/ElectrolyserFluidRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/ElectrolyserFluidRecipes.java @@ -1,7 +1,9 @@ package com.hbm.inventory.recipes; import java.io.IOException; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map.Entry; import com.google.gson.JsonElement; @@ -10,8 +12,10 @@ import com.google.gson.stream.JsonWriter; import com.hbm.inventory.FluidStack; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; +import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.inventory.recipes.loader.SerializableRecipe; import com.hbm.items.ModItems; +import com.hbm.items.machine.ItemFluidIcon; import net.minecraft.item.ItemStack; @@ -28,6 +32,25 @@ public class ElectrolyserFluidRecipes extends SerializableRecipe { recipes.put(Fluids.CALCIUM_CHLORIDE, new ElectrolysisRecipe(250, new FluidStack(Fluids.CHLORINE, 125), new FluidStack(Fluids.CALCIUM_SOLUTION, 125))); } + public static HashMap getRecipes() { + + HashMap recipes = new HashMap(); + + for(Entry entry : ElectrolyserFluidRecipes.recipes.entrySet()) { + + ElectrolysisRecipe recipe = entry.getValue(); + FluidStack input = new FluidStack(entry.getKey(), recipe.amount); + List outputs = new ArrayList(); + if(recipe.output1.type != Fluids.NONE) outputs.add(ItemFluidIcon.make(recipe.output1)); + if(recipe.output2.type != Fluids.NONE) outputs.add(ItemFluidIcon.make(recipe.output2)); + for(ItemStack byproduct : recipe.byproduct) outputs.add(byproduct); + + recipes.put(new ComparableStack(ItemFluidIcon.make(input)), outputs.toArray()); + } + + return recipes; + } + @Override public String getFileName() { return "hbmElectrolyzerFluid.json"; diff --git a/src/main/java/com/hbm/inventory/recipes/ElectrolyserMetalRecipes.java b/src/main/java/com/hbm/inventory/recipes/ElectrolyserMetalRecipes.java index d5d3fe492..781d7a1da 100644 --- a/src/main/java/com/hbm/inventory/recipes/ElectrolyserMetalRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/ElectrolyserMetalRecipes.java @@ -1,6 +1,7 @@ package com.hbm.inventory.recipes; import java.io.IOException; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map.Entry; @@ -12,11 +13,14 @@ import com.google.gson.stream.JsonWriter; import com.hbm.inventory.RecipesCommon.AStack; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.inventory.RecipesCommon.OreDictStack; +import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.material.MaterialShapes; import com.hbm.inventory.material.Mats; import com.hbm.inventory.material.Mats.MaterialStack; import com.hbm.inventory.recipes.loader.SerializableRecipe; import com.hbm.items.ModItems; +import com.hbm.items.machine.ItemFluidIcon; +import com.hbm.items.machine.ItemScraps; import com.hbm.util.ItemStackUtil; import net.minecraft.item.ItemStack; @@ -55,6 +59,25 @@ public class ElectrolyserMetalRecipes extends SerializableRecipe { return null; } + public static HashMap getRecipes() { + + HashMap recipes = new HashMap(); + + for(Entry entry : ElectrolyserMetalRecipes.recipes.entrySet()) { + + ElectrolysisMetalRecipe recipe = entry.getValue(); + Object[] input = new Object[] { entry.getKey().copy(), new ComparableStack(ItemFluidIcon.make(Fluids.NITRIC_ACID, 100)) }; + List outputs = new ArrayList(); + if(recipe.output1 != null) outputs.add(ItemScraps.create(recipe.output1, true)); + if(recipe.output2 != null) outputs.add(ItemScraps.create(recipe.output2, true)); + for(ItemStack byproduct : recipe.byproduct) outputs.add(byproduct); + + recipes.put(input, outputs.toArray()); + } + + return recipes; + } + @Override public String getFileName() { return "hbmElectrolyzerMetal.json"; diff --git a/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java b/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java index 0a68397d6..d47d2289c 100644 --- a/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java @@ -79,7 +79,7 @@ public class MixerRecipes extends SerializableRecipe { register(Fluids.CHLOROCALCITE_SOLUTION, new MixerRecipe(500, 50).setStack1(new FluidStack(Fluids.WATER, 250)).setStack2(new FluidStack(Fluids.NITRIC_ACID, 250)).setSolid(new OreDictStack(CHLOROCALCITE.dust()))); - register(Fluids.CHLOROCALCITE_MIX, new MixerRecipe(1000, 50).setStack1(new FluidStack(Fluids.CHLOROCALCITE_SOLUTION, 500)).setStack2(new FluidStack(Fluids.SULFURIC_ACID, 500))); + register(Fluids.CHLOROCALCITE_MIX, new MixerRecipe(1000, 50).setStack1(new FluidStack(Fluids.CHLOROCALCITE_SOLUTION, 500)).setStack2(new FluidStack(Fluids.SULFURIC_ACID, 500)).setSolid(new ComparableStack(ModItems.powder_flux))); } public static void register(FluidType type, MixerRecipe... rec) { diff --git a/src/main/java/com/hbm/main/NEIConfig.java b/src/main/java/com/hbm/main/NEIConfig.java index c5bc758a2..7ce0ffd04 100644 --- a/src/main/java/com/hbm/main/NEIConfig.java +++ b/src/main/java/com/hbm/main/NEIConfig.java @@ -73,6 +73,8 @@ public class NEIConfig implements IConfigureNEI { registerHandler(new SawmillHandler()); registerHandler(new MixerHandler()); registerHandler(new OutgasserHandler()); + registerHandler(new ElectrolyserFluidHandler()); + registerHandler(new ElectrolyserMetalHandler()); for(MachineConfiguration conf : CustomMachineConfigJSON.niceList) registerHandlerBypass(new CustomMachineHandler(conf));