From b31105d4d18915baf7b8bbff7f050c02eded30cc Mon Sep 17 00:00:00 2001 From: RosaTryp <98919832+RosaTryp@users.noreply.github.com> Date: Mon, 12 Aug 2024 00:55:26 +0200 Subject: [PATCH 01/17] Added config options to steam turbine --- .../machine/TileEntityMachineTurbine.java | 45 ++++++++++++++++--- 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbine.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbine.java index 94cf03e3b..b7cc59fb7 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbine.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbine.java @@ -1,5 +1,9 @@ package com.hbm.tileentity.machine; +import java.io.IOException; + +import com.google.gson.JsonObject; +import com.google.gson.stream.JsonWriter; import com.hbm.handler.CompatHandler; import com.hbm.interfaces.IFluidContainer; import com.hbm.inventory.container.ContainerMachineTurbine; @@ -12,6 +16,7 @@ import com.hbm.inventory.gui.GUIMachineTurbine; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.PacketDispatcher; +import com.hbm.tileentity.IConfigurableMachine; import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityLoadedBase; import com.hbm.util.CompatEnergyControl; @@ -39,12 +44,11 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @Optional.InterfaceList({@Optional.Interface(iface = "li.cil.oc.api.network.SimpleComponent", modid = "OpenComputers")}) -public class TileEntityMachineTurbine extends TileEntityLoadedBase implements ISidedInventory, IFluidContainer, IEnergyProviderMK2, IFluidStandardTransceiver, IGUIProvider, SimpleComponent, IInfoProviderEC, CompatHandler.OCComponent { +public class TileEntityMachineTurbine extends TileEntityLoadedBase implements ISidedInventory, IFluidContainer, IEnergyProviderMK2, IFluidStandardTransceiver, IGUIProvider, SimpleComponent, IInfoProviderEC, CompatHandler.OCComponent, IConfigurableMachine { private ItemStack slots[]; public long power; - public static final long maxPower = 1000000; public int age = 0; public FluidTank[] tanks; @@ -55,11 +59,40 @@ public class TileEntityMachineTurbine extends TileEntityLoadedBase implements IS private String customName; protected double[] info = new double[3]; + //Configurable values + public static long maxPower = 1_000_000; + public static int inputTankSize = 64_000; + public static int outputTankSize = 128_000; + public static int maxSteamPerTick = 6_000; + public static double efficiency = 0.85D; + public TileEntityMachineTurbine() { slots = new ItemStack[7]; tanks = new FluidTank[2]; - tanks[0] = new FluidTank(Fluids.STEAM, 64000, 0); - tanks[1] = new FluidTank(Fluids.SPENTSTEAM, 128000, 1); + tanks[0] = new FluidTank(Fluids.STEAM, inputTankSize, 0); + tanks[1] = new FluidTank(Fluids.SPENTSTEAM, outputTankSize, 1); + } + @Override + public String getConfigName() { + return "steamturbine"; + } + + @Override + public void readIfPresent(JsonObject obj) { + maxPower = IConfigurableMachine.grab(obj, "L:maxPower", maxPower); + inputTankSize = IConfigurableMachine.grab(obj, "I:inputTankSize", inputTankSize); + outputTankSize = IConfigurableMachine.grab(obj, "I:outputTankSize", outputTankSize); + maxSteamPerTick = IConfigurableMachine.grab(obj, "I:maxSteamPerTick", maxSteamPerTick); + efficiency = IConfigurableMachine.grab(obj, "D:efficiency", efficiency); + } + + @Override + public void writeConfig(JsonWriter writer) throws IOException { + writer.name("L:maxPower").value(maxPower); + writer.name("I:inputTankSize").value(inputTankSize); + writer.name("I:outputTankSize").value(outputTankSize); + writer.name("I:maxSteamPerTick").value(maxSteamPerTick); + writer.name("D:efficiency").value(efficiency); } @Override @@ -249,12 +282,12 @@ public class TileEntityMachineTurbine extends TileEntityLoadedBase implements IS boolean valid = false; if(in.hasTrait(FT_Coolable.class)) { FT_Coolable trait = in.getTrait(FT_Coolable.class); - double eff = trait.getEfficiency(CoolingType.TURBINE) * 0.85D; //small turbine is only 85% efficient + double eff = trait.getEfficiency(CoolingType.TURBINE) * efficiency; //small turbine is only 85% efficient by default if(eff > 0) { tanks[1].setTankType(trait.coolsTo); int inputOps = tanks[0].getFill() / trait.amountReq; int outputOps = (tanks[1].getMaxFill() - tanks[1].getFill()) / trait.amountProduced; - int cap = 6_000 / trait.amountReq; + int cap = maxSteamPerTick / trait.amountReq; int ops = Math.min(inputOps, Math.min(outputOps, cap)); tanks[0].setFill(tanks[0].getFill() - ops * trait.amountReq); tanks[1].setFill(tanks[1].getFill() + ops * trait.amountProduced); From bcdd52246410b92282584b980290af269711a7e1 Mon Sep 17 00:00:00 2001 From: RosaTryp <98919832+RosaTryp@users.noreply.github.com> Date: Mon, 12 Aug 2024 01:26:20 +0200 Subject: [PATCH 02/17] Added config options for industrial steam turbine --- .../TileEntityMachineLargeTurbine.java | 42 ++++++++++++++++--- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineLargeTurbine.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineLargeTurbine.java index 6cb9024f0..3ff9b9f5b 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineLargeTurbine.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineLargeTurbine.java @@ -3,7 +3,10 @@ package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; import java.util.Random; +import java.io.IOException; +import com.google.gson.JsonObject; +import com.google.gson.stream.JsonWriter; import com.hbm.blocks.BlockDummyable; import com.hbm.handler.CompatHandler; import com.hbm.interfaces.IFluidAcceptor; @@ -19,6 +22,7 @@ import com.hbm.inventory.gui.GUIMachineLargeTurbine; import com.hbm.lib.Library; import com.hbm.main.MainRegistry; import com.hbm.sound.AudioWrapper; +import com.hbm.tileentity.IConfigurableMachine; import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.util.CompatEnergyControl; @@ -44,10 +48,9 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @Optional.InterfaceList({@Optional.Interface(iface = "li.cil.oc.api.network.SimpleComponent", modid = "OpenComputers")}) -public class TileEntityMachineLargeTurbine extends TileEntityMachineBase implements IFluidContainer, IFluidAcceptor, IFluidSource, IEnergyProviderMK2, IFluidStandardTransceiver, IGUIProvider, SimpleComponent, IInfoProviderEC, CompatHandler.OCComponent { +public class TileEntityMachineLargeTurbine extends TileEntityMachineBase implements IFluidContainer, IFluidAcceptor, IFluidSource, IEnergyProviderMK2, IFluidStandardTransceiver, IGUIProvider, SimpleComponent, IInfoProviderEC, CompatHandler.OCComponent, IConfigurableMachine { public long power; - public static final long maxPower = 100000000; public int age = 0; public List list2 = new ArrayList(); public FluidTank[] tanks; @@ -61,17 +64,46 @@ public class TileEntityMachineLargeTurbine extends TileEntityMachineBase impleme private AudioWrapper audio; private float audioDesync; + //Configurable Values + public static long maxPower = 100000000; + public static int inputTankSize = 512_000; + public static int outputTankSize = 10_240_000; + public static double efficiency = 1.0; + + public TileEntityMachineLargeTurbine() { super(7); tanks = new FluidTank[2]; - tanks[0] = new FluidTank(Fluids.STEAM, 512000, 0); - tanks[1] = new FluidTank(Fluids.SPENTSTEAM, 10240000, 1); + tanks[0] = new FluidTank(Fluids.STEAM, inputTankSize, 0); + tanks[1] = new FluidTank(Fluids.SPENTSTEAM, outputTankSize, 1); Random rand = new Random(); audioDesync = rand.nextFloat() * 0.05F; } + @Override + public String getConfigName() { + return "steamturbineIndustrial"; + } + + @Override + public void readIfPresent(JsonObject obj) { + maxPower = IConfigurableMachine.grab(obj, "L:maxPower", maxPower); + inputTankSize = IConfigurableMachine.grab(obj, "I:inputTankSize", inputTankSize); + outputTankSize = IConfigurableMachine.grab(obj, "I:outputTankSize", outputTankSize); + efficiency = IConfigurableMachine.grab(obj, "D:efficiency", efficiency); + } + + @Override + public void writeConfig(JsonWriter writer) throws IOException { + writer.name("L:maxPower").value(maxPower); + writer.name("INFO").value("industrial steam turbine consumes 20% of availible steam per tick"); + writer.name("I:inputTankSize").value(inputTankSize); + writer.name("I:outputTankSize").value(outputTankSize); + writer.name("D:efficiency").value(efficiency); + } + @Override public String getName() { return "container.machineLargeTurbine"; @@ -106,7 +138,7 @@ public class TileEntityMachineLargeTurbine extends TileEntityMachineBase impleme boolean valid = false; if(in.hasTrait(FT_Coolable.class)) { FT_Coolable trait = in.getTrait(FT_Coolable.class); - double eff = trait.getEfficiency(CoolingType.TURBINE); //100% efficiency + double eff = trait.getEfficiency(CoolingType.TURBINE) * efficiency; //100% efficiency by default if(eff > 0) { tanks[1].setTankType(trait.coolsTo); int inputOps = (int) Math.floor(tanks[0].getFill() / trait.amountReq); //amount of cycles possible with the entire input buffer From 8e4d4418b60b69fd66782540d40e3a01b32541c5 Mon Sep 17 00:00:00 2001 From: RosaTryp <98919832+RosaTryp@users.noreply.github.com> Date: Mon, 12 Aug 2024 13:56:45 +0200 Subject: [PATCH 03/17] Configuration options for ashpit, leviathan turbine and all condensers --- .../tileentity/machine/TileEntityAshpit.java | 48 ++++++++++++++++--- .../tileentity/machine/TileEntityChungus.java | 43 +++++++++++++++-- .../machine/TileEntityCondenser.java | 34 +++++++++++-- .../machine/TileEntityCondenserPowered.java | 38 +++++++++++++-- .../machine/TileEntityTowerLarge.java | 30 +++++++++++- .../machine/TileEntityTowerSmall.java | 30 +++++++++++- 6 files changed, 200 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityAshpit.java b/src/main/java/com/hbm/tileentity/machine/TileEntityAshpit.java index 183c48ad6..acefaf0f2 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityAshpit.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityAshpit.java @@ -1,10 +1,15 @@ package com.hbm.tileentity.machine; +import java.io.IOException; + +import com.google.gson.JsonObject; +import com.google.gson.stream.JsonWriter; import com.hbm.inventory.OreDictManager.DictFrame; import com.hbm.inventory.container.ContainerAshpit; import com.hbm.inventory.gui.GUIAshpit; import com.hbm.items.ItemEnums.EnumAshType; import com.hbm.items.ModItems; +import com.hbm.tileentity.IConfigurableMachine; import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; @@ -19,7 +24,7 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -public class TileEntityAshpit extends TileEntityMachineBase implements IGUIProvider { +public class TileEntityAshpit extends TileEntityMachineBase implements IGUIProvider, IConfigurableMachine { private int playersUsing = 0; public float doorAngle = 0; @@ -32,10 +37,40 @@ public class TileEntityAshpit extends TileEntityMachineBase implements IGUIProvi public int ashLevelFly; public int ashLevelSoot; + //Configurable values + public static int thresholdWood = 2000; + public static int thresholdCoal = 2000; + public static int thresholdMisc = 2000; + public static int thresholdFly = 2000; + public static int thresholdSoot = 8000; + public TileEntityAshpit() { super(5); } + @Override + public String getConfigName() { + return "ashpit"; + } + + @Override + public void readIfPresent(JsonObject obj) { + thresholdWood = IConfigurableMachine.grab(obj, "I:thresholdWood", thresholdWood); + thresholdCoal = IConfigurableMachine.grab(obj, "I:thresholdCoal", thresholdCoal); + thresholdMisc = IConfigurableMachine.grab(obj, "I:thresholdMisc", thresholdMisc); + thresholdFly = IConfigurableMachine.grab(obj, "I:thresholdFly", thresholdFly); + thresholdSoot = IConfigurableMachine.grab(obj, "I:thresholdSoot", thresholdSoot); + } + + @Override + public void writeConfig(JsonWriter writer) throws IOException { + writer.name("I:thresholdWood").value(thresholdWood); + writer.name("I:thresholdCoal").value(thresholdCoal); + writer.name("I:thresholdMisc").value(thresholdMisc); + writer.name("I:thresholdFly").value(thresholdFly); + writer.name("I:thresholdSoot").value(thresholdSoot); + } + @Override public void openInventory() { if(!worldObj.isRemote) this.playersUsing++; @@ -56,13 +91,12 @@ public class TileEntityAshpit extends TileEntityMachineBase implements IGUIProvi if(!worldObj.isRemote) { - int threshold = 2000; - if(processAsh(ashLevelWood, EnumAshType.WOOD, threshold)) ashLevelWood -= threshold; - if(processAsh(ashLevelCoal, EnumAshType.COAL, threshold)) ashLevelCoal -= threshold; - if(processAsh(ashLevelMisc, EnumAshType.MISC, threshold)) ashLevelMisc -= threshold; - if(processAsh(ashLevelFly, EnumAshType.FLY, threshold)) ashLevelFly -= threshold; - if(processAsh(ashLevelSoot, EnumAshType.SOOT, threshold * 4)) ashLevelSoot -= threshold * 4; + if(processAsh(ashLevelWood, EnumAshType.WOOD, thresholdWood)) ashLevelWood -= thresholdWood; + if(processAsh(ashLevelCoal, EnumAshType.COAL, thresholdCoal)) ashLevelCoal -= thresholdCoal; + if(processAsh(ashLevelMisc, EnumAshType.MISC, thresholdMisc)) ashLevelMisc -= thresholdMisc; + if(processAsh(ashLevelFly, EnumAshType.FLY, thresholdFly)) ashLevelFly -= thresholdFly; + if(processAsh(ashLevelSoot, EnumAshType.SOOT, thresholdSoot)) ashLevelSoot -= thresholdSoot; isFull = false; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityChungus.java b/src/main/java/com/hbm/tileentity/machine/TileEntityChungus.java index d993b0ce5..49b3df6ac 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityChungus.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityChungus.java @@ -3,7 +3,10 @@ package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; import java.util.Random; +import java.io.IOException; +import com.google.gson.JsonObject; +import com.google.gson.stream.JsonWriter; import com.hbm.blocks.BlockDummyable; import com.hbm.handler.CompatHandler; import com.hbm.interfaces.IFluidAcceptor; @@ -18,6 +21,7 @@ import com.hbm.main.MainRegistry; import com.hbm.packet.NBTPacket; import com.hbm.packet.PacketDispatcher; import com.hbm.sound.AudioWrapper; +import com.hbm.tileentity.IConfigurableMachine; import com.hbm.tileentity.INBTPacketReceiver; import com.hbm.tileentity.TileEntityLoadedBase; import com.hbm.util.CompatEnergyControl; @@ -41,10 +45,9 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.util.ForgeDirection; @Optional.InterfaceList({@Optional.Interface(iface = "li.cil.oc.api.network.SimpleComponent", modid = "OpenComputers")}) -public class TileEntityChungus extends TileEntityLoadedBase implements IFluidAcceptor, IFluidSource, IEnergyProviderMK2, INBTPacketReceiver, IFluidStandardTransceiver, SimpleComponent, IInfoProviderEC, CompatHandler.OCComponent { +public class TileEntityChungus extends TileEntityLoadedBase implements IFluidAcceptor, IFluidSource, IEnergyProviderMK2, INBTPacketReceiver, IFluidStandardTransceiver, SimpleComponent, IInfoProviderEC, CompatHandler.OCComponent, IConfigurableMachine { public long power; - public static final long maxPower = 100000000000L; private int turnTimer; public float rotor; public float lastRotor; @@ -57,16 +60,46 @@ public class TileEntityChungus extends TileEntityLoadedBase implements IFluidAcc private AudioWrapper audio; private float audioDesync; + + //Configurable values + public static long maxPower = 100000000000L; + public static int inputTankSize = 1_000_000_000; + public static int outputTankSize = 1_000_000_000; + public static double efficiency = 0.85D; public TileEntityChungus() { tanks = new FluidTank[2]; - tanks[0] = new FluidTank(Fluids.STEAM, 1000000000, 0); - tanks[1] = new FluidTank(Fluids.SPENTSTEAM, 1000000000, 1); + tanks[0] = new FluidTank(Fluids.STEAM, inputTankSize, 0); + tanks[1] = new FluidTank(Fluids.SPENTSTEAM, outputTankSize, 1); Random rand = new Random(); audioDesync = rand.nextFloat() * 0.05F; } + @Override + public String getConfigName() { + return "steamturbineLeviathan"; + } + + @Override + public void readIfPresent(JsonObject obj) { + maxPower = IConfigurableMachine.grab(obj, "L:maxPower", maxPower); + inputTankSize = IConfigurableMachine.grab(obj, "I:inputTankSize", inputTankSize); + outputTankSize = IConfigurableMachine.grab(obj, "I:outputTankSize", outputTankSize); + efficiency = IConfigurableMachine.grab(obj, "D:efficiency", efficiency); + } + + @Override + public void writeConfig(JsonWriter writer) throws IOException { + writer.name("L:maxPower").value(maxPower); + writer.name("INFO").value("leviathan steam turbine consumes all availible steam per tick"); + writer.name("I:inputTankSize").value(inputTankSize); + writer.name("I:outputTankSize").value(outputTankSize); + writer.name("D:efficiency").value(efficiency); + } + + + @Override public void updateEntity() { @@ -79,7 +112,7 @@ public class TileEntityChungus extends TileEntityLoadedBase implements IFluidAcc boolean valid = false; if(in.hasTrait(FT_Coolable.class)) { FT_Coolable trait = in.getTrait(FT_Coolable.class); - double eff = trait.getEfficiency(CoolingType.TURBINE) * 0.85D; //85% efficiency + double eff = trait.getEfficiency(CoolingType.TURBINE) * efficiency; //85% efficiency by default if(eff > 0) { tanks[1].setTankType(trait.coolsTo); int inputOps = tanks[0].getFill() / trait.amountReq; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityCondenser.java b/src/main/java/com/hbm/tileentity/machine/TileEntityCondenser.java index 2a13a059a..8d2730f8b 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityCondenser.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityCondenser.java @@ -1,8 +1,13 @@ package com.hbm.tileentity.machine; +import java.io.IOException; + +import com.google.gson.JsonObject; +import com.google.gson.stream.JsonWriter; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.saveddata.TomSaveData; +import com.hbm.tileentity.IConfigurableMachine; import com.hbm.tileentity.INBTPacketReceiver; import com.hbm.tileentity.TileEntityLoadedBase; import com.hbm.util.CompatEnergyControl; @@ -12,7 +17,7 @@ import api.hbm.tile.IInfoProviderEC; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.EnumSkyBlock; -public class TileEntityCondenser extends TileEntityLoadedBase implements IFluidStandardTransceiver, INBTPacketReceiver, IInfoProviderEC { +public class TileEntityCondenser extends TileEntityLoadedBase implements IFluidStandardTransceiver, INBTPacketReceiver, IInfoProviderEC, IConfigurableMachine { public int age = 0; public FluidTank[] tanks; @@ -20,11 +25,34 @@ public class TileEntityCondenser extends TileEntityLoadedBase implements IFluidS public int waterTimer = 0; protected int throughput; + //Configurable values + public static int inputTankSize = 100; + public static int outputTankSize = 100; + public TileEntityCondenser() { tanks = new FluidTank[2]; - tanks[0] = new FluidTank(Fluids.SPENTSTEAM, 100); - tanks[1] = new FluidTank(Fluids.WATER, 100); + tanks[0] = new FluidTank(Fluids.SPENTSTEAM, inputTankSize); + tanks[1] = new FluidTank(Fluids.WATER, outputTankSize); } + + @Override + public String getConfigName() { + return "condenser"; + } + + @Override + public void readIfPresent(JsonObject obj) { + inputTankSize = IConfigurableMachine.grab(obj, "I:inputTankSize", inputTankSize); + outputTankSize = IConfigurableMachine.grab(obj, "I:outputTankSize", outputTankSize); + } + + @Override + public void writeConfig(JsonWriter writer) throws IOException { + writer.name("I:inputTankSize").value(inputTankSize); + writer.name("I:outputTankSize").value(outputTankSize); + } + + @Override public void updateEntity() { diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityCondenserPowered.java b/src/main/java/com/hbm/tileentity/machine/TileEntityCondenserPowered.java index 65fa15e19..9aabea820 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityCondenserPowered.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityCondenserPowered.java @@ -1,8 +1,13 @@ package com.hbm.tileentity.machine; +import java.io.IOException; + +import com.google.gson.JsonObject; +import com.google.gson.stream.JsonWriter; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.tileentity.IConfigurableMachine; import com.hbm.util.fauxpointtwelve.DirPos; import api.hbm.energymk2.IEnergyReceiverMK2; @@ -16,16 +21,41 @@ import net.minecraftforge.common.util.ForgeDirection; public class TileEntityCondenserPowered extends TileEntityCondenser implements IEnergyReceiverMK2 { public long power; - public static final long maxPower = 10_000_000; public float spin; public float lastSpin; + //Configurable values + public static long maxPower = 10_000_000; + public static int inputTankSizeP = 1_000_000; + public static int outputTankSizeP = 1_000_000; + public static int powerConsumption = 10; + public TileEntityCondenserPowered() { tanks = new FluidTank[2]; - tanks[0] = new FluidTank(Fluids.SPENTSTEAM, 1_000_000); - tanks[1] = new FluidTank(Fluids.WATER, 1_000_000); + tanks[0] = new FluidTank(Fluids.SPENTSTEAM, inputTankSizeP); + tanks[1] = new FluidTank(Fluids.WATER, outputTankSizeP); } + @Override + public String getConfigName() { + return "condenserPowered"; + } + @Override + public void readIfPresent(JsonObject obj) { + maxPower = IConfigurableMachine.grab(obj, "L:maxPower", maxPower); + inputTankSizeP = IConfigurableMachine.grab(obj, "I:inputTankSize", inputTankSizeP); + outputTankSizeP = IConfigurableMachine.grab(obj, "I:outputTankSize", outputTankSizeP); + powerConsumption = IConfigurableMachine.grab(obj, "I:powerConsumption", powerConsumption); + } + + @Override + public void writeConfig(JsonWriter writer) throws IOException { + writer.name("L:maxPower").value(maxPower); + writer.name("I:inputTankSize").value(inputTankSizeP); + writer.name("I:outputTankSize").value(outputTankSizeP); + writer.name("I:powerConsumption").value(powerConsumption); + } + @Override public void updateEntity() { super.updateEntity(); @@ -63,7 +93,7 @@ public class TileEntityCondenserPowered extends TileEntityCondenser implements I @Override public void postConvert(int convert) { - this.power -= convert * 10; + this.power -= convert * powerConsumption; if(this.power < 0) this.power = 0; } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityTowerLarge.java b/src/main/java/com/hbm/tileentity/machine/TileEntityTowerLarge.java index 741988067..4e092d01c 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityTowerLarge.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityTowerLarge.java @@ -1,10 +1,15 @@ package com.hbm.tileentity.machine; +import java.io.IOException; + +import com.google.gson.JsonObject; +import com.google.gson.stream.JsonWriter; import com.hbm.config.GeneralConfig; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.IConfigurableMachine; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -15,12 +20,33 @@ import net.minecraftforge.common.util.ForgeDirection; public class TileEntityTowerLarge extends TileEntityCondenser { + //Configurable values + public static int inputTankSizeTL = 10_000; + public static int outputTankSizeTL = 10_000; + public TileEntityTowerLarge() { tanks = new FluidTank[2]; - tanks[0] = new FluidTank(Fluids.SPENTSTEAM, 10000); - tanks[1] = new FluidTank(Fluids.WATER, 10000); + tanks[0] = new FluidTank(Fluids.SPENTSTEAM, inputTankSizeTL); + tanks[1] = new FluidTank(Fluids.WATER, outputTankSizeTL); } + @Override + public String getConfigName() { + return "condenserTowerLarge"; + } + + @Override + public void readIfPresent(JsonObject obj) { + inputTankSizeTL = IConfigurableMachine.grab(obj, "I:inputTankSize", inputTankSizeTL); + outputTankSizeTL = IConfigurableMachine.grab(obj, "I:outputTankSize", outputTankSizeTL); + } + + @Override + public void writeConfig(JsonWriter writer) throws IOException { + writer.name("I:inputTankSize").value(inputTankSizeTL); + writer.name("I:outputTankSize").value(outputTankSizeTL); + } + @Override public void updateEntity() { super.updateEntity(); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityTowerSmall.java b/src/main/java/com/hbm/tileentity/machine/TileEntityTowerSmall.java index d11366f33..6414c1e4e 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityTowerSmall.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityTowerSmall.java @@ -1,11 +1,16 @@ package com.hbm.tileentity.machine; +import java.io.IOException; + +import com.google.gson.JsonObject; +import com.google.gson.stream.JsonWriter; import com.hbm.config.GeneralConfig; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.lib.Library; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.IConfigurableMachine; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -15,12 +20,33 @@ import net.minecraft.util.AxisAlignedBB; public class TileEntityTowerSmall extends TileEntityCondenser { + //Configurable values + public static int inputTankSizeTS = 1_000; + public static int outputTankSizeTS = 1_000; + public TileEntityTowerSmall() { tanks = new FluidTank[2]; - tanks[0] = new FluidTank(Fluids.SPENTSTEAM, 1000); - tanks[1] = new FluidTank(Fluids.WATER, 1000); + tanks[0] = new FluidTank(Fluids.SPENTSTEAM, inputTankSizeTS); + tanks[1] = new FluidTank(Fluids.WATER, outputTankSizeTS); } + @Override + public String getConfigName() { + return "condenserTowerSmall"; + } + + @Override + public void readIfPresent(JsonObject obj) { + inputTankSizeTS = IConfigurableMachine.grab(obj, "I:inputTankSize", inputTankSizeTS); + outputTankSizeTS = IConfigurableMachine.grab(obj, "I:outputTankSize", outputTankSizeTS); + } + + @Override + public void writeConfig(JsonWriter writer) throws IOException { + writer.name("I:inputTankSize").value(inputTankSizeTS); + writer.name("I:outputTankSize").value(outputTankSizeTS); + } + @Override public void updateEntity() { super.updateEntity(); From 9d0e02cc61e2b80e8168e92acd1b7b7049f0263a Mon Sep 17 00:00:00 2001 From: BallOfEnergy <66693744+BallOfEnergy1@users.noreply.github.com> Date: Wed, 14 Aug 2024 15:14:08 -0500 Subject: [PATCH 04/17] god finally i can get rid of this Removed Analyzable implementation; terrible idea Fixed long-standing bug with proxy components, more NBT data!!! --- .../java/com/hbm/handler/CompatHandler.java | 36 +------------------ .../hbm/tileentity/TileEntityProxyCombo.java | 36 ++++++++++++------- 2 files changed, 24 insertions(+), 48 deletions(-) diff --git a/src/main/java/com/hbm/handler/CompatHandler.java b/src/main/java/com/hbm/handler/CompatHandler.java index ec0250c81..ba0f71478 100644 --- a/src/main/java/com/hbm/handler/CompatHandler.java +++ b/src/main/java/com/hbm/handler/CompatHandler.java @@ -2,20 +2,12 @@ package com.hbm.handler; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; -import com.hbm.tileentity.TileEntityProxyCombo; import cpw.mods.fml.common.Optional; import li.cil.oc.api.machine.Arguments; import li.cil.oc.api.machine.Context; import li.cil.oc.api.network.*; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.ChatStyle; -import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.util.ForgeDirection; -import java.lang.reflect.Array; - /** * General handler for OpenComputers compatibility. @@ -54,11 +46,10 @@ public class CompatHandler { @Optional.InterfaceList({ @Optional.Interface(iface = "li.cil.oc.api.network.SimpleComponent", modid = "OpenComputers"), @Optional.Interface(iface = "li.cil.oc.api.network.SidedComponent", modid = "OpenComputers"), - @Optional.Interface(iface = "li.cil.oc.api.network.Analyzable", modid = "OpenComputers"), @Optional.Interface(iface = "li.cil.oc.api.network.ManagedPeripheral", modid = "OpenComputers"), }) @SimpleComponent.SkipInjection // make sure OC doesn't inject this shit into the interface and crash - public interface OCComponent extends SimpleComponent, SidedComponent, Analyzable, ManagedPeripheral { + public interface OCComponent extends SimpleComponent, SidedComponent, ManagedPeripheral { /** * Must be overridden in the implemented TE, or it will default to "ntm_null". @@ -83,31 +74,6 @@ public class CompatHandler { return true; } - /** - * Function to give more information when analyzing the block. Multiple entries in the array will be sent to the user in the order of the array. - * @return Additional text to add in the form of lang entries (ex: "analyze.basic2"). - */ - @Optional.Method(modid = "OpenComputers") - default String[] getExtraInfo() {return new String[] {"analyze.noInfo"};} - - @Override - @Optional.Method(modid = "OpenComputers") - default Node[] onAnalyze(EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - player.addChatComponentMessage(new ChatComponentTranslation("analyze.basic1").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.GOLD))); - player.addChatComponentMessage(new ChatComponentTranslation("analyze.basic2").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.YELLOW))); - player.addChatComponentMessage(new ChatComponentTranslation("analyze.basic3").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.GOLD))); - player.addChatComponentMessage(new ChatComponentTranslation("analyze.name", this.getComponentName()).setChatStyle(new ChatStyle().setColor(EnumChatFormatting.GOLD))); - String[] extraInfo = getExtraInfo(); - for (String info : extraInfo) { - if(!info.equals("")) - player.addChatComponentMessage(new ChatComponentTranslation(info).setChatStyle(new ChatStyle().setColor(EnumChatFormatting.YELLOW))); - } - TileEntity te = (TileEntity) this; - if((Array.getLength(this.methods()) == 0 && te instanceof TileEntityProxyCombo) || this.getComponentName().equals("ntm_null")) - player.addChatComponentMessage(new ChatComponentTranslation("analyze.error").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED))); - return null; - } - /** * Standard methods array from {@link li.cil.oc.api.network.ManagedPeripheral} extending {@link li.cil.oc.api.network.SimpleComponent}. * @return Array of methods to expose to the computer. diff --git a/src/main/java/com/hbm/tileentity/TileEntityProxyCombo.java b/src/main/java/com/hbm/tileentity/TileEntityProxyCombo.java index 0f5a8e29b..ecc987e6e 100644 --- a/src/main/java/com/hbm/tileentity/TileEntityProxyCombo.java +++ b/src/main/java/com/hbm/tileentity/TileEntityProxyCombo.java @@ -8,6 +8,7 @@ import api.hbm.energymk2.IEnergyReceiverMK2; import api.hbm.fluid.IFluidConnector; import api.hbm.tile.IHeatSource; import com.hbm.inventory.material.Mats; +import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Optional; import li.cil.oc.api.machine.Arguments; import li.cil.oc.api.machine.Context; @@ -32,7 +33,11 @@ public class TileEntityProxyCombo extends TileEntityProxyBase implements IEnergy boolean fluid; boolean heat; public boolean moltenMetal; - + + // due to some issues with OC deciding that it's gonna call the component name function before the worldObj is loaded + // the component name must be cached to prevent it from shitting itself + String componentName = OCComponent.super.getComponentName(); + public TileEntityProxyCombo() { } public TileEntityProxyCombo(boolean inventory, boolean power, boolean fluid) { @@ -344,6 +349,9 @@ public class TileEntityProxyCombo extends TileEntityProxyBase implements IEnergy this.fluid = nbt.getBoolean("fluid"); this.moltenMetal = nbt.getBoolean("metal"); this.heat = nbt.getBoolean("heat"); + if(Loader.isModLoaded("OpenComputers")) + this.componentName = nbt.getString("ocname"); + } @Override @@ -355,6 +363,8 @@ public class TileEntityProxyCombo extends TileEntityProxyBase implements IEnergy nbt.setBoolean("fluid", fluid); nbt.setBoolean("metal", moltenMetal); nbt.setBoolean("heat", heat); + if(Loader.isModLoaded("OpenComputers")) + nbt.setString("ocname", componentName); } @Override @@ -452,27 +462,27 @@ public class TileEntityProxyCombo extends TileEntityProxyBase implements IEnergy @Override // please work @Optional.Method(modid = "OpenComputers") public String getComponentName() { - if(this.getTile() instanceof OCComponent) - return ((OCComponent) this.getTile()).getComponentName(); + if(this.worldObj == null) // OC is going too fast, grab from NBT! + return componentName; + if(this.getTile() instanceof OCComponent) { + if (componentName == null || componentName.equals(OCComponent.super.getComponentName())) { + componentName = ((OCComponent) this.getTile()).getComponentName(); + } + return componentName; + } return OCComponent.super.getComponentName(); } @Override @Optional.Method(modid = "OpenComputers") - public boolean canConnectNode(ForgeDirection side) { //thank you vaer + public boolean canConnectNode(ForgeDirection side) { if(this.getTile() instanceof OCComponent) - return (this.getTile().getBlockMetadata() & 6) == 6 && ((OCComponent) this.getTile()).canConnectNode(side); + return (this.getBlockMetadata() >= 6 && this.getBlockMetadata() <= 11) + && (power || fluid) && + ((OCComponent) this.getTile()).canConnectNode(side); return OCComponent.super.canConnectNode(null); } - @Override - @Optional.Method(modid = "OpenComputers") - public String[] getExtraInfo() { - if(this.getTile() instanceof OCComponent) - return new String[] {"analyze.dummy"}; - return OCComponent.super.getExtraInfo(); - } - @Override @Optional.Method(modid = "OpenComputers") public String[] methods() { From 148a0ab0352ecf9f406b81a12c465d42af60f39a Mon Sep 17 00:00:00 2001 From: BallOfEnergy <66693744+BallOfEnergy1@users.noreply.github.com> Date: Wed, 14 Aug 2024 15:29:50 -0500 Subject: [PATCH 05/17] whoops!!! --- src/main/java/com/hbm/handler/CompatHandler.java | 4 +++- src/main/java/com/hbm/handler/nei/RefineryRecipeHandler.java | 2 +- src/main/java/com/hbm/tileentity/TileEntityProxyCombo.java | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/hbm/handler/CompatHandler.java b/src/main/java/com/hbm/handler/CompatHandler.java index ba0f71478..f61c35c0f 100644 --- a/src/main/java/com/hbm/handler/CompatHandler.java +++ b/src/main/java/com/hbm/handler/CompatHandler.java @@ -35,6 +35,8 @@ public class CompatHandler { } } + public static final String nullComponent = "ntm_null"; + /** * This is an interface made specifically for adding OC compatibility to NTM machines. The {@link li.cil.oc.api.network.SimpleComponent} interface must also be implemented in the TE. *
@@ -60,7 +62,7 @@ public class CompatHandler { @Override @Optional.Method(modid = "OpenComputers") default String getComponentName() { - return "ntm_null"; + return nullComponent; } /** diff --git a/src/main/java/com/hbm/handler/nei/RefineryRecipeHandler.java b/src/main/java/com/hbm/handler/nei/RefineryRecipeHandler.java index 8818a3d9d..2bf1e9e6e 100644 --- a/src/main/java/com/hbm/handler/nei/RefineryRecipeHandler.java +++ b/src/main/java/com/hbm/handler/nei/RefineryRecipeHandler.java @@ -161,7 +161,7 @@ public class RefineryRecipeHandler extends TemplateRecipeHandler implements ICom transferRectsGui = new LinkedList(); guiGui = new LinkedList>(); - transferRects.add(new RecipeTransferRect(new Rectangle(48, 5, 31, 101), "refinery")); + transferRects.add(new RecipeTransferRect(new Rectangle(138 - 1 - 36 - 27, 23, 36, 18), "refinery")); transferRectsGui.add(new RecipeTransferRect(new Rectangle(48, 5, 31, 101), "refinery")); guiGui.add(GUIMachineRefinery.class); RecipeTransferRectHandler.registerRectsToGuis(getRecipeTransferRectGuis(), transferRects); diff --git a/src/main/java/com/hbm/tileentity/TileEntityProxyCombo.java b/src/main/java/com/hbm/tileentity/TileEntityProxyCombo.java index ecc987e6e..ae43788db 100644 --- a/src/main/java/com/hbm/tileentity/TileEntityProxyCombo.java +++ b/src/main/java/com/hbm/tileentity/TileEntityProxyCombo.java @@ -1,6 +1,7 @@ package com.hbm.tileentity; import api.hbm.block.ICrucibleAcceptor; +import com.hbm.handler.CompatHandler; import com.hbm.handler.CompatHandler.OCComponent; import com.hbm.inventory.fluid.FluidType; @@ -36,7 +37,7 @@ public class TileEntityProxyCombo extends TileEntityProxyBase implements IEnergy // due to some issues with OC deciding that it's gonna call the component name function before the worldObj is loaded // the component name must be cached to prevent it from shitting itself - String componentName = OCComponent.super.getComponentName(); + String componentName = CompatHandler.nullComponent; public TileEntityProxyCombo() { } From 25863311bd90207752da379b3dcf73e39c09a978 Mon Sep 17 00:00:00 2001 From: BallOfEnergy <66693744+BallOfEnergy1@users.noreply.github.com> Date: Thu, 15 Aug 2024 14:13:33 -0500 Subject: [PATCH 06/17] New compatibility! This uses OpenComputer's Floppy Disk API, allowing mods to create new loot disks and add them to the tables (this took me a while; I love this system so much, it's my baby :heart:). --- .../java/com/hbm/handler/CompatHandler.java | 167 ++++++++++- src/main/java/com/hbm/main/MainRegistry.java | 5 +- src/main/resources/assets/hbm/disks/README.md | 13 + .../hbm/disks/pwrangler/usr/bin/PWRangler.lua | 274 ++++++++++++++++++ 4 files changed, 454 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/assets/hbm/disks/README.md create mode 100644 src/main/resources/assets/hbm/disks/pwrangler/usr/bin/PWRangler.lua diff --git a/src/main/java/com/hbm/handler/CompatHandler.java b/src/main/java/com/hbm/handler/CompatHandler.java index f61c35c0f..fe0b08ca0 100644 --- a/src/main/java/com/hbm/handler/CompatHandler.java +++ b/src/main/java/com/hbm/handler/CompatHandler.java @@ -1,13 +1,30 @@ package com.hbm.handler; +import com.hbm.blocks.ModBlocks; +import com.hbm.inventory.RecipesCommon; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; +import com.hbm.lib.RefStrings; +import com.hbm.main.MainRegistry; +import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Optional; +import li.cil.oc.api.Items; +import li.cil.oc.api.fs.FileSystem; import li.cil.oc.api.machine.Arguments; import li.cil.oc.api.machine.Context; import li.cil.oc.api.network.*; +import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import java.util.HashMap; +import java.util.List; +import java.util.concurrent.Callable; + +import static com.hbm.main.CraftingManager.addShapelessAuto; +import static li.cil.oc.api.FileSystem.asReadOnly; +import static li.cil.oc.api.FileSystem.fromClass; /** * General handler for OpenComputers compatibility. @@ -15,13 +32,29 @@ import net.minecraftforge.common.util.ForgeDirection; */ public class CompatHandler { + /** + * Used for converting a steam type to an integer (compression levels). + * @param type Steam type. + * @return Object[] array containing an int with the "compression level" + */ public static Object[] steamTypeToInt(FluidType type) { - if(type == Fluids.STEAM) {return new Object[] {0};} - else if(type == Fluids.HOTSTEAM) {return new Object[] {1};} - else if(type == Fluids.SUPERHOTSTEAM) {return new Object[] {2};} - return new Object[] {3}; + switch(type.getID()) { + default: + return new Object[] {0}; + case(4): // Fluids.HOTSTEAM + return new Object[] {1}; + case(5): // Fluids.SUPERHOTSTEAM + return new Object[] {2}; + case(6): // Fluids.ULTRAHOTSTEAM + return new Object[] {3}; + } } + /** + * Used for converting a compression level to a steam type. + * @param arg Steam compression level. + * @return FluidType of the steam type based on the compression level. + */ public static FluidType intToSteamType(int arg) { switch(arg) { default: @@ -35,6 +68,132 @@ public class CompatHandler { } } + /** + * Allows for easy creation of read-only filesystems. Primarily for floppy disks. + * (Though maybe reading directly from VOTV drives as filesystems could be implemented. :3) + **/ + private static class ReadOnlyFileSystem implements Callable { + + private final String name; + + ReadOnlyFileSystem(String name) { + this.name = name; + } + + @Override + @Optional.Method(modid = "OpenComputers") + public li.cil.oc.api.fs.FileSystem call() throws Exception { + return asReadOnly(fromClass(MainRegistry.class, RefStrings.MODID, "disks/" + FloppyDisk.sanitizeName(name))); + } + } + + // Floppy disk class. + public static class FloppyDisk { + // Specifies the callable ReadOnlyFileSystem to allow OC to access the floppy. + public final ReadOnlyFileSystem fs; + // Specifies the color of the floppy disk (0-16 colors defined by OC). + public final Byte color; + // Set after loading the disk; allows for adding a recipe to the item. + public ItemStack item; + + FloppyDisk(String name, int color) { + this.fs = new ReadOnlyFileSystem(FloppyDisk.sanitizeName(name)); + this.color = (byte) color; + } + + // Disk names will be sanitized before the FileSystem is created. + // This only affects the location/directory, not the display name. + // (Prevents filesystems from breaking/crashing due to having file separators, wildcards, etc. + public static String sanitizeName(String input) { + return input.toLowerCase().replaceAll("\\W", ""); + } + } + + /** + * Simple enum for mapping OC color ordinals to a nicer format for adding new disks. + */ + public enum OCColors { + BLACK, //0x444444 + RED, //0xB3312C + GREEN, //0x339911 + BROWN, //0x51301A + BLUE, //0x6666FF + PURPLE, //0x7B2FBE + CYAN, //0x66FFFF + LIGHTGRAY, //0xABABAB + GRAY, //0x666666 + PINK, //0xD88198 + LIME, //0x66FF66 + YELLOW, //0xFFFF66 + LIGHTBLUE, //0xAAAAFF + MAGENTA, //0xC354CD + ORANGE, //0xEB8844 + WHITE //0xF0F0F0 + } + + // Where all disks are stored with their name and `FloppyDisk` class. + public static HashMap disks = new HashMap<>(); + + /** + * Called in the FML PostLoad stage, after the OC API loads. + *
+ * Loads various parts of OC compatibility. + */ + public static void init() { + if(Loader.isModLoaded("OpenComputers")) { + /* + For anyone wanting to add their own floppy disks, + read the README found in assets.hbm.disks. + */ + + // Idea/Code by instantnootles + disks.put("PWRangler", new FloppyDisk("PWRangler", OCColors.CYAN.ordinal())); + + // begin registering disks + Logger logger = LogManager.getLogger("HBM"); + logger.info("Loading OpenComputers disks..."); + if(disks.size() == 0) { + logger.info("No disks registered; see com.hbm.handler.CompatHandler.disks"); + return; + } + disks.forEach((s, disk) -> { + + // Test if the disk path even exists. + FileSystem fs = fromClass(MainRegistry.class, RefStrings.MODID, "disks/" + disk.fs.name); + + if (fs == null) { // Disk path does NOT exist, and it should not be loaded. + + logger.error("Error loading disk: " + s + " at /assets/" + RefStrings.MODID + "/disks/" + disk.fs.name); + logger.error("This is likely due to the path to the disk being non-existent."); + + } else { // Disk path DOES exist, and it should be loaded. + + disk.item = Items.registerFloppy(s, disk.color, disk.fs); // The big part, actually registering the floppies! + logger.info("Registered disk: " + s + " at /assets/" + RefStrings.MODID + "/disks/" + disk.fs.name); + + } + }); + logger.info("OpenComputers disks registered."); + + // OC disk recipes! + List floppyDisks = new RecipesCommon.OreDictStack("oc:floppy").toStacks(); + + if(floppyDisks.size() > 0) { //check that floppy disks even exist in oredict. + + // Recipes must be initialized here, since if they were initialized in `CraftingManager` then the disk item would not be created yet. + addShapelessAuto(disks.get("PWRangler").item, new Object[] {"oc:floppy", new ItemStack(ModBlocks.pwr_casing)}); + + logger.info("OpenComputers disk recipe added for PWRangler."); + } else { + logger.info("OpenComputers floppy disk oredict not found, recipes cannot be loaded!"); + } + + // boom, OC disks loaded + logger.info("OpenComputers disks loaded."); + } + } + + // Null component name, default to this if broken to avoid NullPointerExceptions. public static final String nullComponent = "ntm_null"; /** diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index caccee6f3..d4f3860b7 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -877,7 +877,10 @@ public class MainRegistry { proxy.registerMissileItems(); BlockMotherOfAllOres.init(); - + + // Load compatibility for OC. + CompatHandler.init(); + //expand for the largest entity we have (currently Quackos who is 17.5m in diameter, that's one fat duck) World.MAX_ENTITY_RADIUS = Math.max(World.MAX_ENTITY_RADIUS, 8.75); diff --git a/src/main/resources/assets/hbm/disks/README.md b/src/main/resources/assets/hbm/disks/README.md new file mode 100644 index 000000000..973c2bfa1 --- /dev/null +++ b/src/main/resources/assets/hbm/disks/README.md @@ -0,0 +1,13 @@ +# OpenComputers Floppy Disks + +This directory is where the contents of floppy disks registered by `com.hbm.handler.CompatHandler` reside. + +New floppy disks can be added by: +1. Adding a line inside the `init()` function in the `CompatHandler` class to add the floppy disk to the list of disks to register + (actually registering the disks is done automatically by the handler.) +2. Adding the Lua (Preferably 5.3) files to the directory path based on the name you chose for your floppy disk. +
Note: the names of drives are "sanitized", meaning the directory path will be the name you selected but all lowercase and stripped of any non-word character. + (A-Z, a-z, 0-9, _) +3. Add a recipe to the disk at the end of the `init()` function in the `CompatHandler` class, though this step is not required. + +After those steps are complete, a new floppy disk should be registered into OC with a recipe (if added). \ No newline at end of file diff --git a/src/main/resources/assets/hbm/disks/pwrangler/usr/bin/PWRangler.lua b/src/main/resources/assets/hbm/disks/pwrangler/usr/bin/PWRangler.lua new file mode 100644 index 000000000..0b86935da --- /dev/null +++ b/src/main/resources/assets/hbm/disks/pwrangler/usr/bin/PWRangler.lua @@ -0,0 +1,274 @@ +local component = require "component" +local event = require "event" +local gpu = component.gpu +local call = component.invoke + +colorGradient = {0x00FF00, 0x6BEE00, 0x95DB00, 0xB0C800, 0xC5B400, 0xD79F00, 0xE68700, 0xF46900, 0xFC4700, 0xFF0000} +coreHeatESTOP = true +coolantLossESTOP = true + +runSig = true + +coldCoolantLevel = 0 +coldCoolantOutflow = 0 +prevCoolantFlow = 0 + +hotCoolantLevel = 0 +hotCoolantOutflow = 0 +prevHotCoolantFlow = 0 + +gpu.fill(1,1,160,160," ") + +-- Button Bullshit +function newButton(x, y, width, height, colorUp, colorDown, func) + local button = {xpos = 0, ypos = 0, width = 0, height = 0, colorUp = 0, colorDown = 0, func = nil} + button.xpos = x + button.ypos = y + button.width = width + button.height = height + button.colorUp = colorUp + button.colorDown = colorDown + button.func = func + return button +end + +function drawButton(button, color) + component.gpu.setBackground(color) + component.gpu.fill(button.xpos, button.ypos, button.width, button.height, " ") + component.gpu.setBackground(0x000000) +end + +pressedButton = nil +function buttonPress(_, _, x, y, _, _) + for _, b in pairs(buttons) do + if((x>=b.xpos) and (x<(b.xpos+b.width)) and (y>=b.ypos) and (y<(b.ypos+b.height)) ) then + drawButton(b, b.colorDown) + pressedButton = b + end + end +end + +function buttonRelease(_, _, x, y, _, _) + drawButton(pressedButton, pressedButton.colorUp) + pressedButton.func() + pressedButton = nil +end +--Button bullshit ends + +buttons = {} + +buttons[1] = newButton(61, 6, 6, 2, 0xFFFFFF, 0xAAAAAA, function() component.proxy(pwrController).setLevel(call(pwrController, "getLevel")+1) end) +buttons[2] = newButton(68, 6, 6, 2, 0xFFFFFF, 0xAAAAAA, function() component.proxy(pwrController).setLevel(call(pwrController, "getLevel")+5) end) +buttons[3] = newButton(75, 6, 6, 2, 0xFFFFFF, 0xAAAAAA, function() component.proxy(pwrController).setLevel(call(pwrController, "getLevel")+10) end) + +buttons[4] = newButton(61, 9, 6, 2, 0xFFFFFF, 0xAAAAAA, function() component.proxy(pwrController).setLevel(call(pwrController, "getLevel")-1) end) +buttons[5] = newButton(68, 9, 6, 2, 0xFFFFFF, 0xAAAAAA, function() component.proxy(pwrController).setLevel(call(pwrController, "getLevel")-5) end) +buttons[6] = newButton(75, 9, 6, 2, 0xFFFFFF, 0xAAAAAA, function() component.proxy(pwrController).setLevel(call(pwrController, "getLevel")-10) end) + +buttons[7] = newButton(82, 6, 11, 5, 0xFF0000, 0xAA0000, function() component.proxy(pwrController).setLevel(100) end) +buttons[8] = newButton(94, 6, 12, 2, 0x00FF00, 0x00AA00, function() coreHeatESTOP = not coreHeatESTOP if coreHeatESTOP == true then buttons[8].colorUp = 0x00FF00 buttons[8].colorDown = 0x00AA00 else buttons[8].colorUp = 0xFF0000 buttons[8].colorDown = 0xAA0000 end end) +buttons[9] = newButton(94, 9, 12, 2, 0x00FF00, 0x00AA00, function() coolantLossESTOP = not coolantLossESTOP if coolantLossESTOP == true then buttons[9].colorUp = 0x00FF00 buttons[9].colorDown = 0x00AA00 else buttons[9].colorUp = 0xFF0000 buttons[9].colorDown = 0xAA0000 end end) + +buttons[10] = newButton(107, 8, 5, 3, 0xFF0000, 0xAA0000, function() runSig = false end) + +for address, _ in component.list("ntm_pwr_control") do + pwrController = address +end + +gpu.setForeground(0xAAAAAA) + +--Control rods +gpu.fill(60,4,54,8,"█") + +--Outlet +gpu.fill(91,13,16,8,"█") + +--Inlet +gpu.fill(91,30,16,8,"█") + +gpu.set(61,13," █████████████████████") +gpu.set(61,14," █ █ █ █ █ █ █ █ █ █") +gpu.set(61,15," █ █ █▄█▄█▄█▄█▄█ █ █") +gpu.set(61,16," ▄█████▀█▀█▀█▀█▀█████▄") +gpu.set(61,17," ▄███▀█ █ █ █ █ █ █ █▀███▄") +gpu.set(61,18," ▄██ █ █ █ █ █ █ █ █ █ █ ██▄") +gpu.set(61,19," ██ ██") +gpu.set(61,20,"██▀ █████████████████████ ▀██") +gpu.set(61,21,"██ █████████████████████ ██▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄") +gpu.set(61,22,"██ █ █ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀") +gpu.set(61,23,"██ █████████████████████ → → → → → → → → → →") +gpu.set(61,24,"██ █ █ ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄") +gpu.set(61,25,"██ █████████████████████ ██▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀") +gpu.set(61,26,"██ █ █ ██") +gpu.set(61,27,"██ █████████████████████ ██") +gpu.set(61,28,"██ █ █ ██") +gpu.set(61,29,"██ █████████████████████ ██") +gpu.set(61,30,"██ █ █ ██") +gpu.set(61,31,"██ █████████████████████ ██") +gpu.set(61,32,"██ ██") +gpu.set(61,33,"██ ██") +gpu.set(61,34,"██ ██") +gpu.set(61,35,"██ ██") +gpu.set(61,36,"██ ██") +gpu.set(61,37,"██ ██") +gpu.set(61,38,"██ ██▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄") +gpu.set(61,39,"██ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀") +gpu.set(61,40,"██ ← ← ← ← ← ← ← ← ← ←") +gpu.set(61,41,"██ ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄") +gpu.set(61,42,"██ ██▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀") +gpu.set(61,43,"██▄ ▄██") +gpu.set(61,44," ██ ██") +gpu.set(61,45," ▀██ ██▀") +gpu.set(61,46," ▀██▄▄ ▄▄██▀") +gpu.set(61,47," ▀▀███▄▄▄▄▄▄▄▄▄▄▄███▀▀") +gpu.set(61,48," ▀▀▀▀▀▀▀▀▀▀▀▀") + +gpu.setBackground(0xAAAAAA) +gpu.setForeground(0x000000) + +gpu.set(70,4,"CONTROL RODS") +gpu.set(61,5,"INS+1 INS+5 INS+10") +gpu.set(61,8,"RET+1 RET+5 RET+10") + +gpu.set(85,5,"ESTOP") +gpu.set(107,5,"LEVEL") +gpu.set(107,7,"QUIT") + +gpu.set(94,5,"OVHEAT ESTOP") +gpu.set(94,8,"NOCOOL ESTOP") + +gpu.set(95,13,"OUTFLOW") +gpu.set(92,14,"BUFFER") +gpu.set(99,14,"HOTΔ") + +gpu.set(95,30,"INFLOW") +gpu.set(92,31,"BUFFER") +gpu.set(99,31,"COOLΔ") + +gpu.set(69,20,"REACTOR CORE") +gpu.set(71,21,"CORE HEAT:") +gpu.set(71,23,"HULL HEAT:") +gpu.set(71,25,"CORE FLUX:") +gpu.set(68,27,"COLD HEATEX LVL:") +gpu.set(69,29,"HOT HEATEX LVL:") +gpu.setBackground(0x000000) + +gpu.setForeground(0xFFFFFF) +gpu.fill(107,6,5,1,"█") + +--Outflow Buffer +gpu.fill(92,15,6,5,"█") + +--CoolDelta +gpu.fill(99,15,7,1,"█") + +--HotDelta + +gpu.set(66,19,"┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃") +gpu.fill(66,22,19,1,"█") +gpu.fill(66,24,19,1,"█") +gpu.fill(66,26,19,1,"█") +gpu.fill(66,28,19,1,"█") +gpu.fill(66,30,19,1,"█") +gpu.set(66,32,"┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃") +gpu.setForeground(0xAAAAAA) + +gpu.setForeground(0x000000) +gpu.setBackground(0xFFFFFF) +gpu.set(83,22,"TU") +gpu.set(83,24,"TU") +gpu.setForeground(0xFFFFFF) +gpu.setBackground(0x000000) + + +event.listen("touch", buttonPress) +event.listen("drop", buttonRelease) + +while (runSig == true) do + rodLevel = call(pwrController, "getLevel") + + coreHeat, _ = call(pwrController, "getHeat") + coreHeat = coreHeat//1000000 + + for _, b in pairs(buttons) do + drawButton(b, b.colorUp) + end + + for j=rodLevel//10,10 do + gpu.fill(64+(j*2), 33, 1, 10, " ") + end + + for j=1,rodLevel//10 do + gpu.fill(64+(j*2), 33, 1, 10, "┃") + end + + gpu.fill(64+(math.ceil(rodLevel/10)*2), 33, 1, math.fmod(rodLevel,10), "┃") + + for j=0,20,2 do + gpu.setForeground(colorGradient[coreHeat+1]) + gpu.fill(65+j, 33, 1, 9, "█") + gpu.setForeground(0xAAAAAA) + end + + gpu.setBackground(0xFFFFFF) + + gpu.setForeground(0xFFFFFF) + gpu.fill(66,22,19,1,"█") + gpu.fill(66,24,19,1,"█") + gpu.fill(66,26,19,1,"█") + gpu.fill(66,28,19,1,"█") + gpu.fill(66,30,19,1,"█") + + gpu.fill(92,15,6,5,"█") + gpu.fill(92,32,6,5,"█") + + gpu.fill(99,15,7,1,"█") + gpu.fill(99,32,7,1,"█") + + prevCoolantFlow = coldCoolantLevel + prevHotCoolantFlow = hotCoolantLevel + + fullCoreHeat, fullHullHeat = call(pwrController, "getHeat") + coldCoolantLevel, _, hotCoolantLevel, _ = call(pwrController, "getCoolantInfo") + + coldCoolantOutflow = coldCoolantLevel - prevCoolantFlow + hotCoolantOutflow = hotCoolantLevel - prevHotCoolantFlow + + gpu.setForeground(0xFF0099) + gpu.fill(92,15+(5-hotCoolantLevel//25600),6,hotCoolantLevel//25600, "█") + gpu.setForeground(0x000000) + + gpu.setForeground(0x00FFFF) + gpu.fill(92,32+(5-coldCoolantLevel//25600),6,coldCoolantLevel//25600, "█") + gpu.setForeground(0x000000) + + gpu.set(66,22,tostring(fullCoreHeat)) + gpu.set(66,24,tostring(fullHullHeat)) + gpu.set(66,26,tostring(call(pwrController, "getFlux"))) + gpu.set(66,28,tostring(coldCoolantLevel)) + gpu.set(66,30,tostring(hotCoolantLevel)) + + gpu.set(99,15,tostring(hotCoolantOutflow)) + gpu.set(99,32,tostring(coldCoolantOutflow)) + + gpu.set(107,6," ") + gpu.set(107,6,tostring(call(pwrController, "getLevel"))) + + gpu.setBackground(0x000000) + gpu.setForeground(0xFFFFFF) + + if (coreHeatESTOP == true) and (fullCoreHeat) > 9000000 then + component.proxy(pwrController).setLevel(100) + end + + if (coolantLossESTOP == true) and (coldCoolantLevel) < 10000 then + component.proxy(pwrController).setLevel(100) + end + + os.sleep(0.25) +end + +event.ignore("touch", buttonPress) +event.ignore("drop", buttonRelease) + +gpu.fill(1,1,160,160," ") \ No newline at end of file From 89c97abbdca4c7a76fde52b5fd04e35c95bae050 Mon Sep 17 00:00:00 2001 From: BallOfEnergy <66693744+BallOfEnergy1@users.noreply.github.com> Date: Thu, 15 Aug 2024 15:59:01 -0500 Subject: [PATCH 07/17] i looked back here and nearly had a fucking stroke from this code --- .../machine/rbmk/TileEntityRBMKRod.java | 35 +++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) 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 f67843023..70750e00a 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java @@ -33,6 +33,9 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import java.util.ArrayList; +import java.util.List; + @Optional.InterfaceList({@Optional.Interface(iface = "li.cil.oc.api.network.SimpleComponent", modid = "OpenComputers")}) public class TileEntityRBMKRod extends TileEntityRBMKSlottedBase implements IRBMKFluxReceiver, IRBMKLoadable, SimpleComponent, IInfoProviderEC, CompatHandler.OCComponent { @@ -464,25 +467,21 @@ public class TileEntityRBMKRod extends TileEntityRBMKSlottedBase implements IRBM @Callback(direct = true) @Optional.Method(modid = "OpenComputers") public Object[] getInfo(Context context, Arguments args) { - Object OC_enrich_buf; - Object OC_poison_buf; - Object OC_hull_buf; - Object OC_core_buf; - String OC_type; + List returnValues = new ArrayList<>(); if(slots[0] != null && slots[0].getItem() instanceof ItemRBMKRod) { - OC_enrich_buf = ItemRBMKRod.getEnrichment(slots[0]); - OC_poison_buf = ItemRBMKRod.getPoison(slots[0]); - OC_hull_buf = ItemRBMKRod.getHullHeat(slots[0]); - OC_core_buf = ItemRBMKRod.getCoreHeat(slots[0]); - OC_type = slots[0].getItem().getUnlocalizedName(); - } else { - OC_enrich_buf = "N/A"; - OC_poison_buf = "N/A"; - OC_hull_buf = "N/A"; - OC_core_buf = "N/A"; - OC_type = "N/A"; - } - return new Object[] {heat, OC_hull_buf, OC_core_buf, fluxSlow, fluxFast, OC_enrich_buf, OC_poison_buf, OC_type, ((RBMKRod)this.getBlockType()).moderated, xCoord, yCoord, zCoord}; + returnValues.add(ItemRBMKRod.getHullHeat(slots[0])); + returnValues.add(ItemRBMKRod.getCoreHeat(slots[0])); + returnValues.add(ItemRBMKRod.getEnrichment(slots[0])); + returnValues.add(ItemRBMKRod.getPoison(slots[0])); + returnValues.add(slots[0].getItem().getUnlocalizedName()); + } else + for (int i = 0; i < 5; i++) + returnValues.add("N/A"); + + return new Object[] { + heat, returnValues.get(0), returnValues.get(1), + fluxSlow, fluxFast, returnValues.get(2), returnValues.get(3), returnValues.get(4), + ((RBMKRod)this.getBlockType()).moderated, xCoord, yCoord, zCoord}; } @Callback(direct = true) From f58d97c007168c981376bfb22549adf900bfc3db Mon Sep 17 00:00:00 2001 From: George Paton Date: Fri, 16 Aug 2024 21:57:42 +1000 Subject: [PATCH 08/17] switch TEMachineBattery to bytebuf --- .../storage/TileEntityMachineBattery.java | 37 +++++++++++-------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineBattery.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineBattery.java index 99575c496..665d18317 100644 --- a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineBattery.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineBattery.java @@ -21,10 +21,10 @@ import com.hbm.util.CompatEnergyControl; import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; import li.cil.oc.api.machine.Arguments; import li.cil.oc.api.machine.Callback; import li.cil.oc.api.machine.Context; -import li.cil.oc.api.network.SimpleComponent; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; @@ -35,7 +35,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @Optional.InterfaceList({@Optional.Interface(iface = "li.cil.oc.api.network.SimpleComponent", modid = "opencomputers")}) -public class TileEntityMachineBattery extends TileEntityMachineBase implements IEnergyConductorMK2, IEnergyProviderMK2, IEnergyReceiverMK2, IPersistentNBT, SimpleComponent, IGUIProvider, IInfoProviderEC, CompatHandler.OCComponent { +public class TileEntityMachineBattery extends TileEntityMachineBase implements IEnergyConductorMK2, IEnergyProviderMK2, IEnergyReceiverMK2, IPersistentNBT, IGUIProvider, IInfoProviderEC, CompatHandler.OCComponent { public long[] log = new long[20]; public long delta = 0; @@ -214,13 +214,7 @@ public class TileEntityMachineBattery extends TileEntityMachineBase implements I prevPowerState = power; - NBTTagCompound nbt = new NBTTagCompound(); - nbt.setLong("power", avg); - nbt.setLong("delta", delta); - nbt.setShort("redLow", redLow); - nbt.setShort("redHigh", redHigh); - nbt.setByte("priority", (byte) this.priority.ordinal()); - this.networkPack(nbt, 20); + this.networkPackNT(20); } } @@ -250,14 +244,25 @@ public class TileEntityMachineBattery extends TileEntityMachineBase implements I } @Override - public void networkUnpack(NBTTagCompound nbt) { - super.networkUnpack(nbt); + public void serialize(ByteBuf buf) { + super.serialize(buf); - this.power = nbt.getLong("power"); - this.delta = nbt.getLong("delta"); - this.redLow = nbt.getShort("redLow"); - this.redHigh = nbt.getShort("redHigh"); - this.priority = ConnectionPriority.values()[nbt.getByte("priority")]; + buf.writeLong(power); + buf.writeLong(delta); + buf.writeShort(redLow); + buf.writeShort(redHigh); + buf.writeByte(priority.ordinal()); + } + + @Override + public void deserialize(ByteBuf buf) { + super.deserialize(buf); + + power = buf.readLong(); + delta = buf.readLong(); + redLow = buf.readShort(); + redHigh = buf.readShort(); + priority = ConnectionPriority.values()[buf.readByte()]; } @Override From 9d592189095b968c0c9c49dc5b2fbf2fcde47612 Mon Sep 17 00:00:00 2001 From: BallOfEnergy <66693744+BallOfEnergy1@users.noreply.github.com> Date: Sat, 17 Aug 2024 12:26:08 -0500 Subject: [PATCH 09/17] aaaaaaaaaaaaa --- .../hbm/inventory/gui/GUIMachineRefinery.java | 58 +++++++++++-------- 1 file changed, 33 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java b/src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java index 0db5f2f29..95aed769b 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java @@ -85,38 +85,46 @@ public class GUIMachineRefinery extends GuiInfoContainer { Tuple.Quintet recipe = RefineryRecipes.getRefinery(inputOil.getTankType()); - // Heavy Oil Products - Color color = new Color(recipe.getV().type.getColor()); + if(recipe == null) { + func_146110_a(guiLeft + 52, guiTop + 63, 247, 1, 33, 48, 350, 256); + func_146110_a(guiLeft + 52, guiTop + 32, 247, 50, 66, 52, 350, 256); + func_146110_a(guiLeft + 52, guiTop + 24, 247, 145, 86, 35, 350, 256); + func_146110_a(guiLeft + 36, guiTop + 16, 211, 119, 122, 25, 350, 256); + } else { - GL11.glEnable(GL11.GL_BLEND); - GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F); - func_146110_a(guiLeft + 52, guiTop + 63, 247, 1, 33, 48, 350, 256); - GL11.glDisable(GL11.GL_BLEND); + // Heavy Oil Products + Color color = new Color(recipe.getV().type.getColor()); - // Naphtha Oil Products - color = new Color(recipe.getW().type.getColor()); + GL11.glEnable(GL11.GL_BLEND); + GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F); + func_146110_a(guiLeft + 52, guiTop + 63, 247, 1, 33, 48, 350, 256); + GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_BLEND); - GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F); - func_146110_a(guiLeft + 52, guiTop + 32, 247, 50, 66, 52, 350, 256); - GL11.glDisable(GL11.GL_BLEND); + // Naphtha Oil Products + color = new Color(recipe.getW().type.getColor()); - // Light Oil Products - color = new Color(recipe.getX().type.getColor()); + GL11.glEnable(GL11.GL_BLEND); + GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F); + func_146110_a(guiLeft + 52, guiTop + 32, 247, 50, 66, 52, 350, 256); + GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_BLEND); - GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F); - func_146110_a(guiLeft + 52, guiTop + 24, 247, 145, 86, 35, 350, 256); - GL11.glDisable(GL11.GL_BLEND); + // Light Oil Products + color = new Color(recipe.getX().type.getColor()); - // Gaseous Products - color = new Color(recipe.getY().type.getColor()); + GL11.glEnable(GL11.GL_BLEND); + GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F); + func_146110_a(guiLeft + 52, guiTop + 24, 247, 145, 86, 35, 350, 256); + GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_BLEND); - GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F); - func_146110_a(guiLeft + 36, guiTop + 16, 211, 119, 122, 25, 350, 256); - GL11.glDisable(GL11.GL_BLEND); - GL11.glColor4f(1F, 1F, 1F, 1F); + // Gaseous Products + color = new Color(recipe.getY().type.getColor()); + + GL11.glEnable(GL11.GL_BLEND); + GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F); + func_146110_a(guiLeft + 36, guiTop + 16, 211, 119, 122, 25, 350, 256); + GL11.glDisable(GL11.GL_BLEND); + GL11.glColor4f(1F, 1F, 1F, 1F); + } // output tanks refinery.tanks[1].renderTank(guiLeft + 86, guiTop + 95, this.zLevel, 16, 52); From 84d25284648ef86c4427e85ea7205edca2338bd0 Mon Sep 17 00:00:00 2001 From: BallOfEnergy <66693744+BallOfEnergy1@users.noreply.github.com> Date: Sun, 18 Aug 2024 15:17:20 -0500 Subject: [PATCH 10/17] kms (fix cutting off of refinery gui) --- src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java b/src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java index 95aed769b..958de4111 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java @@ -28,7 +28,7 @@ public class GUIMachineRefinery extends GuiInfoContainer { super(new ContainerMachineRefinery(invPlayer, tedf)); refinery = tedf; - this.xSize = 209; + this.xSize = 210; this.ySize = 231; } From 9ee553fe147df992edc288af6d3abf067ae62d13 Mon Sep 17 00:00:00 2001 From: George Paton Date: Mon, 19 Aug 2024 12:25:24 +1000 Subject: [PATCH 11/17] Fix pumpjack tank sync --- .../machine/oil/TileEntityMachinePumpjack.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachinePumpjack.java b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachinePumpjack.java index dd804d1ca..7d836a45f 100644 --- a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachinePumpjack.java +++ b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachinePumpjack.java @@ -112,12 +112,10 @@ public class TileEntityMachinePumpjack extends TileEntityOilDrillBase { } @Override - public void sendUpdate() { - NBTTagCompound data = new NBTTagCompound(); - data.setLong("power", power); - data.setInteger("indicator", this.indicator); - data.setFloat("speed", this.indicator == 0 ? (5F + (2F * this.speedLevel)) + (this.overLevel - 1F) * 10: 0F); - this.networkPack(data, 25); + public void networkPack(NBTTagCompound nbt, int range) { + nbt.setFloat("speed", this.indicator == 0 ? (5F + (2F * this.speedLevel)) + (this.overLevel - 1F) * 10: 0F); + + super.networkPack(nbt, range); } @Override From 680678b5b2745ae8f0be7c1c6ea45e148d283074 Mon Sep 17 00:00:00 2001 From: Boblet Date: Mon, 19 Aug 2024 16:38:29 +0200 Subject: [PATCH 12/17] :b:attery --- changelog | 17 ++------------ .../java/com/hbm/handler/ArmorModHandler.java | 7 ++++-- .../container/ContainerArmorTable.java | 21 +++++++++--------- .../com/hbm/inventory/gui/GUIArmorTable.java | 11 ++++----- .../com/hbm/items/armor/ItemArmorMod.java | 1 + .../com/hbm/items/armor/ItemModBattery.java | 13 +++++++++++ .../java/com/hbm/main/CraftingManager.java | 4 ++-- .../gui/machine/gui_armor_modifier.png | Bin 3019 -> 3083 bytes .../textures/items/arc_electrode_burnt.png | Bin 447 -> 0 bytes .../hbm/textures/items/arc_electrode_desh.png | Bin 537 -> 0 bytes .../textures/items/ingot_beskar_double.png | Bin 0 -> 276 bytes .../textures/items/ingot_beskar_single.png | Bin 0 -> 231 bytes 12 files changed, 40 insertions(+), 34 deletions(-) create mode 100644 src/main/java/com/hbm/items/armor/ItemModBattery.java delete mode 100644 src/main/resources/assets/hbm/textures/items/arc_electrode_burnt.png delete mode 100644 src/main/resources/assets/hbm/textures/items/arc_electrode_desh.png create mode 100644 src/main/resources/assets/hbm/textures/items/ingot_beskar_double.png create mode 100644 src/main/resources/assets/hbm/textures/items/ingot_beskar_single.png diff --git a/changelog b/changelog index b99450d57..a3f93e205 100644 --- a/changelog +++ b/changelog @@ -1,16 +1,3 @@ -## Changed -* To address certain balancing concerns, the RF to HE conversion rate is now 2:5. The HE to RF rate however is still 5:1 - * Because of this, using chains of converters as batteries becomes exponentially lossy with size, therefore the input decay has been removed - * Input decay can still be configured if desired - * No input decay also means that converters are no longer infinite energy sinks -* Power converter recipes have been updated -* Soldering stations will no longer work if the recipe requires no input fluid while fluid is present - * While this does complicate using the soldering station manually, as switching from milgrade to standard ICs requires emptying the solderer with a siphon, it does make automating easier, since soldering stations will no longer treat incomplete milgrade circuits as ICs -* Cement is now edible -* Derricks have been remodeled, the port configuration has changed so existing derricks need to be replaced -* Derricks no longer spawn oil spills -* Metal deco blocks are now crafted in batches of 4, as well as recycled in batches of 4. Each block is therefore still worth 25% of an ingot, but recycling your own deco blocks is no longer lossy - ## Fixed -* Fixed some machines not sending fluid gauge syncs properly -* Fixed refinery GUI crashing when invalid input is used \ No newline at end of file +* Fixed pumpjack gauges not syncing properly +* Fixed some concrete variants not being revertable into uncolored concrete \ No newline at end of file diff --git a/src/main/java/com/hbm/handler/ArmorModHandler.java b/src/main/java/com/hbm/handler/ArmorModHandler.java index 9beabfb46..f7b8780ca 100644 --- a/src/main/java/com/hbm/handler/ArmorModHandler.java +++ b/src/main/java/com/hbm/handler/ArmorModHandler.java @@ -18,6 +18,9 @@ public class ArmorModHandler { public static final int cladding = 5; public static final int kevlar = 6; public static final int extra = 7; + public static final int battery = 8; + + public static final int MOD_SLOTS = 9; public static final UUID[] UUIDs = new UUID[] { UUID.fromString("8d6e5c77-133e-4056-9c80-a9e42a1a0b65"), @@ -146,7 +149,7 @@ public class ArmorModHandler { public static ItemStack[] pryMods(ItemStack armor) { - ItemStack[] slots = new ItemStack[8]; + ItemStack[] slots = new ItemStack[MOD_SLOTS]; if(!hasMods(armor)) return slots; @@ -154,7 +157,7 @@ public class ArmorModHandler { NBTTagCompound nbt = armor.getTagCompound(); NBTTagCompound mods = nbt.getCompoundTag(MOD_COMPOUND_KEY); - for(int i = 0; i < 8; i++) { + for(int i = 0; i < MOD_SLOTS; i++) { NBTTagCompound cmp = mods.getCompoundTag(MOD_SLOT_KEY + i); diff --git a/src/main/java/com/hbm/inventory/container/ContainerArmorTable.java b/src/main/java/com/hbm/inventory/container/ContainerArmorTable.java index f8da90d3d..d63fcad3b 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerArmorTable.java +++ b/src/main/java/com/hbm/inventory/container/ContainerArmorTable.java @@ -19,20 +19,21 @@ import net.minecraft.util.IIcon; public class ContainerArmorTable extends Container { - public InventoryBasic upgrades = new InventoryBasic("Upgrades", false, 8); + public InventoryBasic upgrades = new InventoryBasic("Upgrades", false, ArmorModHandler.MOD_SLOTS); public IInventory armor = new InventoryCraftResult(); public ContainerArmorTable(InventoryPlayer inventory) { EntityPlayer player = inventory.player; this.addSlotToContainer(new UpgradeSlot(upgrades, ArmorModHandler.helmet_only, 26 + 22, 27)); // helmet only - this.addSlotToContainer(new UpgradeSlot(upgrades, ArmorModHandler.plate_only, 62 + 22, 27)); // chestplate only + this.addSlotToContainer(new UpgradeSlot(upgrades, ArmorModHandler.plate_only, 62 + 22, 27)); // chestplate only this.addSlotToContainer(new UpgradeSlot(upgrades, ArmorModHandler.legs_only, 98 + 22, 27)); // leggins only this.addSlotToContainer(new UpgradeSlot(upgrades, ArmorModHandler.boots_only, 134 + 22, 45)); // boots only this.addSlotToContainer(new UpgradeSlot(upgrades, ArmorModHandler.servos, 134 + 22, 81)); //servos/frame this.addSlotToContainer(new UpgradeSlot(upgrades, ArmorModHandler.cladding, 98 + 22, 99)); //radiation cladding - this.addSlotToContainer(new UpgradeSlot(upgrades, ArmorModHandler.kevlar, 62 + 22, 99)); //kevlar/sapi/(ERA? :) ) + this.addSlotToContainer(new UpgradeSlot(upgrades, ArmorModHandler.kevlar, 62 + 22, 99)); //kevlar/sapi/(ERA? :) ) this.addSlotToContainer(new UpgradeSlot(upgrades, ArmorModHandler.extra, 26 + 22, 99)); //special parts + this.addSlotToContainer(new UpgradeSlot(upgrades, ArmorModHandler.battery, 8 + 22, 63)); //special parts this.addSlotToContainer(new Slot(armor, 0, 44 + 22, 63) { @@ -48,7 +49,7 @@ public class ContainerArmorTable extends Container { if(stack != null) { ItemStack[] mods = ArmorModHandler.pryMods(stack); - for(int i = 0; i < 8; i++) { + for(int i = 0; i < ArmorModHandler.MOD_SLOTS; i++) { if(mods != null) upgrades.setInventorySlotContents(i, mods[i]); @@ -65,7 +66,7 @@ public class ContainerArmorTable extends Container { //if the armor piece is taken, absorb all armor pieces - for(int i = 0; i < 8; i++) { + for(int i = 0; i < ArmorModHandler.MOD_SLOTS; i++) { ItemStack mod = upgrades.getStackInSlot(i); @@ -126,19 +127,19 @@ public class ContainerArmorTable extends Container { ItemStack var5 = var4.getStack(); var3 = var5.copy(); - if(par2 <= 8) { - if(par2 != 8 || !InventoryUtil.mergeItemStack(this.inventorySlots, var5, 9, 13, false)) - if(!this.mergeItemStack(var5, 13, this.inventorySlots.size(), true)) + if(par2 <= ArmorModHandler.MOD_SLOTS) { + if(par2 != ArmorModHandler.MOD_SLOTS || !InventoryUtil.mergeItemStack(this.inventorySlots, var5, ArmorModHandler.MOD_SLOTS + 1, ArmorModHandler.MOD_SLOTS + 5, false)) + if(!this.mergeItemStack(var5, ArmorModHandler.MOD_SLOTS + 5, this.inventorySlots.size(), true)) return null; var4.onPickupFromSlot(p_82846_1_, var5); } else { if(var5.getItem() instanceof ItemArmor) { - if(!this.mergeItemStack(var5, 8, 9, false)) + if(!this.mergeItemStack(var5, ArmorModHandler.MOD_SLOTS, ArmorModHandler.MOD_SLOTS + 1, false)) return null; - } else if(this.inventorySlots.get(8) != null && var5.getItem() instanceof ItemArmorMod) { + } else if(this.inventorySlots.get(ArmorModHandler.MOD_SLOTS) != null && var5.getItem() instanceof ItemArmorMod) { ItemArmorMod mod = (ItemArmorMod)var5.getItem(); int slot = mod.type; diff --git a/src/main/java/com/hbm/inventory/gui/GUIArmorTable.java b/src/main/java/com/hbm/inventory/gui/GUIArmorTable.java index e255586cf..250b9711f 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIArmorTable.java +++ b/src/main/java/com/hbm/inventory/gui/GUIArmorTable.java @@ -46,15 +46,16 @@ public class GUIArmorTable extends GuiInfoContainer { "armorMod.type.cladding", "armorMod.type.insert", "armorMod.type.special", + "armorMod.type.battery", "armorMod.insertHere" }; - for(int i = 0; i < 9; ++i) { + for(int i = 0; i < ArmorModHandler.MOD_SLOTS + 1; ++i) { Slot slot = (Slot) this.inventorySlots.inventorySlots.get(i); if(this.isMouseOverSlot(slot, x, y) && !slot.getHasStack()) { - this.drawCreativeTabHoveringText((i < 8 ? EnumChatFormatting.LIGHT_PURPLE : EnumChatFormatting.YELLOW) + I18nUtil.resolveKey(unloc[i]), x, y); + this.drawCreativeTabHoveringText((i < ArmorModHandler.MOD_SLOTS ? EnumChatFormatting.LIGHT_PURPLE : EnumChatFormatting.YELLOW) + I18nUtil.resolveKey(unloc[i]), x, y); } } } @@ -75,7 +76,7 @@ public class GUIArmorTable extends GuiInfoContainer { this.drawTexturedModalRect(guiLeft + 22, guiTop, 0, 0, this.xSize - 22, this.ySize); this.drawTexturedModalRect(guiLeft, guiTop + 31, 176, 96, 22, 100); - ItemStack armor = this.inventorySlots.getSlot(8).getStack(); + ItemStack armor = this.inventorySlots.getSlot(ArmorModHandler.MOD_SLOTS).getStack(); if(armor != null) { @@ -89,7 +90,7 @@ public class GUIArmorTable extends GuiInfoContainer { this.drawTexturedModalRect(guiLeft + 41 + 22, guiTop + 60, 176, 52, 22, 22); } - for(int i = 0; i < 8; i++) { + for(int i = 0; i < ArmorModHandler.MOD_SLOTS; i++) { Slot slot = this.inventorySlots.getSlot(i); drawIndicator(i, slot.xDisplayPosition - 1, slot.yDisplayPosition - 1); } @@ -98,7 +99,7 @@ public class GUIArmorTable extends GuiInfoContainer { private void drawIndicator(int index, int x, int y) { ItemStack mod = this.inventorySlots.getSlot(index).getStack(); - ItemStack armor = this.inventorySlots.getSlot(8).getStack(); + ItemStack armor = this.inventorySlots.getSlot(ArmorModHandler.MOD_SLOTS).getStack(); if(mod == null) return; diff --git a/src/main/java/com/hbm/items/armor/ItemArmorMod.java b/src/main/java/com/hbm/items/armor/ItemArmorMod.java index 505028648..cc6666e4f 100644 --- a/src/main/java/com/hbm/items/armor/ItemArmorMod.java +++ b/src/main/java/com/hbm/items/armor/ItemArmorMod.java @@ -64,6 +64,7 @@ public class ItemArmorMod extends Item { case ArmorModHandler.cladding: list.add(" " + I18nUtil.resolveKey("armorMod.type.cladding")); break; case ArmorModHandler.kevlar: list.add(" " + I18nUtil.resolveKey("armorMod.type.insert")); break; case ArmorModHandler.extra: list.add(" " + I18nUtil.resolveKey("armorMod.type.special")); break; + case ArmorModHandler.battery: list.add(" " + I18nUtil.resolveKey("armorMod.type.battery")); break; } } diff --git a/src/main/java/com/hbm/items/armor/ItemModBattery.java b/src/main/java/com/hbm/items/armor/ItemModBattery.java new file mode 100644 index 000000000..22193e17b --- /dev/null +++ b/src/main/java/com/hbm/items/armor/ItemModBattery.java @@ -0,0 +1,13 @@ +package com.hbm.items.armor; + +import com.hbm.handler.ArmorModHandler; + +public class ItemModBattery extends ItemArmorMod { + + public double mod; + + public ItemModBattery(double mod) { + super(ArmorModHandler.battery, true, true, true, true); + this.mod = mod; + } +} diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index f3ba05a9c..ae3372886 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -408,8 +408,8 @@ public class CraftingManager { String dyeName = "dye" + dyes[15 - i]; addRecipeAuto(new ItemStack(ModBlocks.concrete_colored, 8, i), new Object[] { "CCC", "CDC", "CCC", 'C', ModBlocks.concrete_smooth, 'D', dyeName }); } - addShapelessAuto(new ItemStack(ModBlocks.concrete_smooth, 1), new Object[] { ModBlocks.concrete_colored }); - addShapelessAuto(new ItemStack(ModBlocks.concrete_smooth, 1), new Object[] { ModBlocks.concrete_colored_ext }); + addShapelessAuto(new ItemStack(ModBlocks.concrete_smooth, 1), new Object[] { new ItemStack(ModBlocks.concrete_colored, 1, OreDictionary.WILDCARD_VALUE) }); + addShapelessAuto(new ItemStack(ModBlocks.concrete_smooth, 1), new Object[] { new ItemStack(ModBlocks.concrete_colored_ext, 1, OreDictionary.WILDCARD_VALUE) }); addRecipeAuto(new ItemStack(ModBlocks.concrete_colored_ext, 6, EnumConcreteType.MACHINE.ordinal()), new Object[] { "CCC", "1 2", "CCC", 'C', ModBlocks.concrete_smooth, '1', KEY_BROWN, '2', KEY_GRAY }); addRecipeAuto(new ItemStack(ModBlocks.concrete_colored_ext, 6, EnumConcreteType.MACHINE_STRIPE.ordinal()), new Object[] { "CCC", "1 2", "CCC", 'C', ModBlocks.concrete_smooth, '1', KEY_BROWN, '2', KEY_BLACK }); diff --git a/src/main/resources/assets/hbm/textures/gui/machine/gui_armor_modifier.png b/src/main/resources/assets/hbm/textures/gui/machine/gui_armor_modifier.png index 2834d35692c00f5e8c4c9b7a9743de6cbf4eeebe..b1c313de45bab564e34038ad667a6b3c2b1aea6b 100644 GIT binary patch delta 2797 zcmXYzc{CL28^_-nlQql;Stf%@mXZ*Ln6XB(Bvj~!NH;rU%QmB%JzJx4Wh+W{Wv7@> zqsB6wl-*b+BV$~24Knym=ic|6_dMr3=lh;#`Tp^KD2LOfvbFKuR%XVIQ3b3iOz6Ch zEO{+i?y=E3IS-naWji)MY+UK<1RWH8)|seowra>Fwv*7hdfjw-*|1w5_ngOuvB=rphbc7#x4@4Fg!=thQ z_FKLPt6>nc5P2aS)d3-iyPGeunE1H(Ax>ejKys2#f?L3PvivAy0w+G3ZNhj z0SGr>L;^$tuS2mYA(P1;$ye(}Uc1yl8KgOE`{-1;At(m~UpJvu z-!58u--hlh76aEr_E}+)bQJXC``GXEll$H|(_;-W z7HwHmYZJ78j8N+pN1kmrqoR?tOU5Z8eou&`vHi}pl#6N$Yas^P@UaVlV%ehT*xfyi z8bvA}`lIM`0sCIf8J~u==)J&}4$eOH5-Hasv}wp+RHIxGitP;&Ir>4lv@Y&`G~7BD z;5BY-cj!!06$p3CWFe#adPh)sq9f3h7#ifLSZ-w=no#k}MBakY(scYAuS#wz&?s9! zHS`0qplJ=NNBo!$d2O(Tj)KT^c5k*zObPiUq~4{bn&QFw$wWsev71gL4Ud~9DjMn? zz@AVQ|3Oj(B~lQe{6Piqo_UO#aKb<6FIG5xAIuD29F7QIUtlcT^&R30oR?Kdr_^`{ zDso3c)KD!9=JpxeR}guJ!8^BA>gFZ)YR&pXjmSO5awyd4zpphQ+pem|pz6L)bj;;F zv^+bcmQu9{2qNSj&vjfs`AIz$YYuW>4@A_Ccm@v1MISE=p79>LH;(S;OtRwe|~)VkO3^;>47^G>9@HmA9J%x9R{jngPutCd=IJ{S@G;5 zuf^|i(A!thGvdJhWI7%}qEILu_=#Grpdv=}WH^#udQDm&Bq(v<$FbK_X(@dSP@0PL z=62MhU&TZ(%(FB|PYP7U&sHh2o_AJ|zdX|g4pj%e{DuNsn1v~tsB(u4S6_*=Und_? zW*XT3FwHW1=?}~GUP3<2E%8vxWpUDm&9qd9^hXgMTq4bYyinO7REtZr z?>I)=JDZOUxu~TK{9D#^zK6Ycu?;ZC{LVzdsF9|2Ico_sTJ!w@jS2M@h0ud-GhU14 z3PxIk3hLS)Z{88=sTcK-sY4Jdn6fmaLRswKfGQR}%BL}~=tStm_Ibw7eE**KkO1Y% z^6{S`)FRQ~3^>7c{L{n+rz1I;GNfD1j83Q}pOuyX3vI2;H|OZ+$UZA<=Pu<&CX{V4 zfEf#{OWNQH{s5{^oGa*s z`+Ie={i;$%4pSz+oEzHMN=(Zq@$leFs+O$#Y;*mR&15=}Q$#{7BQInaom_Y0^Nnj7rI#Adqlf*OfRe(FIaJT)qdD{S~%>0#$6pM8>RtQQ_FM^9eV6J8W1IO0`%vleM^}kxwD$7$eBs)=KcXgxhp(M zAF5{$S1KznJG_J?PEZs{J{IDxI^_gyQ@iWWLA3?j&*%>HfxoEx6ZX&+y5*; zo0dr5l?T(k)IF#cI;XknPf% zO}T!hi9TWaajs|inE;aOg&iQXpgc3Q%gxj1?Mrpc5F37Q^?SW2mcE-k6`@Z(N8V`F zfpOz!_4-X1{jGds1@gW z-P9SMXH_$2V_YdphHfVQqqi)!3_$ne! zEm*J+Z^vv*Oz>RXTbum zf46$A#@WqqF#%v#Dl03OdS-(w4iRSmeK82WhPG8>;(lq9X{v$}33|5c~NSW`&WRlTu(`;qMD1?9c=E#35;ny>l&m?j}f(_nEBoM?m9AS4)a7TR4 z53pyr{8b$(mR(6go=BW;tb!gzRzh(F^sFBGKdfLuB0}gSv0hNf-0{GI-bWN)i>Z@` zcXB0ZHdqiSTY%pv)ptRQb6#pw(ZR{d2_?ce?S}o!2WEfjG3BK&Bvu0=Ww9e%UD^m; mJs&^;ZR%hosp(WMQOG5S zblgUN9s<1eG>FLU2Heb%()jqQ|I zv~2y=g^4i;bo(j$N{4dKnka!_ddCi0FRQ`3robEX)v3Wjy5HU=L}R^8mkWB#C`XDV zo4+<^Nv{38*I8#?IKa7a5(D(`}|)Bs{(JW=*kZQ-flWkfQ|3yNzYPu8zaN z(J6PwGT~_l05YU%)+|=*)Q{D<{E^rKs<|wv^lce+gbhfwOD?lP1Z|QAggWM2Fry>; zMhWQW3akj)b6X(P`-|w$0e9DPr7e2TpaFLo`#v;D!kH4V+CI^SjkSQ=6LI(m*NkLA zOISns2f*76=)N1#l*3z~)>c-mu;NfJ&p(etmQvRsaqo^p8$$830`@HV?c+%vl4$^n zP$KAR-B6hQ#43GYNqj!FQd(47MX$hr<3`M+c9vrV51WOkGcqiDuR! z!V0Gts&L};aOtwYkB43m=cA=;>rDw``s>@#y-w@g?| zBGh2t##?s9mTq+G*gG2cbSZ9ie0+Smtt<=5m8A!-v(_Mfl~`c6TJ2k+elC;0y%gHXr%K+EltFDJ%ho^I z%Ur`T!JO9X=Y8E()TD(@^`FU8uPGLEu~luIHK3t3e;Dr z1^Be-Hm?M~V3b_B24oah-C!)fYZ(68 z^0zZFUb>^Iz^#g=#H94}^yC$WitdQ6MTN%JUyfWb)zNPC@=dg$g_vWp^9Ibo`?B`3 z)ULWWGjW-WMD-09j=87YPda|qqW_mh>)ja}fs**~Kxb#?JB7pC7{mUi$>a9|S$>R7 zN&RAPF>#Fy zglE+NHiDbOXsO0j$=psO1FGLEM__Zr#g-eVaA)}WUa6{g5iC1drZo3udQ#&aA$;y) zT_9n#foUm3a#KgX^(>%151Cj@l5~p2eFAoxFfO^8pR1|_8gKsek5kXb8`7vxgdtyLQ26g7(uVAX>_lQ>`D!VAmNN(QFZo9niz+ zBfP0!v$J;|b%KK1}t6Tfz@x`azi|o3~Z!>+`sG{Y}n!redKKpBcS$*TZfn z!+FpUp28p6f(;36HeKP5m6ZP8Ap54NRkxht#8Uj~s6j#7Sk^3w>&oOHpe+BE%X;mJ z4TT$hv=z0MTvz!q!JFki?#f94)J9+R65fK8lA}E+X_YblkaL2^_N{JaEvghs`If`L z^*Z^WE`wUt8XdA8WqUi0dND(Pm38H2>W9-LjhV3% z8Ejup>_^Clvd@5MQ6*Ep6#^dK_y|cDcrx6(E*KB)9}&$8<5#^oX4+tMcNrO2N2$(D zE!EEm!Xr;Dvg^H7py0S}m5ky={Mp6=#KN_RP?wwu3R^9Ks6{D%g_~xuvk}DSFEzX*=N;zHea~AJopbgGs$&~f}VhNR*-pv zi_M_kKA=6Au8CjwtEDw$bX#5UmT!KYKUryl%j%VUakQ`x%&4m3pLZT74m?p2LihAb-!X2NOGQA#U{~6`eW^)oO&B@{lA|T@d-uxLpDq z^PxqCnGaSKLHR+NLQ`(_Q>h0-s3kubpM3_Q`@px;NpPfe!uH33a=2RZkI4U-|3;xe z(ZE-j)(ekRPU~z|Okh9|{$YPm48DnV5w7TGp*GgS4|EL2Cj>m_li>7W_%5$S;HG8> zUD5v6pbeqUzo5Xq)FXBK@m)uBu-=1xX_N?ctwc^P#qC4*Q;PsC?s5dA0bhApYI-p6Lcek4!CW2P1i zaiPEdKmRt1f2xx3#cIh^&8tUcFX_2JKnDyEO`yOnWC5#nEcv`%T1@J(WF^E8R~*x1 zk%-TS(!asc^f@@n{vVNqKPu-CQ4ZHclu562Sx}@d{WC4JQ+|)o!%Fuz6xKNYS}teW z5xkCMI5q1~kwzfZBtfQSM?7S?SSUk(r=UY0RY0gyx2+)eoXa~^dg$32kd6cPE_T)X Hd@lV5vY8Wv diff --git a/src/main/resources/assets/hbm/textures/items/arc_electrode_burnt.png b/src/main/resources/assets/hbm/textures/items/arc_electrode_burnt.png deleted file mode 100644 index 5d278eded669175dc1744e7343df8d69b1570121..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 447 zcmV;w0YLtVP)@7kwJ=Ds0ls1J>L)rTF<$=o$tHn+{3vS7_oSs zr*Jq-KA(?zn2kaXg+dez20=uqR4Rx>A{f(34*31F8VJBTHHB`s3yZ~qcDoI|7P2tI zk>K^f?Qq~M8bvyrg(!-M$K!uH*m60^#2Ea7fV<=ku969mf=i_mBuQew3LH=C$;-J> zXx357J;G!#pxkW1Q+>mEBB|y#R6v?F)5`uKKh%jgk`)|zN`QM002ovPDHLkV1f@g!MFeb diff --git a/src/main/resources/assets/hbm/textures/items/arc_electrode_desh.png b/src/main/resources/assets/hbm/textures/items/arc_electrode_desh.png deleted file mode 100644 index 007f2a98eaeb55118735cdc9d8ee950ec7c50913..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 537 zcmV+!0_OdRP)z_r3RgGcSLK(kF%pvv83HZd`;CCWJAB zn|3XV+C;dBNLnU{E~21~=)!OzYGkMsu5{5R$dsTK{YeT%PLMh-CUoY_obGGYB4*x& z3m+f%+;h(5ULazeQ3_*PW5z$huXhJ{r^%-)|5nrn&0&-J<2*HfA1o3>i3Hllr)Z)! zcwAe_=JP#pTa!@6z^bc7Qzio)1^m!xwwyZ)ucr&y*Bf9V0L0S7=5~1tleR@CD4?qU z07izIPqIY)!J=wo5ZlRM^Z8 z4RWp8V1Fm znqR4FLCdanll$|}S&Fi5YEG2cG(l$hjm9&J`HuJmekx@TD!R((Y;<$~fyXh9^=GBk X&t>oUbcpL9&|3_iu6{1-oD!Mv7C&dPn?Am8Hnui8NAL;o)A zHLrJ_mT{8!HN8pB=-7cMZU&8|JVK@HbBm{GG^Sth`82`%{oil{28-tc$#?jf(%1xj z9oLpxPhzduyH28$<4jG1%I$5umt5PXOk%pAvh^C{Da*%K>ba{p1x-J2y(<36pEB3~ bLjF_E%fc>l&OS>)-eB-_^>bP0l+XkK^7U0Y literal 0 HcmV?d00001 From b8d24b5c2de7b8916f455fc51a8bbb8e2a61ac12 Mon Sep 17 00:00:00 2001 From: Boblet Date: Tue, 20 Aug 2024 16:30:15 +0200 Subject: [PATCH 13/17] battery packs --- .../java/api/hbm/energymk2/IBatteryItem.java | 2 +- .../com/hbm/blocks/generic/HEVBattery.java | 2 +- .../java/com/hbm/handler/ArmorModHandler.java | 20 ++++++++++++++- src/main/java/com/hbm/items/ModItems.java | 3 +++ .../com/hbm/items/armor/ArmorFSBPowered.java | 24 ++++++++++-------- .../java/com/hbm/items/armor/ArmorHEV.java | 2 +- .../java/com/hbm/items/food/ItemPancake.java | 2 +- .../com/hbm/items/machine/ItemBattery.java | 9 ++++--- .../hbm/items/machine/ItemSelfcharger.java | 2 +- .../com/hbm/items/special/ItemGlitch.java | 2 +- .../com/hbm/items/special/ItemPotatos.java | 2 +- .../com/hbm/items/tool/ItemFusionCore.java | 2 +- .../hbm/items/tool/ItemSwordAbilityPower.java | 2 +- .../hbm/items/tool/ItemToolAbilityPower.java | 2 +- .../weapon/gununified/ItemEnergyGunBase.java | 6 ++--- src/main/java/com/hbm/lib/Library.java | 2 +- .../bomb/TileEntityNukeBalefire.java | 4 +-- .../tileentity/machine/TileEntityCharger.java | 4 +-- .../machine/TileEntityMachineDiesel.java | 2 +- .../storage/TileEntityMachineBattery.java | 2 +- src/main/java/com/hbm/util/BobMathUtil.java | 11 ++++++++ src/main/resources/assets/hbm/lang/de_DE.lang | 2 ++ src/main/resources/assets/hbm/lang/en_US.lang | 2 ++ .../hbm/textures/items/armor_battery.png | Bin 367 -> 403 bytes .../hbm/textures/items/armor_battery_base.png | Bin 0 -> 367 bytes 25 files changed, 77 insertions(+), 34 deletions(-) create mode 100644 src/main/resources/assets/hbm/textures/items/armor_battery_base.png diff --git a/src/main/java/api/hbm/energymk2/IBatteryItem.java b/src/main/java/api/hbm/energymk2/IBatteryItem.java index 19202cfa1..d0d5931b7 100644 --- a/src/main/java/api/hbm/energymk2/IBatteryItem.java +++ b/src/main/java/api/hbm/energymk2/IBatteryItem.java @@ -10,7 +10,7 @@ public interface IBatteryItem { public void setCharge(ItemStack stack, long i); public void dischargeBattery(ItemStack stack, long i); public long getCharge(ItemStack stack); - public long getMaxCharge(); + public long getMaxCharge(ItemStack stack); public long getChargeRate(); public long getDischargeRate(); diff --git a/src/main/java/com/hbm/blocks/generic/HEVBattery.java b/src/main/java/com/hbm/blocks/generic/HEVBattery.java index e65f03038..388728e79 100644 --- a/src/main/java/com/hbm/blocks/generic/HEVBattery.java +++ b/src/main/java/com/hbm/blocks/generic/HEVBattery.java @@ -67,7 +67,7 @@ public class HEVBattery extends Block { if(st.getItem() instanceof IBatteryItem) { - long maxcharge = ((IBatteryItem) st.getItem()).getMaxCharge(); + long maxcharge = ((IBatteryItem) st.getItem()).getMaxCharge(st); long charge = ((IBatteryItem) st.getItem()).getCharge(st); long newcharge = Math.min(charge + 150000, maxcharge); diff --git a/src/main/java/com/hbm/handler/ArmorModHandler.java b/src/main/java/com/hbm/handler/ArmorModHandler.java index f7b8780ca..04877a1df 100644 --- a/src/main/java/com/hbm/handler/ArmorModHandler.java +++ b/src/main/java/com/hbm/handler/ArmorModHandler.java @@ -134,7 +134,7 @@ public class ArmorModHandler { } /** - * Does what the name implies + * Does what the name implies. Returns true if the stack has NBT and that NBT has the MOD_COMPOUND_KEY tag. * @param armor * @return */ @@ -171,4 +171,22 @@ public class ArmorModHandler { return slots; } + + public static ItemStack pryMod(ItemStack armor, int slot) { + + if(!hasMods(armor)) + return null; + + NBTTagCompound nbt = armor.getTagCompound(); + NBTTagCompound mods = nbt.getCompoundTag(MOD_COMPOUND_KEY); + NBTTagCompound cmp = mods.getCompoundTag(MOD_SLOT_KEY + slot); + ItemStack stack = ItemStack.loadItemStackFromNBT(cmp); + + if(stack != null) + return stack; + + removeMod(armor, slot); + + return null; + } } diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index f3309fb32..d20976e44 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -2174,6 +2174,7 @@ public class ModItems { public static Item card_aos; public static Item card_qos; public static Item australium_iii; + public static Item armor_battery; public static Item hazmat_helmet; public static Item hazmat_plate; @@ -3353,6 +3354,7 @@ public class ModItems { card_aos = new ItemModCard().setUnlocalizedName("card_aos").setTextureName(RefStrings.MODID + ":card_aos"); card_qos = new ItemModCard().setUnlocalizedName("card_qos").setTextureName(RefStrings.MODID + ":card_qos"); australium_iii = new ItemModShield(25F).setUnlocalizedName("australium_iii").setTextureName(RefStrings.MODID + ":australium_iii"); + armor_battery = new ItemModBattery(1.25D).setUnlocalizedName("armor_battery").setTextureName(RefStrings.MODID + ":armor_battery"); cap_nuka = new Item().setUnlocalizedName("cap_nuka").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":cap_nuka"); cap_quantum = new Item().setUnlocalizedName("cap_quantum").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":cap_quantum"); @@ -7388,6 +7390,7 @@ public class ModItems { GameRegistry.registerItem(card_aos, card_aos.getUnlocalizedName()); GameRegistry.registerItem(card_qos, card_qos.getUnlocalizedName()); GameRegistry.registerItem(australium_iii, australium_iii.getUnlocalizedName()); + GameRegistry.registerItem(armor_battery, armor_battery.getUnlocalizedName()); //Chaos GameRegistry.registerItem(chocolate_milk, chocolate_milk.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/armor/ArmorFSBPowered.java b/src/main/java/com/hbm/items/armor/ArmorFSBPowered.java index 0daddf0fb..d5368b5f3 100644 --- a/src/main/java/com/hbm/items/armor/ArmorFSBPowered.java +++ b/src/main/java/com/hbm/items/armor/ArmorFSBPowered.java @@ -2,6 +2,7 @@ package com.hbm.items.armor; import java.util.List; +import com.hbm.handler.ArmorModHandler; import com.hbm.util.BobMathUtil; import api.hbm.energymk2.IBatteryItem; @@ -30,9 +31,7 @@ public class ArmorFSBPowered extends ArmorFSB implements IBatteryItem { @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) { - - list.add("Charge: " + BobMathUtil.getShortNumber(getCharge(stack)) + " / " + BobMathUtil.getShortNumber(maxPower)); - + list.add("Charge: " + BobMathUtil.getShortNumber(getCharge(stack)) + " / " + BobMathUtil.getShortNumber(getMaxCharge(stack))); super.addInformation(stack, player, list, ext); } @@ -72,7 +71,7 @@ public class ArmorFSBPowered extends ArmorFSB implements IBatteryItem { stack.stackTagCompound.setLong("charge", stack.stackTagCompound.getLong("charge") - i); } else { stack.stackTagCompound = new NBTTagCompound(); - stack.stackTagCompound.setLong("charge", this.maxPower - i); + stack.stackTagCompound.setLong("charge", getMaxCharge(stack) - i); } if(stack.stackTagCompound.getLong("charge") < 0) @@ -84,10 +83,10 @@ public class ArmorFSBPowered extends ArmorFSB implements IBatteryItem { public long getCharge(ItemStack stack) { if(stack.getItem() instanceof ArmorFSBPowered) { if(stack.hasTagCompound()) { - return stack.stackTagCompound.getLong("charge"); + return Math.min(stack.stackTagCompound.getLong("charge"), getMaxCharge(stack)); } else { stack.stackTagCompound = new NBTTagCompound(); - stack.stackTagCompound.setLong("charge", ((ArmorFSBPowered) stack.getItem()).maxPower); + stack.stackTagCompound.setLong("charge", getMaxCharge(stack)); return stack.stackTagCompound.getLong("charge"); } } @@ -97,18 +96,23 @@ public class ArmorFSBPowered extends ArmorFSB implements IBatteryItem { @Override public boolean showDurabilityBar(ItemStack stack) { - - return getCharge(stack) < maxPower; + return getCharge(stack) < getMaxCharge(stack); } @Override public double getDurabilityForDisplay(ItemStack stack) { - return 1 - (double) getCharge(stack) / (double) maxPower; + return 1 - (double) getCharge(stack) / (double) getMaxCharge(stack); } @Override - public long getMaxCharge() { + public long getMaxCharge(ItemStack stack) { + if(ArmorModHandler.hasMods(stack)) { + ItemStack mod = ArmorModHandler.pryMod(stack, ArmorModHandler.battery); + if(mod != null && mod.getItem() instanceof ItemModBattery) { + return (long) (maxPower * ((ItemModBattery) mod.getItem()).mod); + } + } return maxPower; } diff --git a/src/main/java/com/hbm/items/armor/ArmorHEV.java b/src/main/java/com/hbm/items/armor/ArmorHEV.java index df2666d68..5aa336fa9 100644 --- a/src/main/java/com/hbm/items/armor/ArmorHEV.java +++ b/src/main/java/com/hbm/items/armor/ArmorHEV.java @@ -108,7 +108,7 @@ public class ArmorHEV extends ArmorFSBPowered { ItemStack armor = player.inventory.armorInventory[i]; ArmorFSBPowered item = ((ArmorFSBPowered) player.inventory.armorInventory[i].getItem()); - c += (double) item.getCharge(armor) / (double) item.getMaxCharge(); + c += (double) item.getCharge(armor) / (double) item.getMaxCharge(armor); } int aX = (int) (70 / scale); diff --git a/src/main/java/com/hbm/items/food/ItemPancake.java b/src/main/java/com/hbm/items/food/ItemPancake.java index 784ee8995..2498e393c 100644 --- a/src/main/java/com/hbm/items/food/ItemPancake.java +++ b/src/main/java/com/hbm/items/food/ItemPancake.java @@ -30,7 +30,7 @@ public class ItemPancake extends ItemFood { continue; if(st.getItem() instanceof IBatteryItem) { - ((IBatteryItem)st.getItem()).setCharge(st, ((IBatteryItem)st.getItem()).getMaxCharge()); + ((IBatteryItem)st.getItem()).setCharge(st, ((IBatteryItem)st.getItem()).getMaxCharge(st)); } } } diff --git a/src/main/java/com/hbm/items/machine/ItemBattery.java b/src/main/java/com/hbm/items/machine/ItemBattery.java index cefa97fce..fe31ec3b9 100644 --- a/src/main/java/com/hbm/items/machine/ItemBattery.java +++ b/src/main/java/com/hbm/items/machine/ItemBattery.java @@ -105,14 +105,17 @@ public class ItemBattery extends Item implements IBatteryItem { return 0; } - public long getMaxCharge() { + @Override + public long getMaxCharge(ItemStack stack) { return maxCharge; } + @Override public long getChargeRate() { return chargeRate; } + @Override public long getDischargeRate() { return dischargeRate; } @@ -134,7 +137,7 @@ public class ItemBattery extends Item implements IBatteryItem { if(item instanceof ItemBattery) { ItemStack stack = new ItemStack(item); stack.stackTagCompound = new NBTTagCompound(); - stack.stackTagCompound.setLong("charge", ((ItemBattery) item).getMaxCharge()); + stack.stackTagCompound.setLong("charge", ((ItemBattery) item).getMaxCharge(stack)); return stack.copy(); } @@ -146,7 +149,7 @@ public class ItemBattery extends Item implements IBatteryItem { } public double getDurabilityForDisplay(ItemStack stack) { - return 1D - (double) getCharge(stack) / (double) getMaxCharge(); + return 1D - (double) getCharge(stack) / (double) getMaxCharge(stack); } @Override diff --git a/src/main/java/com/hbm/items/machine/ItemSelfcharger.java b/src/main/java/com/hbm/items/machine/ItemSelfcharger.java index 67c05fb7b..419f5401d 100644 --- a/src/main/java/com/hbm/items/machine/ItemSelfcharger.java +++ b/src/main/java/com/hbm/items/machine/ItemSelfcharger.java @@ -38,7 +38,7 @@ public class ItemSelfcharger extends Item implements IBatteryItem { } @Override - public long getMaxCharge() { + public long getMaxCharge(ItemStack stack) { return charge; } diff --git a/src/main/java/com/hbm/items/special/ItemGlitch.java b/src/main/java/com/hbm/items/special/ItemGlitch.java index 715eacd17..4145b0fbf 100644 --- a/src/main/java/com/hbm/items/special/ItemGlitch.java +++ b/src/main/java/com/hbm/items/special/ItemGlitch.java @@ -241,7 +241,7 @@ public class ItemGlitch extends Item implements IBatteryItem { @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 getMaxCharge(ItemStack stack) { return 200; } @Override public long getChargeRate() { return 0; } @Override public long getDischargeRate() { return 200; } } diff --git a/src/main/java/com/hbm/items/special/ItemPotatos.java b/src/main/java/com/hbm/items/special/ItemPotatos.java index 69aefa465..46c636689 100644 --- a/src/main/java/com/hbm/items/special/ItemPotatos.java +++ b/src/main/java/com/hbm/items/special/ItemPotatos.java @@ -28,7 +28,7 @@ public class ItemPotatos extends ItemBattery { if(p.getHeldItem() == stack) { - float pitch = (float)getCharge(stack) / (float)this.getMaxCharge() * 0.5F + 0.5F; + float pitch = (float)getCharge(stack) / (float)this.getMaxCharge(stack) * 0.5F + 0.5F; world.playSoundAtEntity(p, "hbm:potatos.random", 1.0F, pitch); setTimer(stack, 200 + itemRand.nextInt(100)); diff --git a/src/main/java/com/hbm/items/tool/ItemFusionCore.java b/src/main/java/com/hbm/items/tool/ItemFusionCore.java index 473f6f62b..b72ee8d4f 100644 --- a/src/main/java/com/hbm/items/tool/ItemFusionCore.java +++ b/src/main/java/com/hbm/items/tool/ItemFusionCore.java @@ -33,7 +33,7 @@ public class ItemFusionCore extends Item { if(st.getItem() instanceof IBatteryItem) { - long maxcharge = ((IBatteryItem) st.getItem()).getMaxCharge(); + long maxcharge = ((IBatteryItem) st.getItem()).getMaxCharge(st); long charge = ((IBatteryItem) st.getItem()).getCharge(st); long newcharge = Math.min(charge + this.charge, maxcharge); diff --git a/src/main/java/com/hbm/items/tool/ItemSwordAbilityPower.java b/src/main/java/com/hbm/items/tool/ItemSwordAbilityPower.java index 674fb7572..943dfd7ab 100644 --- a/src/main/java/com/hbm/items/tool/ItemSwordAbilityPower.java +++ b/src/main/java/com/hbm/items/tool/ItemSwordAbilityPower.java @@ -106,7 +106,7 @@ public class ItemSwordAbilityPower extends ItemSwordAbility implements IBatteryI } @Override - public long getMaxCharge() { + public long getMaxCharge(ItemStack stack) { return maxPower; } diff --git a/src/main/java/com/hbm/items/tool/ItemToolAbilityPower.java b/src/main/java/com/hbm/items/tool/ItemToolAbilityPower.java index 52b8686b4..c0c025d35 100644 --- a/src/main/java/com/hbm/items/tool/ItemToolAbilityPower.java +++ b/src/main/java/com/hbm/items/tool/ItemToolAbilityPower.java @@ -102,7 +102,7 @@ public class ItemToolAbilityPower extends ItemToolAbility implements IBatteryIte } @Override - public long getMaxCharge() { + public long getMaxCharge(ItemStack stack) { return maxPower; } diff --git a/src/main/java/com/hbm/items/weapon/gununified/ItemEnergyGunBase.java b/src/main/java/com/hbm/items/weapon/gununified/ItemEnergyGunBase.java index d93a73f4a..554f5a6ea 100644 --- a/src/main/java/com/hbm/items/weapon/gununified/ItemEnergyGunBase.java +++ b/src/main/java/com/hbm/items/weapon/gununified/ItemEnergyGunBase.java @@ -181,7 +181,7 @@ public class ItemEnergyGunBase extends ItemGunBase implements IBatteryItem { } public double getDurabilityForDisplay(ItemStack stack) { - return 1D - (double) getCharge(stack) / (double) getMaxCharge(); + return 1D - (double) getCharge(stack) / (double) getMaxCharge(stack); } @Override @@ -236,7 +236,7 @@ public class ItemEnergyGunBase extends ItemGunBase implements IBatteryItem { } @Override - public long getMaxCharge() { + public long getMaxCharge(ItemStack stack) { return mainConfig.maxCharge; } @@ -266,7 +266,7 @@ public class ItemEnergyGunBase extends ItemGunBase implements IBatteryItem { ItemStack stack = new ItemStack(item); stack.stackTagCompound = new NBTTagCompound(); - stack.stackTagCompound.setLong("charge", ((ItemEnergyGunBase) item).getMaxCharge()); + stack.stackTagCompound.setLong("charge", ((ItemEnergyGunBase) item).getMaxCharge(stack)); list.add(stack); } diff --git a/src/main/java/com/hbm/lib/Library.java b/src/main/java/com/hbm/lib/Library.java index 6da55124b..828433470 100644 --- a/src/main/java/com/hbm/lib/Library.java +++ b/src/main/java/com/hbm/lib/Library.java @@ -243,7 +243,7 @@ public class Library { IBatteryItem battery = (IBatteryItem) slots[index].getItem(); - long batMax = battery.getMaxCharge(); + long batMax = battery.getMaxCharge(slots[index]); long batCharge = battery.getCharge(slots[index]); long batRate = battery.getChargeRate(); long toCharge = Math.min(Math.min(power, batRate), batMax - batCharge); diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeBalefire.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeBalefire.java index 51bef052f..db18d4bfb 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeBalefire.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeBalefire.java @@ -103,12 +103,12 @@ public class TileEntityNukeBalefire extends TileEntityMachineBase implements IGU public int getBattery() { if(slots[1] != null && slots[1].getItem() == ModItems.battery_spark && - ((IBatteryItem)ModItems.battery_spark).getCharge(slots[1]) == ((IBatteryItem)ModItems.battery_spark).getMaxCharge()) { + ((IBatteryItem)ModItems.battery_spark).getCharge(slots[1]) == ((IBatteryItem)ModItems.battery_spark).getMaxCharge(slots[1])) { return 1; } if(slots[1] != null && slots[1].getItem() == ModItems.battery_trixite && - ((IBatteryItem)ModItems.battery_trixite).getCharge(slots[1]) == ((IBatteryItem)ModItems.battery_trixite).getMaxCharge()) { + ((IBatteryItem)ModItems.battery_trixite).getCharge(slots[1]) == ((IBatteryItem)ModItems.battery_trixite).getMaxCharge(slots[1])) { return 2; } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityCharger.java b/src/main/java/com/hbm/tileentity/machine/TileEntityCharger.java index e747c3a5d..6df1f8bf9 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityCharger.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityCharger.java @@ -47,7 +47,7 @@ public class TileEntityCharger extends TileEntityLoadedBase implements IEnergyRe if(stack != null && stack.getItem() instanceof IBatteryItem) { IBatteryItem battery = (IBatteryItem) stack.getItem(); - charge += Math.min(battery.getMaxCharge() - battery.getCharge(stack), battery.getChargeRate()); + charge += Math.min(battery.getMaxCharge(stack) - battery.getCharge(stack), battery.getChargeRate()); } } } @@ -127,7 +127,7 @@ public class TileEntityCharger extends TileEntityLoadedBase implements IEnergyRe if(stack != null && stack.getItem() instanceof IBatteryItem) { IBatteryItem battery = (IBatteryItem) stack.getItem(); - long toCharge = Math.min(battery.getMaxCharge() - battery.getCharge(stack), battery.getChargeRate()); + long toCharge = Math.min(battery.getMaxCharge(stack) - battery.getCharge(stack), battery.getChargeRate()); toCharge = Math.min(toCharge, power / 5); battery.chargeBattery(stack, toCharge); power -= toCharge; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java index 85ebe4747..d36cb4336 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java @@ -111,7 +111,7 @@ public class TileEntityMachineDiesel extends TileEntityMachinePolluting implemen } } if(i == 2) { - if(stack.getItem() instanceof IBatteryItem && ((IBatteryItem) stack.getItem()).getCharge(stack) == ((IBatteryItem) stack.getItem()).getMaxCharge()) { + if(stack.getItem() instanceof IBatteryItem && ((IBatteryItem) stack.getItem()).getCharge(stack) == ((IBatteryItem) stack.getItem()).getMaxCharge(stack)) { return true; } } diff --git a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineBattery.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineBattery.java index 665d18317..f61193726 100644 --- a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineBattery.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineBattery.java @@ -141,7 +141,7 @@ public class TileEntityMachineBattery extends TileEntityMachineBase implements I if(i == 0 && ((IBatteryItem)itemStack.getItem()).getCharge(itemStack) == 0) { return true; } - if(i == 1 && ((IBatteryItem)itemStack.getItem()).getCharge(itemStack) == ((IBatteryItem)itemStack.getItem()).getMaxCharge()) { + if(i == 1 && ((IBatteryItem)itemStack.getItem()).getCharge(itemStack) == ((IBatteryItem)itemStack.getItem()).getMaxCharge(itemStack)) { return true; } } diff --git a/src/main/java/com/hbm/util/BobMathUtil.java b/src/main/java/com/hbm/util/BobMathUtil.java index dde5fe762..3330cda22 100644 --- a/src/main/java/com/hbm/util/BobMathUtil.java +++ b/src/main/java/com/hbm/util/BobMathUtil.java @@ -206,4 +206,15 @@ public class BobMathUtil { double delta = (beta - alpha + 180) % 360 - 180; return delta < -180 ? delta + 360 : delta; } + + /** Soft peak sine */ + public static double sps(double x) { + return Math.sin(Math.PI / 2D * Math.cos(x)); + } + + /** Square wave sine, make sure squarination is [0;1] */ + public static double sws(double x, double squarination) { + double s = Math.sin(x); + return Math.pow(Math.abs(s), 2 - squarination) / s; + } } diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index f14a5d786..49512628c 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -119,6 +119,7 @@ armorMod.chestplates=Brustplatten armorMod.helmets=Helme armorMod.leggings=Beinschienen armorMod.insertHere=Rüstung zum Modifizieren einlegen... +armorMod.type.battery=Batterie armorMod.type.boots=Stiefel armorMod.type.chestplate=Brustplatte armorMod.type.cladding=Beschläge @@ -1188,6 +1189,7 @@ item.arc_electrode_burnt.graphite.name=Geschmolzene Graphitelektrode item.arc_electrode_burnt.lanthanium.name=Geschmolzene Lanthanelektrode item.arc_electrode_burnt.saturnite.name=Geschmolzene Saturnitelektrode item.arc_electrode_desh.name=Desh-Elektrode +item.armor_battery.name=Powerrüstung-Akkusatz item.armor_polish.name=ShiningArmor™ Rüstungspolitur item.asbestos_boots.name=Hitzeschutzstiefel item.asbestos_cloth.name=Hitzeschutzanzugsstoff diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index c9f28f764..caa5b6145 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -174,6 +174,7 @@ armorMod.chestplates=Chestplates armorMod.helmets=Helmets armorMod.insertHere=Insert armor to modify... armorMod.leggings=Leggings +armorMod.type.battery=Battery armorMod.type.boots=Boots armorMod.type.chestplate=Chestplate armorMod.type.cladding=Cladding @@ -1900,6 +1901,7 @@ item.arc_electrode_burnt.graphite.name=Molten Graphite Electrode item.arc_electrode_burnt.lanthanium.name=Molten Lanthanium Electrode item.arc_electrode_burnt.saturnite.name=Molten Saturnite Electrode item.arc_electrode_desh.name=Desh Electrode +item.armor_battery.name=Power Armor Battery Pack item.armor_polish.name=ShiningArmor™ Armor Polish item.asbestos_boots.name=Fire Proximity Boots item.asbestos_cloth.name=Fire Proximity Cloth diff --git a/src/main/resources/assets/hbm/textures/items/armor_battery.png b/src/main/resources/assets/hbm/textures/items/armor_battery.png index ad4e8b8af75b426746dd384cb3cb0faa78a80a20..86a0cb9a15a2cf609a9ddea0cc58b4a8ae88c072 100644 GIT binary patch delta 360 zcmV-u0hj*o0+R!fG=EA-L_t(IjbmV-CiwGi>HkMp`~Q=ohY7~$-?;1l<6FxZ-ap;Q z(7$mP(S|U>H0#%wF(}TEX882!E5qBe4-6L@yHFGs`nxgydAIccv*)iE zMg@-^Lr2CXI9qVhHWUN;H}3lX^l#ktztG=}5r6Ii_uzv69&uhM8kTo2 zL3Jx%Jj1H`K8BAUzcQpwsAY&u|I1M5@5Tss!Ks}m;A({=gc%}BW6%s-$Pm_41mS#I z$iTo5gX#rj@b1N1hEp%zVlnV9R3wJs9aJ8x0SpWb4DVjPgJ>2P!fK$9xDW#a15z}i zYZek0f?x?@Tw!+LHh>hs!oa}5@E&R-+=)mwze935P6JLIS;QzPUO-Y3Mlpbafq`M? z+6j!v67IpM1|qwVfdLW7D4OsAWCMl7g&3Akt0P)3UH|}3^?7?}lPsYC0000K~WSeS4Vt~$5x?~(rE+iRYBl+jF*4$!GCS7@TN~s2L%IUWT2i%`2pzIYk zm8L0anzjJfWk!+bc{iYfROU9I>$(68y3B81S6nX^2qC(9bOQh$R(DJeA9tFeTp`bM ztCJ9d7vJZcS3PU=PCy*Tj#8@k^=$zFqA0R1tqE-YMV4hic}RV<2^2yQhGB2-PW=L{ WBXbsJLV)1_0000lG^l+tMf>{UVFd5o8T@xgq)HQ~kk46=;b@TLYj07@w{8jUPN z6h+oM8{G4}FDZ%wpC@iF*GMUydV(ZL>S7@TN~s2L%IUWT2i%`2pzIYkm8L0anzjJf zWk!+bc{iYfROU9I>$(68y3B81S6nX^2qC(9bOQh$R(DJeA9tFeTp`bMtCJ9d7vJZc zS8Mc6Kpe-8QmXg$Z2 Date: Tue, 20 Aug 2024 23:18:54 +0200 Subject: [PATCH 14/17] more battery packs --- src/main/java/com/hbm/items/ModItems.java | 6 + src/main/resources/assets/hbm/lang/de_DE.lang | 2 + src/main/resources/assets/hbm/lang/en_US.lang | 2 + .../assets/hbm/models/machines/derrick.obj | 2 +- .../assets/hbm/models/weapons/carbine.obj | 2634 +++++++++++++++++ .../hbm/textures/items/armor_battery_mk2.png | Bin 0 -> 370 bytes .../hbm/textures/items/armor_battery_mk3.png | Bin 0 -> 403 bytes 7 files changed, 2645 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/hbm/models/weapons/carbine.obj create mode 100644 src/main/resources/assets/hbm/textures/items/armor_battery_mk2.png create mode 100644 src/main/resources/assets/hbm/textures/items/armor_battery_mk3.png diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index d20976e44..b7789ba87 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -2175,6 +2175,8 @@ public class ModItems { public static Item card_qos; public static Item australium_iii; public static Item armor_battery; + public static Item armor_battery_mk2; + public static Item armor_battery_mk3; public static Item hazmat_helmet; public static Item hazmat_plate; @@ -3355,6 +3357,8 @@ public class ModItems { card_qos = new ItemModCard().setUnlocalizedName("card_qos").setTextureName(RefStrings.MODID + ":card_qos"); australium_iii = new ItemModShield(25F).setUnlocalizedName("australium_iii").setTextureName(RefStrings.MODID + ":australium_iii"); armor_battery = new ItemModBattery(1.25D).setUnlocalizedName("armor_battery").setTextureName(RefStrings.MODID + ":armor_battery"); + armor_battery_mk2 = new ItemModBattery(1.5D).setUnlocalizedName("armor_battery_mk2").setTextureName(RefStrings.MODID + ":armor_battery_mk2"); + armor_battery_mk3 = new ItemModBattery(2D).setUnlocalizedName("armor_battery_mk3").setTextureName(RefStrings.MODID + ":armor_battery_mk3"); cap_nuka = new Item().setUnlocalizedName("cap_nuka").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":cap_nuka"); cap_quantum = new Item().setUnlocalizedName("cap_quantum").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":cap_quantum"); @@ -7391,6 +7395,8 @@ public class ModItems { GameRegistry.registerItem(card_qos, card_qos.getUnlocalizedName()); GameRegistry.registerItem(australium_iii, australium_iii.getUnlocalizedName()); GameRegistry.registerItem(armor_battery, armor_battery.getUnlocalizedName()); + GameRegistry.registerItem(armor_battery_mk2, armor_battery_mk2.getUnlocalizedName()); + GameRegistry.registerItem(armor_battery_mk3, armor_battery_mk3.getUnlocalizedName()); //Chaos GameRegistry.registerItem(chocolate_milk, chocolate_milk.getUnlocalizedName()); diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index 49512628c..026f86d95 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -1190,6 +1190,8 @@ item.arc_electrode_burnt.lanthanium.name=Geschmolzene Lanthanelektrode item.arc_electrode_burnt.saturnite.name=Geschmolzene Saturnitelektrode item.arc_electrode_desh.name=Desh-Elektrode item.armor_battery.name=Powerrüstung-Akkusatz +item.armor_battery_mk2.name=Powerrüstung-Akkusatz Mk2 +item.armor_battery_mk3.name=Powerrüstung-Akkusatz Mk3 item.armor_polish.name=ShiningArmor™ Rüstungspolitur item.asbestos_boots.name=Hitzeschutzstiefel item.asbestos_cloth.name=Hitzeschutzanzugsstoff diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index caa5b6145..53e2aff13 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -1902,6 +1902,8 @@ item.arc_electrode_burnt.lanthanium.name=Molten Lanthanium Electrode item.arc_electrode_burnt.saturnite.name=Molten Saturnite Electrode item.arc_electrode_desh.name=Desh Electrode item.armor_battery.name=Power Armor Battery Pack +item.armor_battery_mk2.name=Power Armor Battery Pack Mk2 +item.armor_battery_mk3.name=Power Armor Battery Pack Mk3 item.armor_polish.name=ShiningArmor™ Armor Polish item.asbestos_boots.name=Fire Proximity Boots item.asbestos_cloth.name=Fire Proximity Cloth diff --git a/src/main/resources/assets/hbm/models/machines/derrick.obj b/src/main/resources/assets/hbm/models/machines/derrick.obj index e3b02a297..8b2b01979 100644 --- a/src/main/resources/assets/hbm/models/machines/derrick.obj +++ b/src/main/resources/assets/hbm/models/machines/derrick.obj @@ -767,7 +767,7 @@ vt 0.306452 0.431818 vt 0.258065 0.045455 vt 0.306452 0.113636 vt 0.580645 0.045455 -vt 0.540323 0.125000 +vt 0.532258 0.113636 vt 0.580645 0.500000 vt 0.532258 0.431818 vt 0.258065 0.500000 diff --git a/src/main/resources/assets/hbm/models/weapons/carbine.obj b/src/main/resources/assets/hbm/models/weapons/carbine.obj new file mode 100644 index 000000000..d11ea138d --- /dev/null +++ b/src/main/resources/assets/hbm/models/weapons/carbine.obj @@ -0,0 +1,2634 @@ +# Blender v2.79 (sub 0) OBJ File: 'carbine.blend' +# www.blender.org +o Cylinder +v -0.000000 1.187500 4.375000 +v -0.000000 1.187500 8.000000 +v 0.093750 1.162380 4.375000 +v 0.093750 1.162380 8.000000 +v 0.162380 1.093750 4.375000 +v 0.162380 1.093750 8.000000 +v 0.187500 1.000000 4.375000 +v 0.187500 1.000000 8.000000 +v 0.162380 0.906250 4.375000 +v 0.162380 0.906250 8.000000 +v 0.093750 0.837620 4.375000 +v 0.093750 0.837620 8.000000 +v 0.000000 0.812500 4.375000 +v 0.000000 0.812500 8.000000 +v -0.093750 0.837620 4.375000 +v -0.093750 0.837620 8.000000 +v -0.162380 0.906250 4.375000 +v -0.162380 0.906250 8.000000 +v -0.187500 1.000000 4.375000 +v -0.187500 1.000000 8.000000 +v -0.162380 1.093750 4.375000 +v -0.162380 1.093750 8.000000 +v -0.093750 1.162380 4.375000 +v -0.093750 1.162380 8.000000 +v -0.000000 1.125000 8.000000 +v -0.062500 1.108253 8.000000 +v -0.108253 1.062500 8.000000 +v -0.125000 1.000000 8.000000 +v -0.108253 0.937500 8.000000 +v -0.062500 0.891747 8.000000 +v -0.000000 0.875000 8.000000 +v 0.062500 0.891747 8.000000 +v 0.108253 0.937500 8.000000 +v 0.125000 1.000000 8.000000 +v 0.108253 1.062500 8.000000 +v 0.062500 1.108253 8.000000 +v -0.062500 1.108253 7.000000 +v -0.000000 1.125000 7.000000 +v -0.108253 1.062500 7.000000 +v -0.125000 1.000000 7.000000 +v -0.108253 0.937500 7.000000 +v -0.062500 0.891747 7.000000 +v -0.000000 0.875000 7.000000 +v 0.062500 0.891747 7.000000 +v 0.108253 0.937500 7.000000 +v 0.125000 1.000000 7.000000 +v 0.108253 1.062500 7.000000 +v 0.062500 1.108253 7.000000 +v -0.250000 1.000000 4.375000 +v 0.250000 1.000000 4.375000 +v -0.125000 1.375000 4.375000 +v 0.125000 1.375000 4.375000 +v -0.250000 1.000000 5.000000 +v 0.250000 1.000000 5.000000 +v -0.250000 0.750000 5.250000 +v 0.250000 0.750000 5.250000 +v -0.250000 0.500000 5.000000 +v 0.250000 0.500000 5.000000 +v -0.250000 0.500000 4.125000 +v 0.250000 0.500000 4.125000 +v -0.250000 0.312500 3.500000 +v 0.250000 0.312500 3.500000 +v 0.250000 1.000000 3.500000 +v -0.250000 1.000000 3.500000 +v -0.250000 0.312500 1.375000 +v 0.250000 0.312500 1.375000 +v -0.250000 1.125000 4.375000 +v 0.250000 1.125000 4.375000 +v -0.125000 1.375000 1.500000 +v 0.125000 1.375000 1.500000 +v -0.250000 1.125000 1.500000 +v 0.250000 1.125000 1.500000 +v 0.250000 1.125000 3.500000 +v -0.250000 1.125000 3.500000 +v 0.250000 1.000000 1.500000 +v -0.250000 1.000000 1.500000 +v -0.250000 0.625000 1.375000 +v 0.250000 0.625000 1.375000 +v 0.062500 1.312500 4.375000 +v -0.187500 1.125000 3.500000 +v -0.062500 1.312500 4.375000 +v 0.062500 1.312500 1.500000 +v -0.187500 1.125000 1.500000 +v -0.062500 1.312500 1.500000 +v -0.187500 1.000000 3.500000 +v -0.187500 1.000000 1.500000 +v 0.187500 1.125000 3.500000 +v 0.187500 1.125000 1.500000 +v 0.187500 1.000000 3.500000 +v 0.187500 1.000000 1.500000 +v 0.250000 0.375000 3.625000 +v 0.125000 1.375000 3.625000 +v 0.250000 1.125000 3.625000 +v -0.250000 0.375000 3.625000 +v -0.250000 1.125000 3.625000 +v -0.125000 1.375000 3.625000 +v 0.062500 1.312500 3.625000 +v 0.250000 0.375000 3.375000 +v -0.062500 1.312500 3.625000 +v 0.125000 1.375000 3.375000 +v 0.250000 1.125000 3.375000 +v -0.250000 0.375000 3.375000 +v -0.250000 1.125000 3.375000 +v -0.125000 1.375000 3.375000 +v 0.062500 1.312500 3.375000 +v -0.062500 1.312500 3.375000 +v 0.312500 0.312500 3.625000 +v 0.312500 1.125000 3.625000 +v 0.312500 0.312500 3.375000 +v 0.312500 1.125000 3.375000 +v 0.125000 1.437500 3.625000 +v -0.125000 1.437500 3.625000 +v 0.062500 1.375000 3.625000 +v -0.062500 1.375000 3.625000 +v 0.125000 1.437500 3.375000 +v -0.125000 1.437500 3.375000 +v 0.062500 1.375000 3.375000 +v -0.062500 1.375000 3.375000 +v -0.312500 0.312500 3.625000 +v -0.312500 1.125000 3.625000 +v -0.312500 0.312500 3.375000 +v -0.312500 1.125000 3.375000 +v 0.250000 0.250000 3.625000 +v 0.250000 0.250000 3.375000 +v -0.250000 0.250000 3.625000 +v -0.250000 0.250000 3.375000 +v 0.250000 0.312500 2.375000 +v 0.125000 1.375000 2.375000 +v 0.250000 1.125000 2.375000 +v -0.250000 0.312500 2.375000 +v -0.250000 1.125000 2.375000 +v -0.125000 1.375000 2.375000 +v 0.062500 1.312500 2.375000 +v 0.250000 0.312500 1.875000 +v -0.062500 1.312500 2.375000 +v 0.125000 1.375000 1.875000 +v 0.250000 1.125000 1.875000 +v -0.250000 0.312500 1.875000 +v -0.250000 1.125000 1.875000 +v -0.125000 1.375000 1.875000 +v 0.062500 1.312500 1.875000 +v -0.062500 1.312500 1.875000 +v 0.312500 0.312500 2.375000 +v 0.312500 1.125000 2.375000 +v 0.312500 0.312500 1.875000 +v 0.312500 1.125000 1.875000 +v 0.125000 1.437500 2.375000 +v -0.125000 1.437500 2.375000 +v 0.062500 1.375000 2.375000 +v -0.062500 1.375000 2.375000 +v 0.125000 1.437500 1.875000 +v -0.125000 1.437500 1.875000 +v 0.062500 1.375000 1.875000 +v -0.062500 1.375000 1.875000 +v -0.312500 0.312500 2.375000 +v -0.312500 1.125000 2.375000 +v -0.312500 0.312500 1.875000 +v -0.312500 1.125000 1.875000 +v 0.250000 0.250000 2.375000 +v 0.250000 0.250000 1.875000 +v -0.250000 0.250000 2.375000 +v -0.250000 0.250000 1.875000 +v -0.250000 0.437500 -0.500000 +v -0.125000 0.312500 -0.500000 +v 0.125000 0.312500 -0.500000 +v 0.250000 0.437500 -0.500000 +v -0.125000 1.062500 -1.000000 +v -0.250000 0.937500 -1.000000 +v 0.250000 0.937500 -1.000000 +v 0.125000 1.062500 -1.000000 +v -0.125000 0.312500 -1.750000 +v -0.250000 0.437500 -1.750000 +v 0.250000 0.437500 -1.750000 +v 0.125000 0.312500 -1.750000 +v -0.250000 0.937500 -1.750000 +v -0.125000 1.062500 -1.750000 +v 0.125000 1.062500 -1.750000 +v 0.250000 0.937500 -1.750000 +v -0.000000 1.125000 1.437500 +v -0.062500 1.108253 1.437500 +v -0.108253 1.062500 1.437500 +v -0.125000 1.000000 1.437500 +v -0.108253 0.937500 1.437500 +v -0.062500 0.891747 1.437500 +v -0.000000 0.875000 1.437500 +v 0.062500 0.891747 1.437500 +v 0.108253 0.937500 1.437500 +v 0.125000 1.000000 1.437500 +v 0.108253 1.062500 1.437500 +v 0.062500 1.108253 1.437500 +v -0.093750 1.162380 1.437500 +v -0.162380 1.093750 1.437500 +v -0.187500 1.000000 1.437500 +v -0.162380 0.906250 1.437500 +v -0.093750 0.837620 1.437500 +v 0.000000 0.812500 1.437500 +v 0.093750 0.837620 1.437500 +v 0.162380 0.906250 1.437500 +v 0.187500 1.000000 1.437500 +v 0.162380 1.093750 1.437500 +v 0.093750 1.162380 1.437500 +v -0.000000 1.187500 1.437500 +v -0.000000 1.125000 1.937500 +v -0.062500 1.108253 1.937500 +v -0.108253 1.062500 1.937500 +v -0.125000 1.000000 1.937500 +v -0.108253 0.937500 1.937500 +v -0.062500 0.891747 1.937500 +v -0.000000 0.875000 1.937500 +v 0.062500 0.891747 1.937500 +v 0.108253 0.937500 1.937500 +v 0.125000 1.000000 1.937500 +v 0.108253 1.062500 1.937500 +v 0.062500 1.108253 1.937500 +v -0.093750 1.162380 1.562500 +v -0.162380 1.093750 1.562500 +v -0.187500 1.000000 1.562500 +v -0.162380 0.906250 1.562500 +v -0.093750 0.837620 1.562500 +v 0.000000 0.812500 1.562500 +v 0.093750 0.837620 1.562500 +v 0.162380 0.906250 1.562500 +v 0.187500 1.000000 1.562500 +v 0.162380 1.093750 1.562500 +v 0.093750 1.162380 1.562500 +v -0.000000 1.187500 1.562500 +v 0.125000 1.000000 1.500000 +v 0.125000 1.125000 1.500000 +v -0.125000 1.125000 1.500000 +v -0.125000 1.000000 1.500000 +v 0.312500 1.000000 1.625000 +v 0.312500 1.000000 -1.000000 +v 0.312500 0.875000 1.625000 +v 0.312500 0.625000 1.375000 +v 0.312500 0.375000 1.375000 +v 0.187500 0.250000 1.375000 +v -0.187500 0.250000 1.375000 +v -0.312500 0.375000 1.375000 +v -0.312500 0.625000 1.375000 +v -0.312500 0.875000 1.625000 +v -0.312500 1.000000 1.625000 +v -0.312500 1.000000 -1.000000 +v 0.312500 0.625000 -0.750000 +v 0.312500 0.375000 -0.750000 +v 0.187500 0.250000 -0.750000 +v -0.187500 0.250000 -0.750000 +v -0.312500 0.375000 -0.750000 +v -0.312500 0.625000 -0.750000 +v 0.250000 1.000000 1.625000 +v 0.250000 0.875000 1.625000 +v 0.250000 0.625000 1.375000 +v 0.250000 0.375000 1.375000 +v -0.250000 0.375000 1.375000 +v -0.250000 0.625000 1.375000 +v -0.250000 0.875000 1.625000 +v -0.250000 1.000000 1.625000 +v 0.187500 0.312500 1.375000 +v -0.187500 0.312500 1.375000 +v -0.093750 1.162380 1.125000 +v -0.162380 1.093750 1.125000 +v -0.187500 1.000000 1.125000 +v -0.162380 0.906250 1.125000 +v -0.093750 0.837620 1.125000 +v 0.000000 0.812500 1.125000 +v 0.093750 0.837620 1.125000 +v 0.162380 0.906250 1.125000 +v 0.187500 1.000000 1.125000 +v 0.162380 1.093750 1.125000 +v 0.093750 1.162380 1.125000 +v -0.000000 1.187500 1.125000 +v -0.093750 1.162380 0.125000 +v -0.162380 1.093750 0.125000 +v -0.187500 1.000000 0.125000 +v -0.162380 0.906250 0.125000 +v -0.093750 0.837620 0.125000 +v 0.000000 0.812500 0.125000 +v 0.093750 0.837620 0.125000 +v 0.162380 0.906250 0.125000 +v 0.187500 1.000000 0.125000 +v 0.162380 1.093750 0.125000 +v 0.093750 1.162380 0.125000 +v -0.000000 1.187500 0.125000 +v 0.187500 1.000000 1.500000 +v -0.187500 1.000000 1.500000 +v 0.187500 1.000000 0.125000 +v -0.187500 1.000000 0.125000 +v -0.000000 1.250000 0.125000 +v -0.125000 1.216506 0.125000 +v -0.216506 1.125000 0.125000 +v -0.250000 1.000000 0.125000 +v -0.216506 0.875000 0.125000 +v -0.125000 0.783494 0.125000 +v -0.000000 0.750000 0.125000 +v 0.125000 0.783494 0.125000 +v 0.216506 0.875000 0.125000 +v 0.250000 1.000000 0.125000 +v 0.216506 1.125000 0.125000 +v 0.125000 1.216506 0.125000 +v -0.125000 1.216506 -0.125000 +v -0.000000 1.250000 -0.125000 +v -0.216506 1.125000 -0.125000 +v -0.250000 1.000000 -0.125000 +v 0.093750 0.837620 1.375000 +v 0.000000 0.812500 1.375000 +v -0.093750 0.837620 1.375000 +v -0.162380 0.906250 1.375000 +v -0.187500 1.000000 1.375000 +v 0.250000 1.000000 -0.125000 +v 0.216506 1.125000 -0.125000 +v 0.125000 1.216506 -0.125000 +v 0.162380 0.906250 1.375000 +v 0.187500 1.000000 1.375000 +v 0.000000 1.312500 1.375000 +v -0.156250 1.270633 1.375000 +v -0.270633 1.156250 1.375000 +v -0.312500 1.000000 1.375000 +v -0.093750 0.837620 1.125000 +v 0.000000 0.812500 1.125000 +v 0.093750 0.837620 1.125000 +v 0.162380 0.906250 1.125000 +v 0.187500 1.000000 1.125000 +v 0.312500 1.000000 1.375000 +v 0.270633 1.156250 1.375000 +v 0.156250 1.270633 1.375000 +v -0.162380 0.906250 1.125000 +v -0.187500 1.000000 1.125000 +v -0.156250 1.270633 1.125000 +v 0.000000 1.312500 1.125000 +v -0.270633 1.156250 1.125000 +v -0.312500 1.000000 1.125000 +v 0.312500 1.000000 1.125000 +v 0.270633 1.156250 1.125000 +v 0.156250 1.270633 1.125000 +v -0.093750 1.162380 1.437500 +v -0.162380 1.093750 1.437500 +v -0.187500 1.000000 1.437500 +v -0.162380 0.906250 1.437500 +v -0.093750 0.837620 1.437500 +v 0.000000 0.812500 1.437500 +v 0.093750 0.837620 1.437500 +v 0.162380 0.906250 1.437500 +v 0.187500 1.000000 1.437500 +v 0.162380 1.093750 1.437500 +v 0.093750 1.162380 1.437500 +v -0.000000 1.187500 1.437500 +v -0.093750 1.162380 1.375000 +v -0.162380 1.093750 1.375000 +v -0.187500 1.000000 1.375000 +v -0.162380 0.906250 1.375000 +v -0.093750 0.837620 1.375000 +v 0.000000 0.812500 1.375000 +v 0.093750 0.837620 1.375000 +v 0.162380 0.906250 1.375000 +v 0.187500 1.000000 1.375000 +v 0.162380 1.093750 1.375000 +v 0.093750 1.162380 1.375000 +v -0.000000 1.187500 1.375000 +v -0.187500 1.000000 1.437500 +v -0.162380 0.906250 1.437500 +v -0.093750 0.837620 1.437500 +v 0.000000 0.812500 1.437500 +v 0.093750 0.837620 1.437500 +v 0.162380 0.906250 1.437500 +v 0.187500 1.000000 1.437500 +v -0.187500 1.000000 0.125000 +v -0.162380 0.906250 0.125000 +v -0.093750 0.837620 0.125000 +v 0.000000 0.812500 0.125000 +v 0.093750 0.837620 0.125000 +v 0.162380 0.906250 0.125000 +v 0.187500 1.000000 0.125000 +v -0.250000 1.000000 7.875000 +v -0.216506 0.875000 7.875000 +v -0.125000 0.783494 7.875000 +v -0.000000 0.750000 7.875000 +v 0.125000 0.783494 7.875000 +v 0.216506 0.875000 7.875000 +v 0.250000 1.000000 7.875000 +v -0.000000 1.250000 6.125000 +v -0.125000 1.216506 6.125000 +v -0.216506 1.125000 6.125000 +v -0.250000 1.000000 6.125000 +v -0.216506 0.875000 6.125000 +v -0.125000 0.783494 6.125000 +v -0.000000 0.750000 6.125000 +v 0.125000 0.783494 6.125000 +v 0.216506 0.875000 6.125000 +v 0.250000 1.000000 6.125000 +v 0.216506 1.125000 6.125000 +v 0.125000 1.216506 6.125000 +v -0.250000 1.000000 7.500000 +v -0.216506 0.875000 7.500000 +v -0.125000 0.783494 7.500000 +v -0.000000 0.750000 7.500000 +v 0.125000 0.783494 7.500000 +v 0.216506 0.875000 7.500000 +v 0.250000 1.000000 7.500000 +v 0.216506 1.125000 5.250000 +v 0.250000 1.000000 5.375000 +v 0.216506 0.875000 5.500000 +v -0.125000 1.387500 7.500000 +v 0.125000 1.387500 7.500000 +v 0.125000 1.387500 7.875000 +v -0.125000 1.387500 7.875000 +v 0.187500 1.387500 7.875000 +v 0.187500 1.387500 7.500000 +v -0.187500 1.387500 7.875000 +v -0.187500 1.387500 7.500000 +v 0.187500 1.000000 7.875000 +v 0.162380 0.906250 7.875000 +v 0.093750 0.837620 7.875000 +v 0.000000 0.812500 7.875000 +v -0.093750 0.837620 7.875000 +v -0.162380 0.906250 7.875000 +v -0.187500 1.000000 7.875000 +v 0.187500 1.000000 7.500000 +v 0.162380 0.906250 7.500000 +v 0.093750 0.837620 7.500000 +v 0.000000 0.812500 7.500000 +v -0.093750 0.837620 7.500000 +v -0.162380 0.906250 7.500000 +v -0.187500 1.000000 7.500000 +v 0.125000 0.783494 5.500000 +v -0.000000 0.750000 5.500000 +v -0.125000 0.783494 5.500000 +v -0.216506 0.875000 5.500000 +v -0.250000 1.000000 5.375000 +v -0.216506 1.125000 5.250000 +v -0.312500 1.691561 7.881433 +v -0.312500 1.691561 7.506433 +v 0.250000 1.687500 7.875000 +v 0.312500 1.687500 7.875000 +v 0.312500 1.687500 7.500000 +v 0.250000 1.687500 7.500000 +v -0.250000 1.691561 7.506433 +v -0.250000 1.691561 7.881433 +v 0.062500 1.125000 7.500000 +v 0.062500 1.125000 7.875000 +v 0.062500 1.387500 7.875000 +v 0.062500 1.387500 7.500000 +v -0.062500 1.387500 7.875000 +v -0.062500 1.125000 7.875000 +v -0.062500 1.125000 7.500000 +v -0.062500 1.387500 7.500000 +v 0.062500 1.250000 7.875000 +v 0.062500 1.250000 7.500000 +v -0.062500 1.250000 7.875000 +v -0.062500 1.250000 7.500000 +v 0.062500 1.250000 7.812500 +v 0.062500 1.250000 7.562500 +v -0.062500 1.250000 7.812500 +v -0.062500 1.250000 7.562500 +v 0.062500 1.437500 7.562500 +v -0.062500 1.437500 7.562500 +v -0.062500 1.437500 7.812500 +v 0.062500 1.437500 7.812500 +v 0.031250 1.562500 7.625000 +v -0.031250 1.562500 7.625000 +v -0.031250 1.562500 7.750000 +v 0.031250 1.562500 7.750000 +v -0.000000 1.187500 5.250000 +v 0.093750 1.162380 5.250000 +v 0.162380 1.093750 5.250000 +v 0.187500 1.000000 5.375000 +v 0.162380 0.906250 5.500000 +v 0.093750 0.837620 5.500000 +v 0.000000 0.812500 5.500000 +v -0.093750 0.837620 5.500000 +v -0.162380 0.906250 5.500000 +v -0.187500 1.000000 5.375000 +v -0.162380 1.093750 5.250000 +v -0.093750 1.162380 5.250000 +v -0.000000 1.187500 6.125000 +v 0.093750 1.162380 6.125000 +v 0.162380 1.093750 6.125000 +v 0.187500 1.000000 6.125000 +v 0.162380 0.906250 6.125000 +v 0.093750 0.837620 6.125000 +v 0.000000 0.812500 6.125000 +v -0.093750 0.837620 6.125000 +v -0.162380 0.906250 6.125000 +v -0.187500 1.000000 6.125000 +v -0.162380 1.093750 6.125000 +v -0.093750 1.162380 6.125000 +v -0.000000 1.250000 4.875000 +v 0.125000 1.216506 4.875000 +v 0.216506 1.125000 4.875000 +v -0.216506 1.125000 4.875000 +v -0.125000 1.216506 4.875000 +v 0.093750 1.162380 4.875000 +v -0.000000 1.187500 4.875000 +v 0.162380 1.093750 4.875000 +v -0.093750 1.162380 4.875000 +v -0.162380 1.093750 4.875000 +v -0.000000 1.250000 4.437500 +v -0.125000 1.216506 4.437500 +v -0.216506 1.125000 4.437500 +v -0.250000 1.000000 4.437500 +v 0.312500 1.000000 4.500000 +v 0.312500 0.500100 4.500000 +v 0.312500 1.000000 4.750000 +v 0.312500 0.500100 4.750000 +v 0.250000 1.000000 4.437500 +v 0.216506 1.125000 4.437500 +v 0.125000 1.216506 4.437500 +v -0.000000 1.187500 4.437500 +v 0.093750 1.162380 4.437500 +v 0.162380 1.093750 4.437500 +v 0.187500 1.000000 4.437500 +v -0.250000 1.000000 4.500000 +v -0.250000 0.500000 4.500000 +v 0.250000 1.000000 4.500000 +v -0.187500 1.000000 4.437500 +v -0.162380 1.093750 4.437500 +v -0.093750 1.162380 4.437500 +v -0.125000 1.216506 4.812500 +v -0.000000 1.250000 4.812500 +v -0.216506 1.125000 4.812500 +v -0.250000 1.000000 4.812500 +v 0.250000 0.500000 4.500000 +v 0.250000 1.000000 4.812500 +v 0.216506 1.125000 4.812500 +v 0.125000 1.216506 4.812500 +v 0.093750 1.162380 4.812500 +v -0.000000 1.187500 4.812500 +v 0.162380 1.093750 4.812500 +v 0.187500 1.000000 4.812500 +v -0.250000 1.000000 4.750000 +v -0.250000 0.500000 4.750000 +v 0.250000 1.000000 4.750000 +v 0.250000 0.500000 4.750000 +v -0.187500 1.000000 4.812500 +v -0.162380 1.093750 4.812500 +v -0.093750 1.162380 4.812500 +v -0.312500 0.500100 4.750000 +v -0.312500 1.000000 4.750000 +v -0.312500 0.500100 4.500000 +v -0.312500 1.000000 4.500000 +v 0.250000 0.437600 4.750000 +v 0.250000 0.437600 4.500000 +v -0.250000 0.437600 4.750000 +v -0.250000 0.437600 4.500000 +v 0.187500 0.437600 4.750000 +v 0.187500 0.437600 4.500000 +v 0.125000 0.437600 4.750000 +v 0.125000 0.437600 4.500000 +v 0.187500 0.187600 4.750000 +v 0.187500 0.187600 4.500000 +v 0.125000 0.187600 4.750000 +v 0.125000 0.187600 4.500000 +v 0.187500 0.062600 4.687500 +v 0.187500 0.062600 4.562500 +v 0.125000 0.062600 4.687500 +v 0.125000 0.062600 4.562500 +v -0.125000 0.437600 4.750000 +v -0.125000 0.437600 4.500000 +v -0.187500 0.437600 4.750000 +v -0.187500 0.437600 4.500000 +v -0.125000 0.187600 4.750000 +v -0.125000 0.187600 4.500000 +v -0.187500 0.187600 4.750000 +v -0.187500 0.187600 4.500000 +v -0.125000 0.062600 4.687500 +v -0.125000 0.062600 4.562500 +v -0.187500 0.062600 4.687500 +v -0.187500 0.062600 4.562500 +v -0.250000 0.156350 4.656250 +v -0.250000 0.218850 4.656250 +v -0.250000 0.156350 4.593750 +v -0.250000 0.218850 4.593750 +v 0.250000 0.156350 4.656250 +v 0.250000 0.218850 4.656250 +v 0.250000 0.156350 4.593750 +v 0.250000 0.218850 4.593750 +v 0.125000 1.000000 1.125000 +v 0.500000 1.000000 1.125000 +v 0.125000 1.000000 1.000000 +v 0.500000 1.000000 1.000000 +v 0.125000 1.062500 1.125000 +v 0.500000 1.062500 1.125000 +v 0.125000 1.062500 1.000000 +v 0.500000 1.062500 1.000000 +v 0.312500 1.000000 1.250000 +v 0.312500 0.875000 1.250000 +v 0.312500 1.000000 -0.875000 +v 0.312500 0.875000 -0.875000 +v 0.437500 0.875000 1.250000 +v 0.437500 1.000000 1.250000 +v 0.437500 0.875000 0.000000 +v 0.437500 1.000000 0.000000 +v 0.500000 0.906250 1.125000 +v 0.500000 1.156250 1.125000 +v 0.500000 0.906250 1.000000 +v 0.500000 1.156250 1.000000 +v 0.750000 0.968750 1.125000 +v 0.750000 1.093750 1.125000 +v 0.750000 0.968750 1.000000 +v 0.750000 1.093750 1.000000 +v 0.625000 0.906250 1.000000 +v 0.625000 1.156250 1.000000 +v 0.625000 0.906250 1.125000 +v 0.625000 1.156250 1.125000 +v -0.125000 1.000000 1.125000 +v -0.500000 1.000000 1.125000 +v -0.125000 1.000000 1.000000 +v -0.500000 1.000000 1.000000 +v -0.125000 1.062500 1.125000 +v -0.500000 1.062500 1.125000 +v -0.125000 1.062500 1.000000 +v -0.500000 1.062500 1.000000 +v -0.500000 0.906250 1.125000 +v -0.500000 1.156250 1.125000 +v -0.500000 0.906250 1.000000 +v -0.500000 1.156250 1.000000 +v -0.750000 0.968750 1.125000 +v -0.750000 1.093750 1.125000 +v -0.750000 0.968750 1.000000 +v -0.750000 1.093750 1.000000 +v -0.625000 0.906250 1.000000 +v -0.625000 1.156250 1.000000 +v -0.625000 0.906250 1.125000 +v -0.625000 1.156250 1.125000 +v 0.687500 0.875000 0.000000 +v 0.687500 1.000000 0.000000 +v 0.562500 0.875000 -0.500000 +v 0.562500 1.000000 -0.500000 +v 0.687500 1.000000 0.000000 +v 0.562500 1.000000 0.000000 +v 0.687500 1.062500 0.000000 +v 0.562500 1.062500 0.000000 +v 0.625000 1.000000 -0.062500 +v 0.562500 1.000000 -0.062500 +v 0.625000 1.062500 -0.062500 +v 0.562500 1.062500 -0.062500 +v -0.312500 1.000000 1.250000 +v -0.312500 0.875000 1.250000 +v -0.312500 1.000000 -0.875000 +v -0.312500 0.875000 -0.875000 +v -0.437500 0.875000 1.250000 +v -0.437500 1.000000 1.250000 +v -0.437500 0.875000 0.000000 +v -0.437500 1.000000 0.000000 +v -0.687500 0.875000 0.000000 +v -0.687500 1.000000 0.000000 +v -0.562500 0.875000 -0.500000 +v -0.562500 1.000000 -0.500000 +v -0.687500 1.000000 0.000000 +v -0.562500 1.000000 0.000000 +v -0.687500 1.062500 0.000000 +v -0.562500 1.062500 0.000000 +v -0.625000 1.000000 -0.062500 +v -0.562500 1.000000 -0.062500 +v -0.625000 1.062500 -0.062500 +v -0.562500 1.062500 -0.062500 +v 0.125000 0.187500 -2.000000 +v 0.250000 0.312500 -2.000000 +v 0.250000 0.812500 -2.000000 +v 0.125000 0.937500 -2.000000 +v -0.250000 0.312500 -2.000000 +v -0.125000 0.187500 -2.000000 +v -0.125000 0.937500 -2.000000 +v -0.250000 0.812500 -2.000000 +v 0.125000 -0.062500 -2.500000 +v 0.250000 0.062500 -2.500000 +v 0.250000 0.562500 -2.750000 +v 0.125000 0.687500 -2.750000 +v -0.250000 0.062500 -2.500000 +v -0.125000 -0.062500 -2.500000 +v -0.125000 0.687500 -2.750000 +v -0.250000 0.562500 -2.750000 +v 0.250000 0.687500 -3.000000 +v 0.125000 0.812500 -3.000000 +v -0.125000 0.812500 -3.000000 +v -0.250000 0.687500 -3.000000 +v 0.250000 0.812500 -3.500000 +v 0.125000 0.937500 -3.500000 +v -0.125000 0.937500 -3.500000 +v -0.250000 0.812500 -3.500000 +v 0.250000 0.812500 -7.750000 +v 0.125000 0.937500 -7.750000 +v -0.125000 0.937500 -7.750000 +v -0.250000 0.812500 -7.750000 +v 0.125000 -0.937500 -3.125000 +v 0.250000 -0.812500 -3.125000 +v -0.250000 -0.812500 -3.125000 +v -0.125000 -0.937500 -3.125000 +v 0.125000 -0.687500 -4.000000 +v 0.250000 -0.562500 -4.000000 +v -0.250000 -0.562500 -4.000000 +v -0.125000 -0.687500 -4.000000 +v 0.125000 -0.812500 -5.000000 +v 0.250000 -0.687500 -5.000000 +v -0.250000 -0.687500 -5.000000 +v -0.125000 -0.812500 -5.000000 +v 0.125000 -1.687500 -7.375000 +v 0.250000 -1.562500 -7.375000 +v -0.250000 -1.562500 -7.375000 +v -0.125000 -1.687500 -7.375000 +v 0.125000 -1.687500 -7.875000 +v 0.250000 -1.562500 -7.875000 +v -0.250000 -1.562500 -7.875000 +v -0.125000 -1.687500 -7.875000 +v 0.125000 -1.437500 -8.125000 +v 0.250000 -1.437500 -8.000000 +v -0.250000 -1.437500 -8.000000 +v -0.125000 -1.437500 -8.125000 +v 0.125000 0.562500 -8.125000 +v 0.250000 0.562500 -8.000000 +v -0.250000 0.562500 -8.000000 +v -0.125000 0.562500 -8.125000 +v 0.312500 0.875000 -1.000000 +v -0.312500 0.875000 -1.000000 +v 0.250000 1.000000 3.500000 +v -0.250000 1.000000 3.500000 +v 0.250000 1.125000 3.500000 +v -0.250000 1.125000 3.500000 +v -0.187500 1.125000 3.500000 +v -0.187500 1.000000 3.500000 +v 0.187500 1.125000 3.500000 +v 0.187500 1.000000 3.500000 +v 0.250000 1.000000 1.375000 +v 0.250000 1.125000 1.375000 +v -0.250000 1.125000 1.375000 +v -0.250000 1.000000 1.375000 +v -0.187500 1.125000 1.375000 +v -0.187500 1.000000 1.375000 +v 0.187500 1.000000 1.375000 +v 0.187500 1.125000 1.375000 +v 0.312500 1.000000 -1.000000 +v -0.312500 1.000000 -1.000000 +v 0.312500 1.000000 -0.125000 +v -0.312500 1.000000 -0.125000 +v 0.312500 1.125000 -1.000000 +v -0.312500 1.125000 -1.000000 +v 0.312500 1.125000 -0.125000 +v -0.312500 1.125000 -0.125000 +v 0.187500 1.250000 -0.875000 +v -0.187500 1.250000 -0.875000 +v 0.187500 1.250000 -0.125000 +v -0.187500 1.250000 -0.125000 +v 0.187500 1.375000 -0.125000 +v -0.187500 1.375000 -0.125000 +v 0.187500 1.375000 -0.625000 +v -0.187500 1.375000 -0.625000 +v 0.187500 1.437500 -0.125000 +v -0.187500 1.437500 -0.125000 +v -0.125000 1.437500 -0.125000 +v -0.125000 1.437500 -0.625000 +v 0.125000 1.437500 -0.125000 +v 0.125000 1.437500 -0.625000 +v 0.187500 1.562500 -0.625000 +v -0.187500 1.562500 -0.625000 +v -0.125000 1.562500 -0.625000 +v 0.125000 1.562500 -0.625000 +v 0.000000 1.687500 -0.250000 +v -0.088388 1.650888 -0.250000 +v -0.125000 1.562500 -0.250000 +v -0.000000 1.437500 -0.312500 +v 0.000000 1.437500 -0.250000 +v 0.125000 1.562500 -0.250000 +v 0.088388 1.650888 -0.250000 +v 0.000000 1.656250 -0.250000 +v -0.066291 1.628791 -0.250000 +v -0.093750 1.562500 -0.250000 +v -0.066291 1.496209 -0.250000 +v 0.000000 1.468750 -0.250000 +v 0.066291 1.496209 -0.250000 +v 0.093750 1.562500 -0.250000 +v 0.066291 1.628791 -0.250000 +v -0.125000 1.437500 -0.250000 +v 0.125000 1.437500 -0.250000 +v 0.000000 1.687500 -0.312500 +v -0.088388 1.650888 -0.312500 +v -0.125000 1.562500 -0.312500 +v 0.125000 1.562500 -0.312500 +v 0.088388 1.650888 -0.312500 +v 0.000000 1.656250 -0.312500 +v -0.066291 1.628791 -0.312500 +v -0.093750 1.562500 -0.312500 +v -0.066291 1.496209 -0.312500 +v 0.000000 1.468750 -0.312500 +v 0.066291 1.496209 -0.312500 +v 0.093750 1.562500 -0.312500 +v 0.066291 1.628791 -0.312500 +v -0.125000 1.437500 -0.312500 +v 0.125000 1.437500 -0.312500 +v 0.187500 1.250000 -0.125000 +v -0.187500 1.250000 -0.125000 +v 0.187500 1.250000 -0.750000 +v -0.187500 1.250000 -0.750000 +v 0.125000 1.375000 -0.187500 +v -0.125000 1.375000 -0.187500 +v 0.125000 1.375000 -0.562500 +v -0.125000 1.375000 -0.562500 +v 0.187500 1.525888 -0.411612 +v 0.187500 1.562500 -0.500000 +v 0.187500 1.525888 -0.588388 +v 0.187500 1.437500 -0.625000 +v 0.187500 1.437500 -0.375000 +v 0.187500 1.349112 -0.411612 +v 0.187500 1.312500 -0.500000 +v 0.187500 1.349112 -0.588388 +v 0.250000 1.437500 -0.625000 +v 0.250000 1.349112 -0.588388 +v 0.250000 1.312500 -0.500000 +v 0.250000 1.349112 -0.411612 +v 0.250000 1.437500 -0.375000 +v 0.250000 1.562500 -0.500000 +v 0.250000 1.525888 -0.588388 +v 0.250000 1.525888 -0.411612 +v -0.250000 1.525888 -0.411612 +v -0.250000 1.562500 -0.500000 +v -0.250000 1.525888 -0.588388 +v -0.250000 1.437500 -0.625000 +v -0.250000 1.437500 -0.375000 +v -0.250000 1.349112 -0.411612 +v -0.250000 1.312500 -0.500000 +v -0.250000 1.349112 -0.588388 +v -0.187500 1.437500 -0.625000 +v -0.187500 1.349112 -0.588388 +v -0.187500 1.312500 -0.500000 +v -0.187500 1.349112 -0.411612 +v -0.187500 1.437500 -0.375000 +v -0.187500 1.562500 -0.500000 +v -0.187500 1.525888 -0.588388 +v -0.187500 1.525888 -0.411612 +v 0.187500 0.875000 1.125000 +v -0.187500 0.875000 1.125000 +v 0.187500 0.875000 0.125000 +v -0.187500 0.875000 0.125000 +v -0.187500 -1.375000 1.125000 +v 0.187500 -1.375000 1.125000 +v -0.187500 -1.375000 0.125000 +v 0.187500 -1.375000 0.125000 +v 0.000000 1.000000 0.187500 +v -0.062500 0.983253 0.187500 +v -0.108253 0.937500 0.187500 +v -0.125000 0.875000 0.187500 +v -0.108253 0.812500 0.187500 +v -0.062500 0.766747 0.187500 +v -0.000000 0.750000 0.187500 +v 0.062500 0.766747 0.187500 +v 0.108253 0.812500 0.187500 +v 0.125000 0.875000 0.187500 +v 0.108253 0.937500 0.187500 +v 0.062500 0.983253 0.187500 +v 0.000000 1.000000 0.812500 +v -0.062500 0.983253 0.812500 +v -0.108253 0.937500 0.812500 +v -0.125000 0.875000 0.812500 +v -0.108253 0.812500 0.812500 +v -0.062500 0.766747 0.812500 +v -0.000000 0.750000 0.812500 +v 0.062500 0.766747 0.812500 +v 0.108253 0.812500 0.812500 +v 0.125000 0.875000 0.812500 +v 0.108253 0.937500 0.812500 +v 0.062500 0.983253 0.812500 +v 0.000000 0.968750 1.000000 +v -0.046875 0.956190 1.000000 +v -0.081190 0.921875 1.000000 +v -0.093750 0.875000 1.000000 +v -0.081190 0.828125 1.000000 +v -0.046875 0.793810 1.000000 +v -0.000000 0.781250 1.000000 +v 0.046875 0.793810 1.000000 +v 0.081190 0.828125 1.000000 +v 0.093750 0.875000 1.000000 +v 0.081190 0.921875 1.000000 +v 0.046875 0.956190 1.000000 +v 0.000000 0.906250 1.062500 +v -0.015625 0.902063 1.062500 +v -0.027063 0.890625 1.062500 +v -0.031250 0.875000 1.062500 +v -0.027063 0.859375 1.062500 +v -0.015625 0.847937 1.062500 +v 0.000000 0.843750 1.062500 +v 0.015625 0.847937 1.062500 +v 0.027063 0.859375 1.062500 +v 0.031250 0.875000 1.062500 +v 0.027063 0.890625 1.062500 +v 0.015625 0.902063 1.062500 +v -0.125000 0.875000 1.125000 +v -0.062500 0.750000 1.125000 +v 0.062500 0.750000 1.125000 +v 0.125000 0.875000 1.125000 +v -0.125000 0.875000 0.125000 +v -0.062500 0.750000 0.125000 +v 0.062500 0.750000 0.125000 +v 0.125000 0.875000 0.125000 +v -0.125000 0.250000 0.000000 +v 0.125000 0.250000 0.000000 +v -0.125000 0.250000 -0.750000 +v 0.125000 0.250000 -0.750000 +v -0.125000 0.000000 -0.750000 +v -0.125000 0.000000 0.000000 +v 0.125000 0.000000 0.000000 +v 0.125000 0.000000 -0.750000 +v -0.062500 0.312500 -1.750000 +v 0.062500 0.312500 -1.750000 +v -0.062500 -0.062500 -1.750000 +v 0.062500 -0.062500 -1.750000 +v -0.062500 -0.312500 -1.500000 +v 0.062500 -0.312500 -1.500000 +v -0.062500 -0.312500 -0.875000 +v 0.062500 -0.312500 -0.875000 +v -0.062500 -0.125000 -0.687500 +v 0.062500 -0.125000 -0.687500 +v -0.062500 0.000000 -0.625000 +v 0.062500 0.000000 -0.625000 +v -0.062500 0.312500 -1.687500 +v 0.062500 0.312500 -1.687500 +v -0.062500 -0.062500 -1.687500 +v 0.062500 -0.062500 -1.687500 +v -0.062500 -0.250000 -1.500000 +v 0.062500 -0.250000 -1.500000 +v -0.062500 -0.250000 -0.875000 +v 0.062500 -0.250000 -0.875000 +v -0.062500 -0.125000 -0.750000 +v 0.062500 -0.125000 -0.750000 +v -0.062500 0.000000 -0.687500 +v 0.062500 0.000000 -0.687500 +v -0.062500 0.312500 -1.562500 +v 0.062500 0.312500 -1.562500 +v -0.062500 0.312500 -1.312500 +v 0.062500 0.312500 -1.312500 +v -0.062500 0.187500 -1.500000 +v 0.062500 0.187500 -1.500000 +v -0.062500 0.187500 -1.375000 +v 0.062500 0.187500 -1.375000 +v -0.062500 0.000000 -1.500000 +v 0.062500 0.000000 -1.500000 +v -0.062500 0.000000 -1.375000 +v 0.062500 0.000000 -1.375000 +v -0.062500 -0.187500 -1.312500 +v 0.062500 -0.187500 -1.312500 +vn 0.0000 0.0000 1.0000 +vn 0.0000 0.0000 -1.0000 +vn 0.0000 1.0000 0.0000 +vn -1.0000 0.0000 0.0000 +vn 0.0000 -1.0000 0.0000 +vn 1.0000 0.0000 0.0000 +vn -0.7071 -0.7071 0.0000 +vn 0.7071 -0.7071 0.0000 +vn 0.0000 -0.7071 -0.7071 +vn 0.0000 -0.7071 0.7071 +vn 0.2588 -0.9659 0.0000 +vn -0.2588 -0.9659 0.0000 +vn -0.9659 -0.2588 -0.0000 +vn 0.9659 -0.2588 0.0000 +vn 0.9872 0.1592 0.0000 +vn -0.9231 0.3846 0.0000 +vn -0.9249 -0.3802 0.0000 +vn -0.9872 0.1592 0.0000 +vn 0.9249 0.3802 0.0000 +vn 0.9231 -0.3846 0.0000 +vn 0.0000 -0.0212 0.9998 +vn 0.0000 0.0212 -0.9998 +vn 0.9701 0.2425 0.0000 +vn 0.0000 0.4472 -0.8944 +vn 0.0000 0.4472 0.8944 +vn -0.9701 0.2425 0.0000 +vn -0.5000 -0.8660 0.0000 +vn 0.5000 -0.8660 0.0000 +vn 0.0000 -0.4472 0.8944 +vn 0.0000 -0.4472 -0.8944 +vn 0.4472 -0.8944 0.0000 +vn 0.4472 0.8944 0.0000 +vn -0.4472 -0.8944 0.0000 +vn -0.4472 0.8944 0.0000 +vn 0.9701 0.0000 -0.2425 +vn 0.8321 0.0000 -0.5547 +vn 0.7071 0.0000 -0.7071 +vn -0.9701 0.0000 -0.2425 +vn -0.8321 0.0000 -0.5547 +vn -0.7071 0.0000 -0.7071 +vn 0.7071 0.7071 0.0000 +vn -0.7071 0.7071 0.0000 +vn 0.0000 0.7071 -0.7071 +vn 0.0000 0.9701 0.2425 +vn -0.8944 0.4472 0.0000 +vn 0.8944 0.4472 0.0000 +vn 0.0000 0.8321 -0.5547 +vn 0.5000 0.8660 0.0000 +vn 0.8660 0.5000 0.0000 +vn 0.8660 -0.5000 0.0000 +vn -0.8660 -0.5000 -0.0000 +vn -0.8660 0.5000 0.0000 +vn -0.5000 0.8660 0.0000 +vn 0.0000 0.9239 0.3827 +vn 0.0000 -0.9239 0.3827 +vn 0.0000 -0.9894 0.1452 +vn 0.1602 0.9871 0.0000 +vn -0.3827 0.9239 0.0000 +vn 0.9522 0.3054 0.0000 +vn -0.1602 0.9871 0.0000 +vn -0.9522 0.3054 0.0000 +vn -0.9732 0.2298 0.0000 +vn 0.3827 0.9239 0.0000 +vn 0.9239 -0.3827 0.0000 +vn 0.9637 0.2669 0.0000 +vn 0.1222 0.9925 0.0000 +vn -0.1222 0.9925 0.0000 +vn -0.9637 0.2669 0.0000 +vn -0.9239 -0.3827 0.0000 +vn -0.3827 -0.9239 0.0000 +vn 0.3827 -0.9239 0.0000 +vn -0.9523 0.3051 0.0000 +vn -0.9414 -0.3297 0.0706 +vn -0.8629 -0.5054 0.0000 +vn -0.3595 0.9099 -0.2070 +vn 0.9523 0.3051 0.0000 +vn 0.9414 -0.3297 0.0706 +vn 0.8994 0.4225 -0.1123 +vn -0.9232 0.3569 -0.1429 +vn -0.9129 -0.3651 0.1826 +vn 0.3954 -0.8912 0.2222 +vn 0.8629 -0.5054 0.0000 +vn 0.3595 0.9099 -0.2070 +vn -0.9659 0.2588 0.0000 +vn 0.9659 0.2588 0.0000 +vn -0.9915 0.1299 0.0000 +vn -0.7768 0.6297 0.0000 +vn 0.9915 0.1299 0.0000 +vn -0.8911 -0.4538 0.0000 +vn 0.8911 -0.4538 0.0000 +vn 0.0000 -0.7689 -0.6394 +vn 0.2869 -0.6590 -0.6953 +vn 0.3536 -0.6124 -0.7071 +vn -0.0447 -0.7380 -0.6733 +vn -0.2869 -0.6590 -0.6953 +vn 0.0407 -0.7592 -0.6496 +vn 0.3057 -0.7078 -0.6369 +vn 0.4000 -0.6928 -0.6000 +vn 0.0000 -0.8000 -0.6000 +vn 0.7768 0.6297 0.0000 +vn -0.4192 0.9051 0.0712 +vn -0.9552 0.2954 0.0181 +vn -0.3954 -0.8912 0.2222 +vn -0.3568 -0.8355 0.4178 +vn 0.3568 -0.8355 0.4178 +vn 0.3688 0.8568 -0.3605 +vn 0.9129 -0.3651 0.1826 +vn 0.9232 0.3569 -0.1429 +vn -0.8994 0.4225 -0.1123 +vn -0.3688 0.8568 -0.3605 +vn 0.4192 0.9051 0.0712 +vn -0.3607 0.8769 0.3178 +vn 0.9552 0.2954 0.0181 +vn 0.3163 -0.6961 0.6445 +vn -0.9268 -0.3007 0.2251 +vn -0.3163 -0.6961 0.6445 +vn 0.9268 -0.3007 0.2251 +vn -0.9066 0.3929 0.1537 +vn 0.9066 0.3929 0.1537 +vn 0.3607 0.8769 0.3178 +vn -0.3711 0.9219 0.1112 +vn -0.9123 0.4062 0.0530 +vn 0.9123 0.4062 0.0530 +vn 0.3711 0.9219 0.1112 +vn -0.3416 0.8756 -0.3416 +vn -0.8727 0.4330 -0.2257 +vn 0.3416 0.8756 -0.3416 +vn 0.3335 -0.8970 0.2902 +vn -0.8515 -0.4669 0.2386 +vn -0.3335 -0.8970 0.2902 +vn 0.8515 -0.4669 0.2386 +vn 0.4002 -0.9135 -0.0737 +vn -0.4002 -0.9135 -0.0737 +vn 0.9405 -0.3390 -0.0241 +vn 0.3851 -0.8955 0.2233 +vn -0.9313 -0.3548 0.0821 +vn -0.3851 -0.8955 0.2233 +vn 0.9313 -0.3548 0.0821 +vn 0.3654 -0.9172 0.1589 +vn -0.9063 -0.4149 0.0807 +vn -0.3654 -0.9172 0.1589 +vn 0.9063 -0.4149 0.0807 +vn 0.3416 -0.8756 -0.3416 +vn -0.3416 -0.8756 -0.3416 +vn 0.8727 -0.4330 -0.2257 +vn 0.3416 -0.3416 -0.8756 +vn -0.8727 -0.2257 -0.4330 +vn -0.3416 -0.3416 -0.8756 +vn 0.8727 -0.2257 -0.4330 +vn 0.3416 0.3416 -0.8756 +vn -0.3416 0.3416 -0.8756 +vn 0.8727 0.2257 -0.4330 +vn -0.9405 -0.3390 -0.0241 +vn 0.8727 0.4330 -0.2257 +vn -0.8727 0.2257 -0.4330 +vn -0.9808 0.1951 0.0000 +vn 0.9808 0.1951 0.0000 +vn 0.0000 0.7071 0.7071 +vn -0.0000 -0.9967 0.0814 +vn -0.9967 -0.0000 0.0814 +vn 0.8632 0.4983 0.0814 +vn 0.0000 0.9967 0.0814 +vn 0.4983 -0.8632 0.0814 +vn -0.8632 -0.4983 0.0814 +vn 0.4983 0.8632 0.0814 +vn -0.4983 0.8632 0.0814 +vn 0.8632 -0.4983 0.0814 +vn -0.4983 -0.8632 0.0814 +vn -0.8632 0.4983 0.0814 +vn 0.9967 -0.0000 0.0814 +vn -0.4494 -0.7784 0.4382 +vn -0.7784 -0.4494 0.4382 +vn 0.0000 0.8989 0.4382 +vn 0.4494 0.7784 0.4382 +vn -0.4494 0.7784 0.4382 +vn 0.8989 -0.0000 0.4382 +vn 0.7784 -0.4494 0.4382 +vn -0.8989 -0.0000 0.4382 +vn -0.7784 0.4494 0.4382 +vn 0.4494 -0.7784 0.4382 +vn -0.0000 -0.8989 0.4382 +vn 0.7784 0.4494 0.4382 +vn -0.2172 -0.3762 0.9007 +vn -0.3762 -0.2172 0.9007 +vn 0.0000 0.4344 0.9007 +vn 0.2172 0.3762 0.9007 +vn -0.3762 0.2172 0.9007 +vn -0.2172 0.3762 0.9007 +vn 0.4344 -0.0000 0.9007 +vn 0.3762 -0.2172 0.9007 +vn 0.3762 0.2172 0.9007 +vn 0.2172 -0.3762 0.9007 +vn 0.0000 -0.4344 0.9007 +vn -0.4344 0.0000 0.9007 +vn 0.0000 -0.3827 -0.9239 +vn 0.0000 -0.9239 -0.3827 +vn 0.0000 -0.5847 0.8112 +vn 0.0000 0.3827 0.9239 +vn 0.0000 0.9239 -0.3827 +vn 0.0000 0.5847 -0.8112 +vn 0.0000 -0.2298 0.9732 +vn 0.0000 -0.2298 -0.9732 +vn 0.0000 0.1602 0.9871 +vn 0.0000 -0.8507 0.5257 +vn 0.9732 0.2298 0.0000 +vn -0.3536 -0.6124 -0.7071 +vn -0.8727 -0.4330 -0.2257 +s off +f 10//1 34//1 33//1 +f 8//1 35//1 34//1 +f 6//1 36//1 35//1 +f 4//1 25//1 36//1 +f 24//1 25//1 2//1 +f 24//1 27//1 26//1 +f 22//1 28//1 27//1 +f 20//1 29//1 28//1 +f 18//1 30//1 29//1 +f 14//1 30//1 16//1 +f 14//1 32//1 31//1 +f 10//1 32//1 12//1 +f 41//1 45//1 38//1 +f 50//1 67//1 49//1 +f 79//1 81//1 67//1 +f 146//2 134//2 137//2 +f 88//2 70//2 72//2 +f 64//3 86//3 76//3 +f 86//4 80//4 83//4 +f 74//2 85//2 64//2 +f 71//5 80//5 74//5 +f 87//6 90//6 88//6 +f 73//5 88//5 72//5 +f 75//3 89//3 63//3 +f 63//2 87//2 73//2 +f 110//2 98//2 101//2 +f 91//1 108//1 93//1 +f 97//1 114//1 99//1 +f 92//1 113//1 97//1 +f 118//2 105//2 106//2 +f 104//2 118//2 106//2 +f 96//1 114//1 112//1 +f 117//2 100//2 105//2 +f 102//2 122//2 103//2 +f 94//1 120//1 119//1 +f 122//2 104//2 103//2 +f 96//1 120//1 95//1 +f 100//2 110//2 101//2 +f 92//1 108//1 111//1 +f 123//1 107//1 91//1 +f 124//2 126//2 102//2 +f 127//1 144//1 129//1 +f 133//1 150//1 135//1 +f 128//1 149//1 133//1 +f 154//2 141//2 142//2 +f 140//2 154//2 142//2 +f 132//1 150//1 148//1 +f 153//2 136//2 141//2 +f 157//2 139//2 138//2 +f 131//1 155//1 130//1 +f 158//2 140//2 139//2 +f 132//1 156//1 131//1 +f 136//2 146//2 137//2 +f 128//1 144//1 147//1 +f 159//1 143//1 127//1 +f 160//2 162//2 138//2 +f 83//2 69//2 84//2 +f 190//2 200//2 189//2 +f 179//2 201//2 190//2 +f 179//2 191//2 202//2 +f 181//2 191//2 180//2 +f 182//2 192//2 181//2 +f 183//2 193//2 182//2 +f 184//2 194//2 183//2 +f 184//2 196//2 195//2 +f 186//2 196//2 185//2 +f 186//2 198//2 197//2 +f 188//2 198//2 187//2 +f 189//2 199//2 188//2 +f 88//2 227//2 228//2 +f 83//2 230//2 86//2 +f 229//2 84//2 82//2 +f 213//2 209//2 205//2 +f 239//4 247//4 238//4 +f 237//5 245//5 236//5 +f 235//6 243//6 234//6 +f 238//7 246//7 237//7 +f 236//8 244//8 235//8 +f 248//2 243//2 245//2 +f 243//9 712//9 711//9 +f 711//2 242//2 232//2 +f 234//1 252//1 235//1 +f 233//10 251//10 234//10 +f 231//1 250//1 233//1 +f 240//1 256//1 241//1 +f 239//10 255//10 240//10 +f 238//1 254//1 239//1 +f 236//1 258//1 237//1 +f 258//1 238//1 237//1 +f 235//1 257//1 236//1 +f 231//3 285//3 283//3 +f 232//3 286//3 285//3 +f 295//1 297//1 287//1 +f 307//1 312//1 313//1 +f 326//2 328//2 321//2 +f 312//5 331//5 322//5 +f 303//11 318//11 319//11 +f 305//12 318//12 304//12 +f 306//7 317//7 305//7 +f 307//13 325//13 306//13 +f 311//14 321//14 312//14 +f 316//5 326//5 307//5 +f 303//8 320//8 311//8 +f 335//1 337//1 341//1 +f 396//2 416//2 397//2 +f 395//2 417//2 396//2 +f 395//2 419//2 418//2 +f 394//2 420//2 419//2 +f 393//2 421//2 420//2 +f 392//2 422//2 421//2 +f 373//1 415//1 372//1 +f 374//1 414//1 373//1 +f 375//1 413//1 374//1 +f 376//1 412//1 375//1 +f 410//1 376//1 377//1 +f 409//1 377//1 378//1 +f 397//15 405//15 378//15 +f 409//1 405//1 403//1 +f 403//16 434//16 402//16 +f 406//2 416//2 402//2 +f 407//17 430//17 408//17 +f 422//2 408//2 401//2 +f 391//18 407//18 408//18 +f 407//1 415//1 404//1 +f 447//1 438//1 445//1 +f 433//3 431//3 432//3 +f 435//3 429//3 436//3 +f 406//2 434//2 433//2 +f 404//19 435//19 436//19 +f 406//20 432//20 405//20 +f 407//21 436//21 429//21 +f 408//22 435//22 401//22 +f 405//1 431//1 403//1 +f 445//4 440//4 446//4 +f 448//3 445//3 446//3 +f 445//1 438//1 409//1 +f 440//3 403//3 402//3 +f 446//2 440//2 402//2 +f 443//2 446//2 437//2 +f 447//1 441//1 404//1 +f 447//6 444//6 441//6 +f 448//2 443//2 422//2 +f 441//3 401//3 404//3 +f 453//23 460//23 456//23 +f 451//4 454//4 452//4 +f 450//6 456//6 449//6 +f 452//2 453//2 450//2 +f 449//1 455//1 451//1 +f 458//3 460//3 457//3 +f 454//24 457//24 453//24 +f 456//25 459//25 455//25 +f 455//26 458//26 454//26 +f 471//8 493//8 472//8 +f 425//2 469//2 468//2 +f 424//2 468//2 467//2 +f 423//2 467//2 466//2 +f 423//2 465//2 400//2 +f 475//1 388//1 389//1 +f 390//1 475//1 389//1 +f 379//1 474//1 390//1 +f 380//1 473//1 379//1 +f 381//1 484//1 380//1 +f 382//1 483//1 381//1 +f 383//1 482//1 382//1 +f 384//1 481//1 383//1 +f 385//1 480//1 384//1 +f 386//1 479//1 385//1 +f 477//1 386//1 387//1 +f 476//1 387//1 388//1 +f 486//2 492//2 490//2 +f 485//2 490//2 491//2 +f 489//2 491//2 493//2 +f 488//2 493//2 494//2 +f 428//27 494//27 471//27 +f 461//12 490//12 462//12 +f 472//11 491//11 461//11 +f 462//7 492//7 463//7 +f 463//28 487//28 398//28 +f 503//2 508//2 504//2 +f 505//2 508//2 507//2 +f 495//2 507//2 506//2 +f 496//2 506//2 515//2 +f 497//2 515//2 514//2 +f 498//2 514//2 513//2 +f 511//2 520//2 540//2 +f 531//1 529//1 541//1 +f 526//1 521//1 522//1 +f 523//1 526//1 522//1 +f 517//1 524//1 523//1 +f 516//1 525//1 517//1 +f 518//1 534//1 516//1 +f 519//1 533//1 518//1 +f 539//5 542//5 540//5 +f 502//8 540//8 500//8 +f 537//7 541//7 535//7 +f 536//4 537//4 535//4 +f 502//6 499//6 501//6 +f 528//1 535//1 529//1 +f 537//2 510//2 511//2 +f 512//3 501//3 499//3 +f 528//3 538//3 536//3 +f 530//1 502//1 501//1 +f 512//2 500//2 520//2 +f 561//29 563//29 559//29 +f 549//29 551//29 547//29 +f 544//2 550//2 546//2 +f 543//6 548//6 544//6 +f 545//1 547//1 543//1 +f 546//4 549//4 545//4 +f 551//5 554//5 552//5 +f 550//4 553//4 549//4 +f 548//30 554//30 550//30 +f 547//6 552//6 548//6 +f 556//2 562//2 558//2 +f 555//6 560//6 556//6 +f 557//1 559//1 555//1 +f 558//4 561//4 557//4 +f 563//5 566//5 564//5 +f 562//4 565//4 561//4 +f 560//30 566//30 562//30 +f 559//6 564//6 560//6 +f 568//4 569//4 567//4 +f 570//2 573//2 569//2 +f 574//6 571//6 573//6 +f 572//1 567//1 571//1 +f 573//5 567//5 569//5 +f 570//3 572//3 574//3 +f 243//6 711//6 232//6 +f 575//5 578//5 576//5 +f 582//3 579//3 580//3 +f 606//5 603//5 604//5 +f 578//2 581//2 582//2 +f 592//4 593//4 591//4 +f 576//1 579//1 575//1 +f 587//6 590//6 588//6 +f 583//3 590//3 585//3 +f 584//1 588//1 583//1 +f 584//5 589//5 587//5 +f 589//1 624//1 590//1 +f 598//6 595//6 597//6 +f 598//2 597//2 599//2 +f 597//31 601//31 599//31 +f 594//3 602//3 600//3 +f 600//32 596//32 598//32 +f 599//5 591//5 593//5 +f 606//2 609//2 605//2 +f 607//3 610//3 608//3 +f 592//1 591//1 601//1 +f 613//6 612//6 611//6 +f 607//1 604//1 603//1 +f 615//4 618//4 617//4 +f 620//2 614//2 619//2 +f 621//33 617//33 619//33 +f 622//3 614//3 620//3 +f 616//34 620//34 618//34 +f 611//5 619//5 613//5 +f 622//1 616//1 621//1 +f 623//35 626//35 624//35 +f 625//5 589//5 586//5 +f 590//3 626//3 585//3 +f 625//36 585//36 626//36 +f 627//1 630//1 628//1 +f 634//2 631//2 632//2 +f 630//4 632//4 628//4 +f 627//37 633//37 629//37 +f 630//3 633//3 634//3 +f 642//4 639//4 640//4 +f 642//3 635//3 637//3 +f 640//1 636//1 635//1 +f 636//5 641//5 638//5 +f 644//1 641//1 642//1 +f 646//38 643//38 644//38 +f 641//5 645//5 638//5 +f 642//3 646//3 644//3 +f 637//39 645//39 646//39 +f 650//1 647//1 648//1 +f 651//2 654//2 652//2 +f 652//6 650//6 648//6 +f 653//40 647//40 649//40 +f 650//3 653//3 649//3 +f 239//4 242//4 248//4 +f 241//3 256//3 284//3 +f 718//1 716//1 714//1 +f 719//1 713//1 715//1 +f 713//6 722//6 715//6 +f 720//5 721//5 713//5 +f 719//4 727//4 720//4 +f 714//5 726//5 718//5 +f 716//4 724//4 714//4 +f 715//3 728//3 719//3 +f 717//3 723//3 716//3 +f 718//6 725//6 717//6 +f 735//41 737//41 739//41 +f 729//6 735//6 731//6 +f 744//5 741//5 742//5 +f 732//4 734//4 730//4 +f 730//2 733//2 729//2 +f 740//3 737//3 738//3 +f 736//42 738//42 734//42 +f 734//43 737//43 733//43 +f 732//1 731//1 739//1 +f 747//3 750//3 748//3 +f 743//6 745//6 741//6 +f 750//2 751//2 743//2 +f 747//1 746//1 742//1 +f 743//2 748//2 750//2 +f 746//4 744//4 742//4 +f 747//44 752//44 746//44 +f 748//6 753//6 747//6 +f 745//44 754//44 749//44 +f 750//4 749//4 754//4 +f 752//2 748//2 744//2 +f 760//1 769//1 768//1 +f 755//1 763//1 762//1 +f 755//1 769//1 761//1 +f 771//1 767//1 759//1 +f 770//1 765//1 757//1 +f 757//1 763//1 756//1 +f 782//2 775//2 786//2 +f 774//2 779//2 780//2 +f 784//2 775//2 783//2 +f 784//2 772//2 776//2 +f 772//2 778//2 773//2 +f 778//2 774//2 773//2 +f 800//4 795//4 797//4 +f 810//6 806//6 804//6 +f 794//45 788//45 792//45 +f 793//46 787//46 789//46 +f 793//47 790//47 794//47 +f 792//25 787//25 791//25 +f 816//4 811//4 813//4 +f 826//6 822//6 820//6 +f 887//3 828//3 883//3 +f 831//5 834//5 832//5 +f 827//6 834//6 829//6 +f 832//1 885//1 884//1 +f 830//4 831//4 828//4 +f 833//2 888//2 889//2 +f 843//2 841//2 837//2 +f 829//3 886//3 827//3 +f 890//45 885//45 886//45 +f 888//46 883//46 884//46 +f 889//3 884//3 885//3 +f 895//5 897//5 896//5 +f 892//6 898//6 894//6 +f 893//4 896//4 891//4 +f 894//2 895//2 893//2 +f 891//1 897//1 892//1 +f 913//4 899//4 901//4 +f 912//6 902//6 900//6 +f 917//4 903//4 905//4 +f 916//6 906//6 904//6 +f 915//4 901//4 903//4 +f 902//6 916//6 904//6 +f 921//4 907//4 909//4 +f 908//6 922//6 910//6 +f 919//4 905//4 907//4 +f 906//6 920//6 908//6 +f 930//6 924//6 926//6 +f 927//4 925//4 923//4 +f 931//4 929//4 927//4 +f 934//6 928//6 930//6 +f 932//6 934//6 936//6 +f 933//4 931//4 935//4 +f 10//1 8//1 34//1 +f 8//1 6//1 35//1 +f 6//1 4//1 36//1 +f 4//1 2//1 25//1 +f 24//1 26//1 25//1 +f 24//1 22//1 27//1 +f 22//1 20//1 28//1 +f 20//1 18//1 29//1 +f 18//1 16//1 30//1 +f 14//1 31//1 30//1 +f 14//1 12//1 32//1 +f 10//1 33//1 32//1 +f 38//1 37//1 41//1 +f 37//1 39//1 41//1 +f 39//1 40//1 41//1 +f 41//1 42//1 43//1 +f 43//1 44//1 45//1 +f 45//1 46//1 47//1 +f 47//1 48//1 45//1 +f 48//1 38//1 45//1 +f 41//1 43//1 45//1 +f 50//1 68//1 67//1 +f 68//1 52//1 79//1 +f 81//1 51//1 67//1 +f 68//1 79//1 67//1 +f 146//2 145//2 134//2 +f 88//2 82//2 70//2 +f 64//3 85//3 86//3 +f 86//4 85//4 80//4 +f 74//2 80//2 85//2 +f 71//5 83//5 80//5 +f 87//6 89//6 90//6 +f 73//5 87//5 88//5 +f 75//3 90//3 89//3 +f 63//2 89//2 87//2 +f 110//2 109//2 98//2 +f 91//1 107//1 108//1 +f 97//1 113//1 114//1 +f 92//1 111//1 113//1 +f 118//2 117//2 105//2 +f 104//2 116//2 118//2 +f 96//1 99//1 114//1 +f 117//2 115//2 100//2 +f 102//2 121//2 122//2 +f 94//1 95//1 120//1 +f 122//2 116//2 104//2 +f 96//1 112//1 120//1 +f 100//2 115//2 110//2 +f 92//1 93//1 108//1 +f 91//1 94//1 123//1 +f 94//1 119//1 125//1 +f 123//1 94//1 125//1 +f 121//2 102//2 126//2 +f 102//2 98//2 124//2 +f 98//2 109//2 124//2 +f 127//1 143//1 144//1 +f 133//1 149//1 150//1 +f 128//1 147//1 149//1 +f 154//2 153//2 141//2 +f 140//2 152//2 154//2 +f 132//1 135//1 150//1 +f 153//2 151//2 136//2 +f 157//2 158//2 139//2 +f 131//1 156//1 155//1 +f 158//2 152//2 140//2 +f 132//1 148//1 156//1 +f 136//2 151//2 146//2 +f 128//1 129//1 144//1 +f 127//1 130//1 159//1 +f 130//1 155//1 161//1 +f 159//1 130//1 161//1 +f 157//2 138//2 162//2 +f 138//2 134//2 160//2 +f 134//2 145//2 160//2 +f 83//2 71//2 69//2 +f 190//2 201//2 200//2 +f 179//2 202//2 201//2 +f 179//2 180//2 191//2 +f 181//2 192//2 191//2 +f 182//2 193//2 192//2 +f 183//2 194//2 193//2 +f 184//2 195//2 194//2 +f 184//2 185//2 196//2 +f 186//2 197//2 196//2 +f 186//2 187//2 198//2 +f 188//2 199//2 198//2 +f 189//2 200//2 199//2 +f 88//2 90//2 227//2 +f 83//2 229//2 230//2 +f 82//2 88//2 228//2 +f 229//2 83//2 84//2 +f 82//2 228//2 229//2 +f 205//2 204//2 213//2 +f 204//2 203//2 213//2 +f 203//2 214//2 213//2 +f 213//2 212//2 211//2 +f 211//2 210//2 209//2 +f 209//2 208//2 207//2 +f 207//2 206//2 205//2 +f 213//2 211//2 209//2 +f 209//2 207//2 205//2 +f 239//4 248//4 247//4 +f 237//5 246//5 245//5 +f 235//6 244//6 243//6 +f 238//7 247//7 246//7 +f 236//8 245//8 244//8 +f 243//2 244//2 245//2 +f 245//2 246//2 248//2 +f 246//2 247//2 248//2 +f 243//9 248//9 712//9 +f 711//2 712//2 242//2 +f 234//1 251//1 252//1 +f 233//10 250//10 251//10 +f 231//1 249//1 250//1 +f 240//1 255//1 256//1 +f 239//10 254//10 255//10 +f 238//1 253//1 254//1 +f 236//1 257//1 258//1 +f 258//1 253//1 238//1 +f 235//1 252//1 257//1 +f 283//3 249//3 231//3 +f 231//3 232//3 285//3 +f 232//3 242//3 286//3 +f 287//1 288//1 289//1 +f 289//1 290//1 291//1 +f 291//1 292//1 293//1 +f 293//1 294//1 295//1 +f 295//1 296//1 297//1 +f 297//1 298//1 287//1 +f 287//1 289//1 295//1 +f 289//1 291//1 295//1 +f 291//1 293//1 295//1 +f 303//1 311//1 312//1 +f 312//1 322//1 323//1 +f 323//1 324//1 312//1 +f 324//1 313//1 312//1 +f 313//1 314//1 307//1 +f 314//1 315//1 307//1 +f 315//1 316//1 307//1 +f 307//1 306//1 305//1 +f 305//1 304//1 303//1 +f 303//1 312//1 305//1 +f 305//1 312//1 307//1 +f 321//2 320//2 319//2 +f 319//2 318//2 321//2 +f 318//2 317//2 321//2 +f 317//2 325//2 326//2 +f 326//2 330//2 329//2 +f 329//2 327//2 326//2 +f 327//2 328//2 326//2 +f 328//2 333//2 321//2 +f 333//2 332//2 321//2 +f 332//2 331//2 321//2 +f 317//2 326//2 321//2 +f 312//5 321//5 331//5 +f 303//11 304//11 318//11 +f 305//12 317//12 318//12 +f 306//7 325//7 317//7 +f 307//13 326//13 325//13 +f 311//14 320//14 321//14 +f 316//5 330//5 326//5 +f 303//8 319//8 320//8 +f 345//1 334//1 335//1 +f 335//1 336//1 337//1 +f 337//1 338//1 341//1 +f 338//1 339//1 341//1 +f 339//1 340//1 341//1 +f 341//1 342//1 345//1 +f 342//1 343//1 345//1 +f 343//1 344//1 345//1 +f 345//1 335//1 341//1 +f 396//2 417//2 416//2 +f 395//2 418//2 417//2 +f 395//2 394//2 419//2 +f 394//2 393//2 420//2 +f 393//2 392//2 421//2 +f 392//2 391//2 422//2 +f 373//1 414//1 415//1 +f 374//1 413//1 414//1 +f 375//1 412//1 413//1 +f 376//1 411//1 412//1 +f 410//1 411//1 376//1 +f 409//1 410//1 377//1 +f 397//15 406//15 405//15 +f 409//1 378//1 405//1 +f 403//16 431//16 434//16 +f 406//2 397//2 416//2 +f 407//17 429//17 430//17 +f 422//2 391//2 408//2 +f 391//18 372//18 407//18 +f 407//1 372//1 415//1 +f 447//1 442//1 438//1 +f 433//3 434//3 431//3 +f 435//3 430//3 429//3 +f 406//2 402//2 434//2 +f 404//19 401//19 435//19 +f 406//20 433//20 432//20 +f 407//21 404//21 436//21 +f 408//22 430//22 435//22 +f 405//1 432//1 431//1 +f 445//4 439//4 440//4 +f 448//3 447//3 445//3 +f 409//1 403//1 445//1 +f 403//1 439//1 445//1 +f 440//3 439//3 403//3 +f 402//2 416//2 446//2 +f 416//2 437//2 446//2 +f 443//2 448//2 446//2 +f 404//1 415//1 447//1 +f 415//1 442//1 447//1 +f 447//6 448//6 444//6 +f 422//2 401//2 448//2 +f 401//2 444//2 448//2 +f 441//3 444//3 401//3 +f 453//23 457//23 460//23 +f 451//4 455//4 454//4 +f 450//6 453//6 456//6 +f 452//2 454//2 453//2 +f 449//1 456//1 455//1 +f 458//3 459//3 460//3 +f 454//24 458//24 457//24 +f 456//25 460//25 459//25 +f 455//26 459//26 458//26 +f 471//8 494//8 493//8 +f 425//2 426//2 469//2 +f 424//2 425//2 468//2 +f 423//2 424//2 467//2 +f 423//2 466//2 465//2 +f 475//1 476//1 388//1 +f 390//1 474//1 475//1 +f 379//1 473//1 474//1 +f 380//1 484//1 473//1 +f 381//1 483//1 484//1 +f 382//1 482//1 483//1 +f 383//1 481//1 482//1 +f 384//1 480//1 481//1 +f 385//1 479//1 480//1 +f 386//1 478//1 479//1 +f 477//1 478//1 386//1 +f 476//1 477//1 387//1 +f 486//2 487//2 492//2 +f 485//2 486//2 490//2 +f 489//2 485//2 491//2 +f 488//2 489//2 493//2 +f 428//27 488//27 494//27 +f 461//12 491//12 490//12 +f 472//11 493//11 491//11 +f 462//7 490//7 492//7 +f 463//28 492//28 487//28 +f 503//2 509//2 508//2 +f 505//2 504//2 508//2 +f 495//2 505//2 507//2 +f 496//2 495//2 506//2 +f 497//2 496//2 515//2 +f 498//2 497//2 514//2 +f 520//2 500//2 540//2 +f 540//2 542//2 511//2 +f 542//2 537//2 511//2 +f 529//1 535//1 541//1 +f 541//1 539//1 531//1 +f 539//1 502//1 531//1 +f 526//1 527//1 521//1 +f 523//1 524//1 526//1 +f 517//1 525//1 524//1 +f 516//1 534//1 525//1 +f 518//1 533//1 534//1 +f 519//1 532//1 533//1 +f 539//5 541//5 542//5 +f 502//8 539//8 540//8 +f 537//7 542//7 541//7 +f 536//4 538//4 537//4 +f 502//6 500//6 499//6 +f 528//1 536//1 535//1 +f 537//2 538//2 510//2 +f 512//3 530//3 501//3 +f 528//3 510//3 538//3 +f 530//1 531//1 502//1 +f 512//2 499//2 500//2 +f 561//29 565//29 563//29 +f 549//29 553//29 551//29 +f 544//2 548//2 550//2 +f 543//6 547//6 548//6 +f 545//1 549//1 547//1 +f 546//4 550//4 549//4 +f 551//5 553//5 554//5 +f 550//4 554//4 553//4 +f 548//30 552//30 554//30 +f 547//6 551//6 552//6 +f 556//2 560//2 562//2 +f 555//6 559//6 560//6 +f 557//1 561//1 559//1 +f 558//4 562//4 561//4 +f 563//5 565//5 566//5 +f 562//4 566//4 565//4 +f 560//30 564//30 566//30 +f 559//6 563//6 564//6 +f 568//4 570//4 569//4 +f 570//2 574//2 573//2 +f 574//6 572//6 571//6 +f 572//1 568//1 567//1 +f 573//5 571//5 567//5 +f 570//3 568//3 572//3 +f 232//6 231//6 243//6 +f 231//6 233//6 234//6 +f 243//6 231//6 234//6 +f 575//5 577//5 578//5 +f 582//3 581//3 579//3 +f 606//5 605//5 603//5 +f 578//2 577//2 581//2 +f 592//4 594//4 593//4 +f 576//1 580//1 579//1 +f 587//6 589//6 590//6 +f 583//3 588//3 590//3 +f 584//1 587//1 588//1 +f 584//5 586//5 589//5 +f 589//1 623//1 624//1 +f 598//6 596//6 595//6 +f 599//2 593//2 594//2 +f 594//2 600//2 599//2 +f 600//2 598//2 599//2 +f 597//31 595//31 601//31 +f 594//3 592//3 602//3 +f 600//32 602//32 596//32 +f 599//5 601//5 591//5 +f 606//2 610//2 609//2 +f 607//3 609//3 610//3 +f 601//1 595//1 596//1 +f 596//1 602//1 601//1 +f 602//1 592//1 601//1 +f 613//6 614//6 612//6 +f 607//1 608//1 604//1 +f 615//4 616//4 618//4 +f 614//2 613//2 619//2 +f 619//2 617//2 618//2 +f 618//2 620//2 619//2 +f 621//33 615//33 617//33 +f 622//3 612//3 614//3 +f 616//34 622//34 620//34 +f 611//5 621//5 619//5 +f 616//1 615//1 621//1 +f 621//1 611//1 612//1 +f 612//1 622//1 621//1 +f 623//35 625//35 626//35 +f 625//5 623//5 589//5 +f 590//3 624//3 626//3 +f 625//36 586//36 585//36 +f 627//1 629//1 630//1 +f 634//2 633//2 631//2 +f 630//4 634//4 632//4 +f 627//37 631//37 633//37 +f 630//3 629//3 633//3 +f 642//4 641//4 639//4 +f 642//3 640//3 635//3 +f 640//1 639//1 636//1 +f 636//5 639//5 641//5 +f 644//1 643//1 641//1 +f 646//38 645//38 643//38 +f 641//5 643//5 645//5 +f 642//3 637//3 646//3 +f 637//39 638//39 645//39 +f 650//1 649//1 647//1 +f 651//2 653//2 654//2 +f 652//6 654//6 650//6 +f 653//40 651//40 647//40 +f 650//3 654//3 653//3 +f 239//4 240//4 241//4 +f 241//4 242//4 239//4 +f 242//4 712//4 248//4 +f 284//3 286//3 241//3 +f 286//3 242//3 241//3 +f 718//1 717//1 716//1 +f 719//1 720//1 713//1 +f 713//6 721//6 722//6 +f 720//5 727//5 721//5 +f 719//4 728//4 727//4 +f 714//5 724//5 726//5 +f 716//4 723//4 724//4 +f 715//3 722//3 728//3 +f 717//3 725//3 723//3 +f 718//6 726//6 725//6 +f 735//41 733//41 737//41 +f 729//6 733//6 735//6 +f 744//5 743//5 741//5 +f 732//4 736//4 734//4 +f 730//2 734//2 733//2 +f 740//3 739//3 737//3 +f 736//42 740//42 738//42 +f 734//43 738//43 737//43 +f 731//1 735//1 739//1 +f 739//1 740//1 732//1 +f 740//1 736//1 732//1 +f 747//3 749//3 750//3 +f 743//6 751//6 745//6 +f 750//2 754//2 751//2 +f 742//1 741//1 749//1 +f 741//1 745//1 749//1 +f 749//1 747//1 742//1 +f 743//2 744//2 748//2 +f 746//4 752//4 744//4 +f 747//44 753//44 752//44 +f 745//44 751//44 754//44 +f 752//2 753//2 748//2 +f 760//1 761//1 769//1 +f 755//1 756//1 763//1 +f 755//1 762//1 769//1 +f 771//1 760//1 767//1 +f 760//1 768//1 767//1 +f 767//1 766//1 759//1 +f 770//1 759//1 765//1 +f 759//1 766//1 765//1 +f 765//1 764//1 757//1 +f 757//1 764//1 763//1 +f 758//2 781//2 782//2 +f 782//2 783//2 775//2 +f 786//2 758//2 782//2 +f 781//2 758//2 780//2 +f 758//2 785//2 780//2 +f 785//2 774//2 780//2 +f 784//2 776//2 775//2 +f 784//2 777//2 772//2 +f 772//2 777//2 778//2 +f 778//2 779//2 774//2 +f 797//4 798//4 802//4 +f 802//4 801//4 800//4 +f 800//4 799//4 795//4 +f 795//4 796//4 797//4 +f 797//4 802//4 800//4 +f 804//6 803//6 809//6 +f 809//6 808//6 810//6 +f 810//6 807//6 806//6 +f 806//6 805//6 804//6 +f 804//6 809//6 810//6 +f 794//45 790//45 788//45 +f 793//46 791//46 787//46 +f 793//47 789//47 790//47 +f 792//25 788//25 787//25 +f 813//4 814//4 818//4 +f 818//4 817//4 816//4 +f 816//4 815//4 811//4 +f 811//4 812//4 813//4 +f 813//4 818//4 816//4 +f 820//6 819//6 825//6 +f 825//6 824//6 826//6 +f 826//6 823//6 822//6 +f 822//6 821//6 820//6 +f 820//6 825//6 826//6 +f 887//3 830//3 828//3 +f 831//5 833//5 834//5 +f 827//6 832//6 834//6 +f 832//1 827//1 885//1 +f 827//1 886//1 885//1 +f 828//1 831//1 884//1 +f 831//1 832//1 884//1 +f 884//1 883//1 828//1 +f 830//4 833//4 831//4 +f 833//2 830//2 888//2 +f 830//2 887//2 888//2 +f 829//2 834//2 889//2 +f 834//2 833//2 889//2 +f 889//2 890//2 829//2 +f 837//2 836//2 835//2 +f 835//2 846//2 837//2 +f 846//2 845//2 837//2 +f 845//2 844//2 843//2 +f 843//2 842//2 841//2 +f 841//2 840//2 839//2 +f 839//2 838//2 841//2 +f 838//2 837//2 841//2 +f 845//2 843//2 837//2 +f 829//3 890//3 886//3 +f 890//45 889//45 885//45 +f 888//46 887//46 883//46 +f 889//3 888//3 884//3 +f 895//5 898//5 897//5 +f 892//6 897//6 898//6 +f 893//4 895//4 896//4 +f 894//2 898//2 895//2 +f 891//1 896//1 897//1 +f 913//4 911//4 899//4 +f 912//6 914//6 902//6 +f 917//4 915//4 903//4 +f 916//6 918//6 906//6 +f 915//4 913//4 901//4 +f 902//6 914//6 916//6 +f 921//4 919//4 907//4 +f 908//6 920//6 922//6 +f 919//4 917//4 905//4 +f 906//6 918//6 920//6 +f 930//6 928//6 924//6 +f 927//4 929//4 925//4 +f 931//4 933//4 929//4 +f 934//6 932//6 928//6 +s 1 +f 2//3 3//48 1//3 +f 4//48 5//49 3//48 +f 6//49 7//6 5//49 +f 8//6 9//50 7//6 +f 10//50 11//28 9//50 +f 12//28 13//5 11//28 +f 14//5 15//27 13//5 +f 16//27 17//51 15//27 +f 18//51 19//4 17//51 +f 20//4 21//52 19//4 +f 22//52 23//53 21//52 +f 24//53 1//3 23//53 +f 29//49 40//6 28//6 +f 36//27 47//51 35//51 +f 26//28 38//5 25//5 +f 33//52 44//53 32//53 +f 30//48 41//49 29//49 +f 25//5 48//27 36//27 +f 27//50 37//28 26//28 +f 34//4 45//52 33//52 +f 31//3 42//48 30//48 +f 28//6 39//50 27//50 +f 35//51 46//4 34//4 +f 32//53 43//3 31//3 +f 49//3 54//54 50//3 +f 53//54 56//1 54//54 +f 55//1 58//55 56//1 +f 57//55 60//56 58//55 +f 59//56 62//56 60//56 +f 52//57 82//58 79//58 +f 61//56 66//5 62//56 +f 73//59 72//46 70//57 +f 69//60 71//45 74//61 +f 73//59 50//6 63//6 +f 67//62 64//4 49//4 +f 63//6 50//6 60//6 +f 57//4 55//4 53//4 +f 81//63 69//60 51//60 +f 79//58 84//63 81//63 +f 107//64 110//65 108//65 +f 111//66 110//65 115//66 +f 111//66 117//58 113//58 +f 113//58 118//63 114//63 +f 114//63 116//67 112//67 +f 120//68 116//67 122//68 +f 120//68 121//69 119//69 +f 121//69 125//70 119//69 +f 107//64 124//71 109//64 +f 123//71 126//70 124//71 +f 143//64 146//65 144//65 +f 147//66 146//65 151//66 +f 147//66 153//58 149//58 +f 149//58 154//63 150//63 +f 150//63 152//67 148//67 +f 156//68 152//67 158//68 +f 156//68 157//69 155//69 +f 157//69 161//70 155//69 +f 143//64 160//71 145//64 +f 159//71 162//70 160//71 +f 168//72 172//73 163//74 +f 170//63 176//75 167//58 +f 169//76 173//77 178//78 +f 172//73 662//79 659//80 +f 174//81 166//82 165//71 +f 170//63 178//78 177//83 +f 172//73 164//70 163//74 +f 176//75 168//72 167//58 +f 164//70 174//81 165//71 +f 190//27 203//5 179//5 +f 180//28 205//50 181//50 +f 187//52 212//4 188//4 +f 184//48 209//3 185//3 +f 181//50 206//6 182//6 +f 188//4 213//51 189//51 +f 185//3 210//53 186//53 +f 182//6 207//49 183//49 +f 189//51 214//27 190//27 +f 179//5 204//28 180//28 +f 186//53 211//52 187//52 +f 183//49 208//48 184//48 +f 197//28 220//5 196//5 +f 194//51 217//4 193//4 +f 201//48 224//49 200//49 +f 191//53 226//3 202//3 +f 198//50 221//28 197//28 +f 195//27 218//51 194//51 +f 202//3 225//48 201//48 +f 192//52 215//53 191//53 +f 199//6 222//50 198//50 +f 196//5 219//27 195//27 +f 193//4 216//52 192//52 +f 200//49 223//6 199//6 +f 272//52 261//4 260//52 +f 279//6 268//49 267//6 +f 276//5 265//28 264//5 +f 273//4 262//51 261//4 +f 280//49 269//48 268//49 +f 282//3 259//53 270//3 +f 277//28 266//50 265//28 +f 274//51 263//27 262//51 +f 281//48 270//3 269//48 +f 271//53 260//52 259//53 +f 278//50 267//6 266//50 +f 275//27 264//5 263//27 +f 289//52 302//84 290//84 +f 296//85 309//49 297//49 +f 298//48 309//49 310//48 +f 287//3 299//53 288//53 +f 298//48 300//3 287//3 +f 288//53 301//52 289//52 +f 314//53 329//52 315//52 +f 322//85 332//49 323//49 +f 315//52 330//84 316//84 +f 323//49 333//48 324//48 +f 324//48 328//3 313//3 +f 313//3 327//53 314//53 +f 348//4 337//51 336//4 +f 355//49 344//48 343//49 +f 357//3 334//53 345//3 +f 352//28 341//50 340//28 +f 349//51 338//27 337//51 +f 356//48 345//3 344//48 +f 346//53 335//52 334//53 +f 353//50 342//6 341//50 +f 350//27 339//5 338//27 +f 347//52 336//4 335//52 +f 354//6 343//49 342//6 +f 351//5 340//28 339//5 +f 362//53 368//3 361//3 +f 360//48 366//49 359//49 +f 363//52 369//53 362//53 +f 361//3 367//48 360//48 +f 359//49 365//85 358//85 +f 364//84 370//52 363//52 +f 394//5 376//28 375//5 +f 395//28 377//50 376//28 +f 396//50 378//14 377//50 +f 391//13 373//51 372//13 +f 392//51 374//27 373//51 +f 393//27 375//5 374//27 +f 424//5 384//27 425//27 +f 427//86 381//52 428//87 +f 399//88 389//49 388//6 +f 423//28 385//5 424//5 +f 426//89 382//4 427//86 +f 400//90 386//28 423//28 +f 425//27 383//51 426//89 +f 428//87 381//52 380//53 +f 485//3 380//53 379//3 +f 400//90 388//6 387//50 +f 399//91 463//92 398//93 +f 427//94 471//95 470//96 +f 426//97 470//96 469//98 +f 399//91 465//95 464//99 +f 486//48 379//3 390//48 +f 496//53 517//3 495//3 +f 497//52 516//53 496//53 +f 504//49 521//85 503//85 +f 498//84 518//52 497//52 +f 505//48 522//49 504//49 +f 495//3 523//48 505//48 +f 390//48 389//49 398//100 +f 662//79 669//101 670//102 +f 171//103 659//80 660//104 +f 171//103 655//105 174//81 +f 178//78 658//106 177//83 +f 174//81 656//107 173//77 +f 173//77 657//108 178//78 +f 175//109 661//110 662//79 +f 177//83 661//110 176//75 +f 666//111 673//112 669//101 +f 657//108 666//111 658//106 +f 656//107 665//113 657//108 +f 660//104 663//114 655//105 +f 660//104 667//115 668//116 +f 655//105 664//117 656//107 +f 658//106 669//101 661//110 +f 659//80 670//102 667//115 +f 669//101 674//118 670//102 +f 666//111 671//119 672//120 +f 672//120 677//121 673//112 +f 673//112 678//122 674//118 +f 672//120 675//123 676//124 +f 676//124 681//125 677//121 +f 677//121 682//126 678//122 +f 675//123 680//127 676//124 +f 668//116 683//128 663//114 +f 668//116 685//129 686//130 +f 663//114 684//131 664//117 +f 686//130 687//132 683//128 +f 685//129 690//133 686//130 +f 684//131 687//132 688//134 +f 690//133 691//135 687//132 +f 690//133 693//136 694//137 +f 687//132 692//138 688//134 +f 694//137 695//139 691//135 +f 694//137 697//140 698//141 +f 691//135 696//142 692//138 +f 698//141 699//143 695//139 +f 697//140 702//144 698//141 +f 695//139 700//145 696//142 +f 702//144 703//146 699//143 +f 702//144 705//147 706//148 +f 699//143 704//149 700//145 +f 706//148 707//150 703//146 +f 705//147 710//151 706//148 +f 703//146 708//152 704//149 +f 674//118 689//153 670//102 +f 684//131 665//113 664//117 +f 708//152 680//127 679//154 +f 681//125 709//155 682//126 +f 707//150 681//125 680//127 +f 675//123 704//149 679//154 +f 688//134 671//119 665//113 +f 692//138 696//142 704//149 +f 679//154 704//149 708//152 +f 705//147 682//126 709//155 +f 705//147 678//122 682//126 +f 693//136 705//147 697//140 +f 685//129 670//102 689//153 +f 756//42 774//156 757//156 +f 764//6 778//8 763//8 +f 757//156 785//4 770//4 +f 765//41 779//6 764//6 +f 771//6 775//157 760//157 +f 766//3 780//41 765//41 +f 767//42 781//3 766//3 +f 768//4 782//42 767//42 +f 760//157 776//41 761//41 +f 769//7 783//4 768//4 +f 761//41 772//3 755//3 +f 755//3 773//42 756//42 +f 762//5 784//7 769//7 +f 763//8 777//5 762//5 +f 800//10 807//1 799//1 +f 801//5 806//10 800//10 +f 796//3 809//43 797//43 +f 797//43 803//2 798//2 +f 802//9 805//5 801//5 +f 798//2 804//9 802//9 +f 795//158 808//3 796//3 +f 799//1 810//158 795//158 +f 816//10 823//1 815//1 +f 817//5 822//10 816//10 +f 812//3 825//43 813//43 +f 813//43 819//2 814//2 +f 818//9 821//5 817//5 +f 814//2 820//9 818//9 +f 811//158 824//3 812//3 +f 815//1 826//158 811//158 +f 842//28 853//159 841//5 +f 839//51 850//160 838//4 +f 846//48 857//161 845//49 +f 836//53 847//162 835//3 +f 843//50 854//163 842//28 +f 840//27 851//164 839//51 +f 835//3 858//165 846//48 +f 837//52 848//166 836//53 +f 844//6 855//167 843//50 +f 841//5 852//168 840//27 +f 838//4 849//169 837//52 +f 845//49 856//170 844//6 +f 851//164 864//171 863//172 +f 858//165 859//173 870//174 +f 849//169 860//175 848//166 +f 855//167 868//176 867//177 +f 853//159 864//171 852//168 +f 849//169 862//178 861//179 +f 857//161 868//176 856//170 +f 853//159 866//180 865//181 +f 851//164 862//178 850//160 +f 858//165 869//182 857//161 +f 848//166 859//173 847//162 +f 855//167 866//180 854//163 +f 863//172 876//183 875//184 +f 870//174 871//185 882//186 +f 860//175 873//187 872//188 +f 867//177 880//189 879//190 +f 865//181 876//183 864//171 +f 862//178 873//187 861//179 +f 868//176 881//191 880//189 +f 865//181 878//192 877//193 +f 862//178 875//184 874//194 +f 870//174 881//191 869//182 +f 860//175 871//185 859//173 +f 867//177 878//192 866//180 +f 875//184 879//190 871//185 +f 902//195 899//2 900//2 +f 904//196 901//195 902//195 +f 906//55 903//196 904//196 +f 908//197 905//55 906//55 +f 910//29 907//197 908//197 +f 912//1 913//198 914//198 +f 916//54 917//199 918//199 +f 917//199 920//200 918//199 +f 920//200 921//24 922//24 +f 915//54 914//198 913//198 +f 929//201 926//29 925//29 +f 924//30 927//202 923//30 +f 928//202 931//195 927//202 +f 933//203 930//201 929//201 +f 936//204 933//203 935//204 +f 936//204 931//195 932//195 +f 2//3 4//48 3//48 +f 4//48 6//49 5//49 +f 6//49 8//6 7//6 +f 8//6 10//50 9//50 +f 10//50 12//28 11//28 +f 12//28 14//5 13//5 +f 14//5 16//27 15//27 +f 16//27 18//51 17//51 +f 18//51 20//4 19//4 +f 20//4 22//52 21//52 +f 22//52 24//53 23//53 +f 24//53 2//3 1//3 +f 29//49 41//49 40//6 +f 36//27 48//27 47//51 +f 26//28 37//28 38//5 +f 33//52 45//52 44//53 +f 30//48 42//48 41//49 +f 25//5 38//5 48//27 +f 27//50 39//50 37//28 +f 34//4 46//4 45//52 +f 31//3 43//3 42//48 +f 28//6 40//6 39//50 +f 35//51 47//51 46//4 +f 32//53 44//53 43//3 +f 49//3 53//54 54//54 +f 53//54 55//1 56//1 +f 55//1 57//55 58//55 +f 57//55 59//56 60//56 +f 59//56 61//56 62//56 +f 52//57 70//57 82//58 +f 61//56 65//5 66//5 +f 70//57 52//57 73//59 +f 52//57 68//205 73//59 +f 74//61 67//62 51//60 +f 51//60 69//60 74//61 +f 73//59 68//205 50//6 +f 67//62 74//61 64//4 +f 50//6 54//6 58//6 +f 54//6 56//6 58//6 +f 58//6 60//6 50//6 +f 60//6 62//6 63//6 +f 62//6 66//6 78//6 +f 63//6 62//6 75//6 +f 78//6 75//6 62//6 +f 53//4 49//4 57//4 +f 49//4 64//4 59//4 +f 59//4 64//4 61//4 +f 64//4 76//4 61//4 +f 76//4 77//4 61//4 +f 77//4 65//4 61//4 +f 59//4 57//4 49//4 +f 81//63 84//63 69//60 +f 79//58 82//58 84//63 +f 107//64 109//64 110//65 +f 111//66 108//65 110//65 +f 111//66 115//66 117//58 +f 113//58 117//58 118//63 +f 114//63 118//63 116//67 +f 120//68 112//67 116//67 +f 120//68 122//68 121//69 +f 121//69 126//70 125//70 +f 107//64 123//71 124//71 +f 123//71 125//70 126//70 +f 143//64 145//64 146//65 +f 147//66 144//65 146//65 +f 147//66 151//66 153//58 +f 149//58 153//58 154//63 +f 150//63 154//63 152//67 +f 156//68 148//67 152//67 +f 156//68 158//68 157//69 +f 157//69 162//70 161//70 +f 143//64 159//71 160//71 +f 159//71 161//70 162//70 +f 168//72 175//109 172//73 +f 170//63 177//83 176//75 +f 169//76 166//82 173//77 +f 172//73 175//109 662//79 +f 174//81 173//77 166//82 +f 170//63 169//76 178//78 +f 172//73 171//103 164//70 +f 176//75 175//109 168//72 +f 164//70 171//103 174//81 +f 190//27 214//27 203//5 +f 180//28 204//28 205//50 +f 187//52 211//52 212//4 +f 184//48 208//48 209//3 +f 181//50 205//50 206//6 +f 188//4 212//4 213//51 +f 185//3 209//3 210//53 +f 182//6 206//6 207//49 +f 189//51 213//51 214//27 +f 179//5 203//5 204//28 +f 186//53 210//53 211//52 +f 183//49 207//49 208//48 +f 197//28 221//28 220//5 +f 194//51 218//51 217//4 +f 201//48 225//48 224//49 +f 191//53 215//53 226//3 +f 198//50 222//50 221//28 +f 195//27 219//27 218//51 +f 202//3 226//3 225//48 +f 192//52 216//52 215//53 +f 199//6 223//6 222//50 +f 196//5 220//5 219//27 +f 193//4 217//4 216//52 +f 200//49 224//49 223//6 +f 272//52 273//4 261//4 +f 279//6 280//49 268//49 +f 276//5 277//28 265//28 +f 273//4 274//51 262//51 +f 280//49 281//48 269//48 +f 282//3 271//53 259//53 +f 277//28 278//50 266//50 +f 274//51 275//27 263//27 +f 281//48 282//3 270//3 +f 271//53 272//52 260//52 +f 278//50 279//6 267//6 +f 275//27 276//5 264//5 +f 289//52 301//52 302//84 +f 296//85 308//85 309//49 +f 298//48 297//49 309//49 +f 287//3 300//3 299//53 +f 298//48 310//48 300//3 +f 288//53 299//53 301//52 +f 314//53 327//53 329//52 +f 322//85 331//85 332//49 +f 315//52 329//52 330//84 +f 323//49 332//49 333//48 +f 324//48 333//48 328//3 +f 313//3 328//3 327//53 +f 348//4 349//51 337//51 +f 355//49 356//48 344//48 +f 357//3 346//53 334//53 +f 352//28 353//50 341//50 +f 349//51 350//27 338//27 +f 356//48 357//3 345//3 +f 346//53 347//52 335//52 +f 353//50 354//6 342//6 +f 350//27 351//5 339//5 +f 347//52 348//4 336//4 +f 354//6 355//49 343//49 +f 351//5 352//28 340//28 +f 362//53 369//53 368//3 +f 360//48 367//48 366//49 +f 363//52 370//52 369//53 +f 361//3 368//3 367//48 +f 359//49 366//49 365//85 +f 364//84 371//84 370//52 +f 394//5 395//28 376//28 +f 395//28 396//50 377//50 +f 396//50 397//14 378//14 +f 391//13 392//51 373//51 +f 392//51 393//27 374//27 +f 393//27 394//5 375//5 +f 424//5 385//5 384//27 +f 427//86 382//4 381//52 +f 399//88 398//100 389//49 +f 423//28 386//28 385//5 +f 426//89 383//51 382//4 +f 400//90 387//50 386//28 +f 425//27 384//27 383//51 +f 380//53 489//53 428//87 +f 489//53 488//42 428//87 +f 485//3 489//53 380//53 +f 400//90 399//88 388//6 +f 399//91 464//99 463//92 +f 427//94 428//206 471//95 +f 426//97 427//94 470//96 +f 399//91 400//206 465//95 +f 486//48 485//3 379//3 +f 496//53 516//53 517//3 +f 497//52 518//52 516//53 +f 504//49 522//49 521//85 +f 498//84 519//84 518//52 +f 505//48 523//48 522//49 +f 495//3 517//3 523//48 +f 487//41 486//48 398//100 +f 486//48 390//48 398//100 +f 662//79 661//110 669//101 +f 171//103 172//73 659//80 +f 171//103 660//104 655//105 +f 178//78 657//108 658//106 +f 174//81 655//105 656//107 +f 173//77 656//107 657//108 +f 175//109 176//75 661//110 +f 177//83 658//106 661//110 +f 666//111 672//120 673//112 +f 657//108 665//113 666//111 +f 656//107 664//117 665//113 +f 660//104 668//116 663//114 +f 660//104 659//80 667//115 +f 655//105 663//114 664//117 +f 658//106 666//111 669//101 +f 659//80 662//79 670//102 +f 669//101 673//112 674//118 +f 666//111 665//113 671//119 +f 672//120 676//124 677//121 +f 673//112 677//121 678//122 +f 672//120 671//119 675//123 +f 676//124 680//127 681//125 +f 677//121 681//125 682//126 +f 675//123 679//154 680//127 +f 668//116 686//130 683//128 +f 668//116 667//115 685//129 +f 663//114 683//128 684//131 +f 686//130 690//133 687//132 +f 685//129 689//153 690//133 +f 684//131 683//128 687//132 +f 690//133 694//137 691//135 +f 690//133 689//153 693//136 +f 687//132 691//135 692//138 +f 694//137 698//141 695//139 +f 694//137 693//136 697//140 +f 691//135 695//139 696//142 +f 698//141 702//144 699//143 +f 697//140 701//207 702//144 +f 695//139 699//143 700//145 +f 702//144 706//148 703//146 +f 702//144 701//207 705//147 +f 699//143 703//146 704//149 +f 706//148 710//151 707//150 +f 705//147 709//155 710//151 +f 703//146 707//150 708//152 +f 674//118 678//122 689//153 +f 684//131 688//134 665//113 +f 708//152 707//150 680//127 +f 681//125 710//151 709//155 +f 707//150 710//151 681//125 +f 688//134 675//123 671//119 +f 700//145 704//149 696//142 +f 704//149 675//123 692//138 +f 675//123 688//134 692//138 +f 693//136 689//153 678//122 +f 678//122 705//147 693//136 +f 705//147 701//207 697//140 +f 685//129 667//115 670//102 +f 756//42 773//42 774//156 +f 764//6 779//6 778//8 +f 757//156 774//156 785//4 +f 765//41 780//41 779//6 +f 771//6 786//6 775//157 +f 766//3 781//3 780//41 +f 767//42 782//42 781//3 +f 768//4 783//4 782//42 +f 760//157 775//157 776//41 +f 769//7 784//7 783//4 +f 761//41 776//41 772//3 +f 755//3 772//3 773//42 +f 762//5 777//5 784//7 +f 763//8 778//8 777//5 +f 800//10 806//10 807//1 +f 801//5 805//5 806//10 +f 796//3 808//3 809//43 +f 797//43 809//43 803//2 +f 802//9 804//9 805//5 +f 798//2 803//2 804//9 +f 795//158 810//158 808//3 +f 799//1 807//1 810//158 +f 816//10 822//10 823//1 +f 817//5 821//5 822//10 +f 812//3 824//3 825//43 +f 813//43 825//43 819//2 +f 818//9 820//9 821//5 +f 814//2 819//2 820//9 +f 811//158 826//158 824//3 +f 815//1 823//1 826//158 +f 842//28 854//163 853//159 +f 839//51 851//164 850//160 +f 846//48 858//165 857//161 +f 836//53 848//166 847//162 +f 843//50 855//167 854//163 +f 840//27 852//168 851//164 +f 835//3 847//162 858//165 +f 837//52 849//169 848//166 +f 844//6 856//170 855//167 +f 841//5 853//159 852//168 +f 838//4 850//160 849//169 +f 845//49 857//161 856//170 +f 851//164 852//168 864//171 +f 858//165 847//162 859//173 +f 849//169 861//179 860//175 +f 855//167 856//170 868//176 +f 853//159 865//181 864//171 +f 849//169 850//160 862//178 +f 857//161 869//182 868//176 +f 853//159 854//163 866//180 +f 851//164 863//172 862//178 +f 858//165 870//174 869//182 +f 848//166 860//175 859//173 +f 855//167 867//177 866//180 +f 863//172 864//171 876//183 +f 870//174 859//173 871//185 +f 860//175 861//179 873//187 +f 867//177 868//176 880//189 +f 865//181 877//193 876//183 +f 862//178 874//194 873//187 +f 868//176 869//182 881//191 +f 865//181 866//180 878//192 +f 862//178 863//172 875//184 +f 870//174 882//186 881//191 +f 860//175 872//188 871//185 +f 867//177 879//190 878//192 +f 871//185 872//188 875//184 +f 872//188 873//187 875//184 +f 873//187 874//194 875//184 +f 875//184 876//183 877//193 +f 877//193 878//192 879//190 +f 879//190 880//189 881//191 +f 881//191 882//186 879//190 +f 882//186 871//185 879//190 +f 875//184 877//193 879//190 +f 902//195 901//195 899//2 +f 904//196 903//196 901//195 +f 906//55 905//55 903//196 +f 908//197 907//197 905//55 +f 910//29 909//29 907//197 +f 912//1 911//1 913//198 +f 916//54 915//54 917//199 +f 917//199 919//200 920//200 +f 920//200 919//200 921//24 +f 915//54 916//54 914//198 +f 929//201 930//201 926//29 +f 924//30 928//202 927//202 +f 928//202 932//195 931//195 +f 933//203 934//203 930//201 +f 936//204 934//203 933//203 +f 936//204 935//204 931//195 diff --git a/src/main/resources/assets/hbm/textures/items/armor_battery_mk2.png b/src/main/resources/assets/hbm/textures/items/armor_battery_mk2.png new file mode 100644 index 0000000000000000000000000000000000000000..699a5b4e200255f23477fe8303e6ac5355c0ba05 GIT binary patch literal 370 zcmV-&0ge8NP)DwDV(@6Fkj9x`Vaaglr6VC%$TSKHj{US>Qjhm<{a99SG+qKVf%6u^LdHS<8R#c`;A0qR*Tudiuu6S&XIEd4QK34Cb&JUZJJJf z0{iwnL{XGrX3NZ~Qb0sDNfN)H@s8p#u1?QT6eSKWP7p`;U}jY*$g-?TCZZMra}WD! z3;=kz=^>7|-T@I=t##+3hzMaAHhdz2G)-#-K12inptXiErlrs|{FOjNssti}F{V>p z&>2|~0f1Hqtu=^fX?LI=L5av(U)U#rF-Cc@2BCi?x8%+%EF;YG+>ieaKW6=UrU$ag QrvLx|07*qoM6N<$f*VYkBLDyZ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/armor_battery_mk3.png b/src/main/resources/assets/hbm/textures/items/armor_battery_mk3.png new file mode 100644 index 0000000000000000000000000000000000000000..96cc82109263eb7af14002382e8e4cc14498beac GIT binary patch literal 403 zcmV;E0c`$>P)NklBb5Qd*6-q~n&V?!Z+6~@9JKxaZD6(q)AU}0inWkG$x z*236X+CV{KBKiXe)W(FuMk+s0&H`==8z5N=yn|CfFuv8BotbB5cL)Ac-Db`_-JhCi zY9hWdu4A4b^0ewjjO$DcnemHD$s%j#ivX08KOrKT72RgeyuQ7&ym=%-0D$$w2(^QH z;N5a1)XBJxd93Bp`UB%SMntnB0J!A}v2==9x?k{eeG>x2_qHfFw}JN|!33>pHAuFk zB9=~t0GDLgJwECAoea>63xGx;VQeKwK9nUDbE_+%v$p3kyK&Z^;JezM2EbO5j`nC( zy%5lEI26$KbdX?4MMrzX(tv?I_^ToS9j!x$wvt#<{n{PAuCTO!CmIDg)e8F(qXLaW xA_N@#B}*y*=HnM)Bw!rSR+5G7tBGsJ>JuV8biJ^c_r?GK002ovPDHLkV1iNps+#}+ literal 0 HcmV?d00001 From 56cded741597c8c2d1f3cff115e13a21edb01089 Mon Sep 17 00:00:00 2001 From: Bob Date: Thu, 22 Aug 2024 00:31:25 +0200 Subject: [PATCH 15/17] go go gadget head exploder --- .../assets/hbm/models/weapons/carbine.obj | 5049 +++++++++++------ .../hbm/textures/models/weapons/huntsman.png | Bin 0 -> 3378 bytes 2 files changed, 3282 insertions(+), 1767 deletions(-) create mode 100644 src/main/resources/assets/hbm/textures/models/weapons/huntsman.png diff --git a/src/main/resources/assets/hbm/models/weapons/carbine.obj b/src/main/resources/assets/hbm/models/weapons/carbine.obj index d11ea138d..5a5caf913 100644 --- a/src/main/resources/assets/hbm/models/weapons/carbine.obj +++ b/src/main/resources/assets/hbm/models/weapons/carbine.obj @@ -1,8 +1,8 @@ # Blender v2.79 (sub 0) OBJ File: 'carbine.blend' # www.blender.org o Cylinder -v -0.000000 1.187500 4.375000 -v -0.000000 1.187500 8.000000 +v 0.000000 1.187500 4.375000 +v 0.000000 1.187500 8.000000 v 0.093750 1.162380 4.375000 v 0.093750 1.162380 8.000000 v 0.162380 1.093750 4.375000 @@ -25,127 +25,85 @@ v -0.162380 1.093750 4.375000 v -0.162380 1.093750 8.000000 v -0.093750 1.162380 4.375000 v -0.093750 1.162380 8.000000 -v -0.000000 1.125000 8.000000 +v 0.000000 1.125000 8.000000 v -0.062500 1.108253 8.000000 v -0.108253 1.062500 8.000000 v -0.125000 1.000000 8.000000 v -0.108253 0.937500 8.000000 v -0.062500 0.891747 8.000000 -v -0.000000 0.875000 8.000000 +v 0.000000 0.875000 8.000000 v 0.062500 0.891747 8.000000 v 0.108253 0.937500 8.000000 v 0.125000 1.000000 8.000000 v 0.108253 1.062500 8.000000 v 0.062500 1.108253 8.000000 v -0.062500 1.108253 7.000000 -v -0.000000 1.125000 7.000000 +v 0.000000 1.125000 7.000000 v -0.108253 1.062500 7.000000 v -0.125000 1.000000 7.000000 v -0.108253 0.937500 7.000000 v -0.062500 0.891747 7.000000 -v -0.000000 0.875000 7.000000 +v 0.000000 0.875000 7.000000 v 0.062500 0.891747 7.000000 v 0.108253 0.937500 7.000000 v 0.125000 1.000000 7.000000 v 0.108253 1.062500 7.000000 v 0.062500 1.108253 7.000000 -v -0.250000 1.000000 4.375000 -v 0.250000 1.000000 4.375000 -v -0.125000 1.375000 4.375000 -v 0.125000 1.375000 4.375000 -v -0.250000 1.000000 5.000000 -v 0.250000 1.000000 5.000000 -v -0.250000 0.750000 5.250000 -v 0.250000 0.750000 5.250000 -v -0.250000 0.500000 5.000000 -v 0.250000 0.500000 5.000000 -v -0.250000 0.500000 4.125000 -v 0.250000 0.500000 4.125000 -v -0.250000 0.312500 3.500000 -v 0.250000 0.312500 3.500000 -v 0.250000 1.000000 3.500000 -v -0.250000 1.000000 3.500000 -v -0.250000 0.312500 1.375000 -v 0.250000 0.312500 1.375000 -v -0.250000 1.125000 4.375000 -v 0.250000 1.125000 4.375000 -v -0.125000 1.375000 1.500000 -v 0.125000 1.375000 1.500000 -v -0.250000 1.125000 1.500000 -v 0.250000 1.125000 1.500000 -v 0.250000 1.125000 3.500000 -v -0.250000 1.125000 3.500000 -v 0.250000 1.000000 1.500000 -v -0.250000 1.000000 1.500000 -v -0.250000 0.625000 1.375000 -v 0.250000 0.625000 1.375000 -v 0.062500 1.312500 4.375000 -v -0.187500 1.125000 3.500000 -v -0.062500 1.312500 4.375000 -v 0.062500 1.312500 1.500000 -v -0.187500 1.125000 1.500000 -v -0.062500 1.312500 1.500000 -v -0.187500 1.000000 3.500000 -v -0.187500 1.000000 1.500000 -v 0.187500 1.125000 3.500000 -v 0.187500 1.125000 1.500000 -v 0.187500 1.000000 3.500000 -v 0.187500 1.000000 1.500000 -v 0.250000 0.375000 3.625000 -v 0.125000 1.375000 3.625000 -v 0.250000 1.125000 3.625000 -v -0.250000 0.375000 3.625000 -v -0.250000 1.125000 3.625000 -v -0.125000 1.375000 3.625000 -v 0.062500 1.312500 3.625000 -v 0.250000 0.375000 3.375000 -v -0.062500 1.312500 3.625000 -v 0.125000 1.375000 3.375000 -v 0.250000 1.125000 3.375000 -v -0.250000 0.375000 3.375000 -v -0.250000 1.125000 3.375000 -v -0.125000 1.375000 3.375000 -v 0.062500 1.312500 3.375000 -v -0.062500 1.312500 3.375000 -v 0.312500 0.312500 3.625000 -v 0.312500 1.125000 3.625000 -v 0.312500 0.312500 3.375000 -v 0.312500 1.125000 3.375000 -v 0.125000 1.437500 3.625000 -v -0.125000 1.437500 3.625000 -v 0.062500 1.375000 3.625000 -v -0.062500 1.375000 3.625000 -v 0.125000 1.437500 3.375000 -v -0.125000 1.437500 3.375000 -v 0.062500 1.375000 3.375000 -v -0.062500 1.375000 3.375000 -v -0.312500 0.312500 3.625000 -v -0.312500 1.125000 3.625000 -v -0.312500 0.312500 3.375000 +v -0.125000 0.250000 3.375000 +v -0.125000 0.250000 3.625000 +v 0.125000 0.250000 3.375000 +v 0.125000 0.250000 3.625000 +v 0.125000 0.375000 3.625000 +v 0.125000 0.312500 3.375000 +v -0.125000 0.375000 3.625000 +v -0.125000 0.312500 3.375000 v -0.312500 1.125000 3.375000 -v 0.250000 0.250000 3.625000 -v 0.250000 0.250000 3.375000 -v -0.250000 0.250000 3.625000 -v -0.250000 0.250000 3.375000 -v 0.250000 0.312500 2.375000 +v -0.312500 0.437500 3.375000 +v -0.312500 1.125000 3.625000 +v -0.312500 0.437500 3.625000 +v -0.062500 1.375000 3.375000 +v 0.062500 1.375000 3.375000 +v -0.125000 1.437500 3.375000 +v 0.125000 1.437500 3.375000 +v -0.062500 1.375000 3.625000 +v 0.062500 1.375000 3.625000 +v -0.125000 1.437500 3.625000 +v 0.125000 1.437500 3.625000 +v 0.312500 1.125000 3.375000 +v 0.312500 0.437500 3.375000 +v 0.312500 1.125000 3.625000 +v 0.312500 0.437500 3.625000 +v -0.062500 1.312500 3.375000 +v 0.062500 1.312500 3.375000 +v -0.125000 1.375000 3.375000 +v -0.250000 1.125000 3.375000 +v -0.250000 0.437500 3.375000 +v 0.250000 1.125000 3.375000 +v 0.125000 1.375000 3.375000 +v -0.062500 1.312500 3.625000 +v 0.250000 0.437500 3.375000 +v 0.062500 1.312500 3.625000 +v -0.125000 1.375000 3.625000 +v -0.250000 1.125000 3.625000 +v 0.250000 0.437500 2.375000 v 0.125000 1.375000 2.375000 v 0.250000 1.125000 2.375000 -v -0.250000 0.312500 2.375000 +v -0.250000 0.437500 2.375000 v -0.250000 1.125000 2.375000 v -0.125000 1.375000 2.375000 v 0.062500 1.312500 2.375000 -v 0.250000 0.312500 1.875000 +v 0.250000 0.437500 1.875000 v -0.062500 1.312500 2.375000 v 0.125000 1.375000 1.875000 v 0.250000 1.125000 1.875000 -v -0.250000 0.312500 1.875000 +v -0.250000 0.437500 1.875000 v -0.250000 1.125000 1.875000 v -0.125000 1.375000 1.875000 v 0.062500 1.312500 1.875000 v -0.062500 1.312500 1.875000 -v 0.312500 0.312500 2.375000 +v 0.312500 0.437500 2.375000 v 0.312500 1.125000 2.375000 -v 0.312500 0.312500 1.875000 +v 0.312500 0.437500 1.875000 v 0.312500 1.125000 1.875000 v 0.125000 1.437500 2.375000 v -0.125000 1.437500 2.375000 @@ -155,14 +113,10 @@ v 0.125000 1.437500 1.875000 v -0.125000 1.437500 1.875000 v 0.062500 1.375000 1.875000 v -0.062500 1.375000 1.875000 -v -0.312500 0.312500 2.375000 +v -0.312500 0.437500 2.375000 v -0.312500 1.125000 2.375000 -v -0.312500 0.312500 1.875000 +v -0.312500 0.437500 1.875000 v -0.312500 1.125000 1.875000 -v 0.250000 0.250000 2.375000 -v 0.250000 0.250000 1.875000 -v -0.250000 0.250000 2.375000 -v -0.250000 0.250000 1.875000 v -0.250000 0.437500 -0.500000 v -0.125000 0.312500 -0.500000 v 0.125000 0.312500 -0.500000 @@ -179,13 +133,13 @@ v -0.250000 0.937500 -1.750000 v -0.125000 1.062500 -1.750000 v 0.125000 1.062500 -1.750000 v 0.250000 0.937500 -1.750000 -v -0.000000 1.125000 1.437500 +v 0.000000 1.125000 1.437500 v -0.062500 1.108253 1.437500 v -0.108253 1.062500 1.437500 v -0.125000 1.000000 1.437500 v -0.108253 0.937500 1.437500 v -0.062500 0.891747 1.437500 -v -0.000000 0.875000 1.437500 +v 0.000000 0.875000 1.437500 v 0.062500 0.891747 1.437500 v 0.108253 0.937500 1.437500 v 0.125000 1.000000 1.437500 @@ -202,14 +156,14 @@ v 0.162380 0.906250 1.437500 v 0.187500 1.000000 1.437500 v 0.162380 1.093750 1.437500 v 0.093750 1.162380 1.437500 -v -0.000000 1.187500 1.437500 -v -0.000000 1.125000 1.937500 +v 0.000000 1.187500 1.437500 +v 0.000000 1.125000 1.937500 v -0.062500 1.108253 1.937500 v -0.108253 1.062500 1.937500 v -0.125000 1.000000 1.937500 v -0.108253 0.937500 1.937500 v -0.062500 0.891747 1.937500 -v -0.000000 0.875000 1.937500 +v 0.000000 0.875000 1.937500 v 0.062500 0.891747 1.937500 v 0.108253 0.937500 1.937500 v 0.125000 1.000000 1.937500 @@ -226,11 +180,11 @@ v 0.162380 0.906250 1.562500 v 0.187500 1.000000 1.562500 v 0.162380 1.093750 1.562500 v 0.093750 1.162380 1.562500 -v -0.000000 1.187500 1.562500 -v 0.125000 1.000000 1.500000 -v 0.125000 1.125000 1.500000 -v -0.125000 1.125000 1.500000 -v -0.125000 1.000000 1.500000 +v 0.000000 1.187500 1.562500 +v -0.250000 0.500000 3.625000 +v 0.250000 1.125000 3.625000 +v 0.125000 1.375000 3.625000 +v 0.250000 0.500000 3.625000 v 0.312500 1.000000 1.625000 v 0.312500 1.000000 -1.000000 v 0.312500 0.875000 1.625000 @@ -252,55 +206,45 @@ v -0.312500 0.625000 -0.750000 v 0.250000 1.000000 1.625000 v 0.250000 0.875000 1.625000 v 0.250000 0.625000 1.375000 -v 0.250000 0.375000 1.375000 -v -0.250000 0.375000 1.375000 +v 0.250000 0.437500 1.375000 +v -0.250000 0.437500 1.375000 v -0.250000 0.625000 1.375000 v -0.250000 0.875000 1.625000 v -0.250000 1.000000 1.625000 -v 0.187500 0.312500 1.375000 -v -0.187500 0.312500 1.375000 +v 0.125000 0.312500 1.375000 +v -0.125000 0.312500 1.375000 v -0.093750 1.162380 1.125000 v -0.162380 1.093750 1.125000 v -0.187500 1.000000 1.125000 -v -0.162380 0.906250 1.125000 -v -0.093750 0.837620 1.125000 -v 0.000000 0.812500 1.125000 -v 0.093750 0.837620 1.125000 -v 0.162380 0.906250 1.125000 v 0.187500 1.000000 1.125000 v 0.162380 1.093750 1.125000 v 0.093750 1.162380 1.125000 -v -0.000000 1.187500 1.125000 +v 0.000000 1.187500 1.125000 v -0.093750 1.162380 0.125000 v -0.162380 1.093750 0.125000 v -0.187500 1.000000 0.125000 -v -0.162380 0.906250 0.125000 -v -0.093750 0.837620 0.125000 -v 0.000000 0.812500 0.125000 -v 0.093750 0.837620 0.125000 -v 0.162380 0.906250 0.125000 v 0.187500 1.000000 0.125000 v 0.162380 1.093750 0.125000 v 0.093750 1.162380 0.125000 -v -0.000000 1.187500 0.125000 -v 0.187500 1.000000 1.500000 -v -0.187500 1.000000 1.500000 +v 0.000000 1.187500 0.125000 +v 0.187500 1.000000 1.625000 +v -0.187500 1.000000 1.625000 v 0.187500 1.000000 0.125000 v -0.187500 1.000000 0.125000 -v -0.000000 1.250000 0.125000 +v 0.000000 1.250000 0.125000 v -0.125000 1.216506 0.125000 v -0.216506 1.125000 0.125000 v -0.250000 1.000000 0.125000 v -0.216506 0.875000 0.125000 v -0.125000 0.783494 0.125000 -v -0.000000 0.750000 0.125000 +v 0.000000 0.750000 0.125000 v 0.125000 0.783494 0.125000 v 0.216506 0.875000 0.125000 v 0.250000 1.000000 0.125000 v 0.216506 1.125000 0.125000 v 0.125000 1.216506 0.125000 v -0.125000 1.216506 -0.125000 -v -0.000000 1.250000 -0.125000 +v 0.000000 1.250000 -0.125000 v -0.216506 1.125000 -0.125000 v -0.250000 1.000000 -0.125000 v 0.093750 0.837620 1.375000 @@ -345,7 +289,7 @@ v 0.162380 0.906250 1.437500 v 0.187500 1.000000 1.437500 v 0.162380 1.093750 1.437500 v 0.093750 1.162380 1.437500 -v -0.000000 1.187500 1.437500 +v 0.000000 1.187500 1.437500 v -0.093750 1.162380 1.375000 v -0.162380 1.093750 1.375000 v -0.187500 1.000000 1.375000 @@ -357,7 +301,7 @@ v 0.162380 0.906250 1.375000 v 0.187500 1.000000 1.375000 v 0.162380 1.093750 1.375000 v 0.093750 1.162380 1.375000 -v -0.000000 1.187500 1.375000 +v 0.000000 1.187500 1.375000 v -0.187500 1.000000 1.437500 v -0.162380 0.906250 1.437500 v -0.093750 0.837620 1.437500 @@ -375,17 +319,17 @@ v 0.187500 1.000000 0.125000 v -0.250000 1.000000 7.875000 v -0.216506 0.875000 7.875000 v -0.125000 0.783494 7.875000 -v -0.000000 0.750000 7.875000 +v 0.000000 0.750000 7.875000 v 0.125000 0.783494 7.875000 v 0.216506 0.875000 7.875000 v 0.250000 1.000000 7.875000 -v -0.000000 1.250000 6.125000 +v 0.000000 1.250000 6.125000 v -0.125000 1.216506 6.125000 v -0.216506 1.125000 6.125000 v -0.250000 1.000000 6.125000 v -0.216506 0.875000 6.125000 v -0.125000 0.783494 6.125000 -v -0.000000 0.750000 6.125000 +v 0.000000 0.750000 6.125000 v 0.125000 0.783494 6.125000 v 0.216506 0.875000 6.125000 v 0.250000 1.000000 6.125000 @@ -394,21 +338,21 @@ v 0.125000 1.216506 6.125000 v -0.250000 1.000000 7.500000 v -0.216506 0.875000 7.500000 v -0.125000 0.783494 7.500000 -v -0.000000 0.750000 7.500000 +v 0.000000 0.750000 7.500000 v 0.125000 0.783494 7.500000 v 0.216506 0.875000 7.500000 v 0.250000 1.000000 7.500000 v 0.216506 1.125000 5.250000 v 0.250000 1.000000 5.375000 v 0.216506 0.875000 5.500000 -v -0.125000 1.387500 7.500000 -v 0.125000 1.387500 7.500000 -v 0.125000 1.387500 7.875000 -v -0.125000 1.387500 7.875000 -v 0.187500 1.387500 7.875000 -v 0.187500 1.387500 7.500000 -v -0.187500 1.387500 7.875000 -v -0.187500 1.387500 7.500000 +v -0.125000 1.375000 7.500000 +v 0.125000 1.375000 7.500000 +v 0.125000 1.375000 7.875000 +v -0.125000 1.375000 7.875000 +v 0.187500 1.375000 7.875000 +v 0.187500 1.375000 7.500000 +v -0.187500 1.375000 7.875000 +v -0.187500 1.375000 7.500000 v 0.187500 1.000000 7.875000 v 0.162380 0.906250 7.875000 v 0.093750 0.837620 7.875000 @@ -424,7 +368,7 @@ v -0.093750 0.837620 7.500000 v -0.162380 0.906250 7.500000 v -0.187500 1.000000 7.500000 v 0.125000 0.783494 5.500000 -v -0.000000 0.750000 5.500000 +v 0.000000 0.750000 5.500000 v -0.125000 0.783494 5.500000 v -0.216506 0.875000 5.500000 v -0.250000 1.000000 5.375000 @@ -439,12 +383,12 @@ v -0.250000 1.691561 7.506433 v -0.250000 1.691561 7.881433 v 0.062500 1.125000 7.500000 v 0.062500 1.125000 7.875000 -v 0.062500 1.387500 7.875000 -v 0.062500 1.387500 7.500000 -v -0.062500 1.387500 7.875000 +v 0.062500 1.375000 7.875000 +v 0.062500 1.375000 7.500000 +v -0.062500 1.375000 7.875000 v -0.062500 1.125000 7.875000 v -0.062500 1.125000 7.500000 -v -0.062500 1.387500 7.500000 +v -0.062500 1.375000 7.500000 v 0.062500 1.250000 7.875000 v 0.062500 1.250000 7.500000 v -0.062500 1.250000 7.875000 @@ -461,8 +405,6 @@ v 0.031250 1.562500 7.625000 v -0.031250 1.562500 7.625000 v -0.031250 1.562500 7.750000 v 0.031250 1.562500 7.750000 -v -0.000000 1.187500 5.250000 -v 0.093750 1.162380 5.250000 v 0.162380 1.093750 5.250000 v 0.187500 1.000000 5.375000 v 0.162380 0.906250 5.500000 @@ -472,8 +414,7 @@ v -0.093750 0.837620 5.500000 v -0.162380 0.906250 5.500000 v -0.187500 1.000000 5.375000 v -0.162380 1.093750 5.250000 -v -0.093750 1.162380 5.250000 -v -0.000000 1.187500 6.125000 +v 0.000000 1.187500 6.125000 v 0.093750 1.162380 6.125000 v 0.162380 1.093750 6.125000 v 0.187500 1.000000 6.125000 @@ -485,66 +426,46 @@ v -0.162380 0.906250 6.125000 v -0.187500 1.000000 6.125000 v -0.162380 1.093750 6.125000 v -0.093750 1.162380 6.125000 -v -0.000000 1.250000 4.875000 +v 0.000000 1.250000 4.875000 v 0.125000 1.216506 4.875000 v 0.216506 1.125000 4.875000 v -0.216506 1.125000 4.875000 v -0.125000 1.216506 4.875000 v 0.093750 1.162380 4.875000 -v -0.000000 1.187500 4.875000 +v 0.000000 1.187500 4.875000 v 0.162380 1.093750 4.875000 v -0.093750 1.162380 4.875000 v -0.162380 1.093750 4.875000 -v -0.000000 1.250000 4.437500 +v 0.000000 1.250000 4.437500 v -0.125000 1.216506 4.437500 v -0.216506 1.125000 4.437500 v -0.250000 1.000000 4.437500 -v 0.312500 1.000000 4.500000 -v 0.312500 0.500100 4.500000 -v 0.312500 1.000000 4.750000 -v 0.312500 0.500100 4.750000 v 0.250000 1.000000 4.437500 v 0.216506 1.125000 4.437500 v 0.125000 1.216506 4.437500 -v -0.000000 1.187500 4.437500 +v 0.000000 1.187500 4.437500 v 0.093750 1.162380 4.437500 v 0.162380 1.093750 4.437500 v 0.187500 1.000000 4.437500 -v -0.250000 1.000000 4.500000 -v -0.250000 0.500000 4.500000 -v 0.250000 1.000000 4.500000 v -0.187500 1.000000 4.437500 v -0.162380 1.093750 4.437500 v -0.093750 1.162380 4.437500 v -0.125000 1.216506 4.812500 -v -0.000000 1.250000 4.812500 +v 0.000000 1.250000 4.812500 v -0.216506 1.125000 4.812500 v -0.250000 1.000000 4.812500 -v 0.250000 0.500000 4.500000 v 0.250000 1.000000 4.812500 v 0.216506 1.125000 4.812500 v 0.125000 1.216506 4.812500 v 0.093750 1.162380 4.812500 -v -0.000000 1.187500 4.812500 +v 0.000000 1.187500 4.812500 v 0.162380 1.093750 4.812500 v 0.187500 1.000000 4.812500 -v -0.250000 1.000000 4.750000 -v -0.250000 0.500000 4.750000 -v 0.250000 1.000000 4.750000 -v 0.250000 0.500000 4.750000 v -0.187500 1.000000 4.812500 v -0.162380 1.093750 4.812500 v -0.093750 1.162380 4.812500 -v -0.312500 0.500100 4.750000 -v -0.312500 1.000000 4.750000 -v -0.312500 0.500100 4.500000 -v -0.312500 1.000000 4.500000 -v 0.250000 0.437600 4.750000 -v 0.250000 0.437600 4.500000 -v -0.250000 0.437600 4.750000 -v -0.250000 0.437600 4.500000 -v 0.187500 0.437600 4.750000 -v 0.187500 0.437600 4.500000 +v 0.187500 0.500100 4.750000 +v 0.187500 0.500100 4.500000 v 0.125000 0.437600 4.750000 v 0.125000 0.437600 4.500000 v 0.187500 0.187600 4.750000 @@ -557,8 +478,8 @@ v 0.125000 0.062600 4.687500 v 0.125000 0.062600 4.562500 v -0.125000 0.437600 4.750000 v -0.125000 0.437600 4.500000 -v -0.187500 0.437600 4.750000 -v -0.187500 0.437600 4.500000 +v -0.187500 0.500100 4.750000 +v -0.187500 0.500100 4.500000 v -0.125000 0.187600 4.750000 v -0.125000 0.187600 4.500000 v -0.187500 0.187600 4.750000 @@ -603,26 +524,6 @@ v 0.625000 0.906250 1.000000 v 0.625000 1.156250 1.000000 v 0.625000 0.906250 1.125000 v 0.625000 1.156250 1.125000 -v -0.125000 1.000000 1.125000 -v -0.500000 1.000000 1.125000 -v -0.125000 1.000000 1.000000 -v -0.500000 1.000000 1.000000 -v -0.125000 1.062500 1.125000 -v -0.500000 1.062500 1.125000 -v -0.125000 1.062500 1.000000 -v -0.500000 1.062500 1.000000 -v -0.500000 0.906250 1.125000 -v -0.500000 1.156250 1.125000 -v -0.500000 0.906250 1.000000 -v -0.500000 1.156250 1.000000 -v -0.750000 0.968750 1.125000 -v -0.750000 1.093750 1.125000 -v -0.750000 0.968750 1.000000 -v -0.750000 1.093750 1.000000 -v -0.625000 0.906250 1.000000 -v -0.625000 1.156250 1.000000 -v -0.625000 0.906250 1.125000 -v -0.625000 1.156250 1.125000 v 0.687500 0.875000 0.000000 v 0.687500 1.000000 0.000000 v 0.562500 0.875000 -0.500000 @@ -635,18 +536,6 @@ v 0.625000 1.000000 -0.062500 v 0.562500 1.000000 -0.062500 v 0.625000 1.062500 -0.062500 v 0.562500 1.062500 -0.062500 -v -0.312500 1.000000 1.250000 -v -0.312500 0.875000 1.250000 -v -0.312500 1.000000 -0.875000 -v -0.312500 0.875000 -0.875000 -v -0.437500 0.875000 1.250000 -v -0.437500 1.000000 1.250000 -v -0.437500 0.875000 0.000000 -v -0.437500 1.000000 0.000000 -v -0.687500 0.875000 0.000000 -v -0.687500 1.000000 0.000000 -v -0.562500 0.875000 -0.500000 -v -0.562500 1.000000 -0.500000 v -0.687500 1.000000 0.000000 v -0.562500 1.000000 0.000000 v -0.687500 1.062500 0.000000 @@ -758,7 +647,7 @@ v 0.125000 1.562500 -0.625000 v 0.000000 1.687500 -0.250000 v -0.088388 1.650888 -0.250000 v -0.125000 1.562500 -0.250000 -v -0.000000 1.437500 -0.312500 +v 0.000000 1.437500 -0.312500 v 0.000000 1.437500 -0.250000 v 0.125000 1.562500 -0.250000 v 0.088388 1.650888 -0.250000 @@ -811,22 +700,22 @@ v 0.250000 1.437500 -0.375000 v 0.250000 1.562500 -0.500000 v 0.250000 1.525888 -0.588388 v 0.250000 1.525888 -0.411612 -v -0.250000 1.525888 -0.411612 -v -0.250000 1.562500 -0.500000 -v -0.250000 1.525888 -0.588388 -v -0.250000 1.437500 -0.625000 -v -0.250000 1.437500 -0.375000 -v -0.250000 1.349112 -0.411612 -v -0.250000 1.312500 -0.500000 -v -0.250000 1.349112 -0.588388 -v -0.187500 1.437500 -0.625000 -v -0.187500 1.349112 -0.588388 -v -0.187500 1.312500 -0.500000 -v -0.187500 1.349112 -0.411612 -v -0.187500 1.437500 -0.375000 -v -0.187500 1.562500 -0.500000 -v -0.187500 1.525888 -0.588388 v -0.187500 1.525888 -0.411612 +v -0.187500 1.525888 -0.588388 +v -0.187500 1.562500 -0.500000 +v -0.187500 1.437500 -0.375000 +v -0.187500 1.349112 -0.411612 +v -0.187500 1.312500 -0.500000 +v -0.187500 1.349112 -0.588388 +v -0.187500 1.437500 -0.625000 +v -0.250000 1.349112 -0.588388 +v -0.250000 1.312500 -0.500000 +v -0.250000 1.349112 -0.411612 +v -0.250000 1.437500 -0.375000 +v -0.250000 1.437500 -0.625000 +v -0.250000 1.525888 -0.588388 +v -0.250000 1.562500 -0.500000 +v -0.250000 1.525888 -0.411612 v 0.187500 0.875000 1.125000 v -0.187500 0.875000 1.125000 v 0.187500 0.875000 0.125000 @@ -841,7 +730,7 @@ v -0.108253 0.937500 0.187500 v -0.125000 0.875000 0.187500 v -0.108253 0.812500 0.187500 v -0.062500 0.766747 0.187500 -v -0.000000 0.750000 0.187500 +v 0.000000 0.750000 0.187500 v 0.062500 0.766747 0.187500 v 0.108253 0.812500 0.187500 v 0.125000 0.875000 0.187500 @@ -853,7 +742,7 @@ v -0.108253 0.937500 0.812500 v -0.125000 0.875000 0.812500 v -0.108253 0.812500 0.812500 v -0.062500 0.766747 0.812500 -v -0.000000 0.750000 0.812500 +v 0.000000 0.750000 0.812500 v 0.062500 0.766747 0.812500 v 0.108253 0.812500 0.812500 v 0.125000 0.875000 0.812500 @@ -865,7 +754,7 @@ v -0.081190 0.921875 1.000000 v -0.093750 0.875000 1.000000 v -0.081190 0.828125 1.000000 v -0.046875 0.793810 1.000000 -v -0.000000 0.781250 1.000000 +v 0.000000 0.781250 1.000000 v 0.046875 0.793810 1.000000 v 0.081190 0.828125 1.000000 v 0.093750 0.875000 1.000000 @@ -937,9 +826,1626 @@ v -0.062500 0.000000 -1.375000 v 0.062500 0.000000 -1.375000 v -0.062500 -0.187500 -1.312500 v 0.062500 -0.187500 -1.312500 +v -0.250000 1.000000 4.375000 +v 0.250000 1.000000 4.375000 +v -0.125000 1.375000 4.375000 +v 0.125000 1.375000 4.375000 +v -0.250000 1.000000 5.000000 +v 0.250000 1.000000 5.000000 +v -0.250000 0.750000 5.250000 +v 0.250000 0.750000 5.250000 +v -0.125000 0.500000 5.000000 +v 0.125000 0.500000 5.000000 +v -0.125000 0.500000 4.125000 +v 0.125000 0.500000 4.125000 +v -0.125000 0.312500 3.500000 +v 0.125000 0.312500 3.500000 +v 0.250000 1.000000 3.500000 +v -0.250000 1.000000 3.500000 +v -0.125000 0.312500 1.375000 +v 0.125000 0.312500 1.375000 +v -0.250000 1.125000 4.375000 +v 0.250000 1.125000 4.375000 +v -0.125000 1.375000 1.500000 +v 0.125000 1.375000 1.500000 +v -0.250000 1.125000 1.500000 +v 0.250000 1.125000 1.500000 +v 0.250000 1.125000 3.500000 +v -0.250000 1.125000 3.500000 +v 0.250000 1.000000 1.500000 +v -0.250000 1.000000 1.500000 +v -0.250000 0.625000 5.125000 +v 0.250000 0.625000 5.125000 +v 0.062500 1.312500 4.375000 +v -0.187500 1.125000 3.500000 +v -0.062500 1.312500 4.375000 +v 0.062500 1.312500 1.500000 +v -0.187500 1.125000 1.500000 +v -0.062500 1.312500 1.500000 +v -0.187500 1.000000 3.500000 +v -0.187500 1.000000 1.500000 +v 0.187500 1.125000 3.500000 +v 0.187500 1.125000 1.500000 +v 0.187500 1.000000 3.500000 +v 0.187500 1.000000 1.500000 +v 0.125000 1.000000 1.500000 +v 0.125000 1.125000 1.500000 +v -0.125000 1.125000 1.500000 +v -0.125000 1.000000 1.500000 +v -0.250000 0.625000 4.125000 +v 0.250000 0.625000 4.125000 +v -0.250000 0.437500 3.500000 +v 0.250000 0.437500 3.500000 +v -0.250000 0.437500 1.375000 +v 0.250000 0.437500 1.375000 +v -0.250000 0.625000 1.375000 +v 0.250000 0.625000 1.375000 +v -0.125000 0.312500 1.875000 +v -0.125000 0.312500 2.375000 +v 0.125000 0.312500 1.875000 +v 0.125000 0.312500 2.375000 +v 0.125000 0.250000 2.375000 +v 0.125000 0.250000 1.875000 +v -0.125000 0.250000 2.375000 +v -0.125000 0.250000 1.875000 +v -0.250000 1.000000 4.750000 +v 0.250000 1.000000 4.750000 +v -0.250000 1.000000 4.500000 +v 0.250000 1.000000 4.500000 +v -0.312500 1.000000 4.750000 +v -0.312500 1.000000 4.500000 +v 0.312500 1.000000 4.750000 +v 0.312500 1.000000 4.500000 +v -0.312500 0.625000 4.750000 +v -0.312500 0.625000 4.500000 +v 0.312500 0.625000 4.750000 +v 0.312500 0.625000 4.500000 +v -0.125000 0.437500 4.750000 +v -0.125000 0.437500 4.500000 +v 0.125000 0.437500 4.750000 +v 0.125000 0.437500 4.500000 +v -0.125000 0.500000 4.750000 +v -0.125000 0.500000 4.500000 +v 0.125000 0.500000 4.750000 +v 0.125000 0.500000 4.500000 +v -0.250000 0.625000 4.750000 +v 0.250000 0.625000 4.750000 +v -0.250000 0.625000 4.500000 +v 0.250000 0.625000 4.500000 +v -0.312500 1.000000 1.250000 +v -0.312500 0.875000 1.250000 +v -0.312500 1.000000 -0.875000 +v -0.312500 0.875000 -0.875000 +v -0.437500 0.875000 1.250000 +v -0.437500 1.000000 1.250000 +v -0.437500 0.875000 0.000000 +v -0.437500 1.000000 0.000000 +v -0.687500 0.875000 0.000000 +v -0.687500 1.000000 0.000000 +v -0.562500 0.875000 -0.500000 +v -0.562500 1.000000 -0.500000 +v -0.125000 1.000000 1.125000 +v -0.500000 1.000000 1.125000 +v -0.125000 1.000000 1.000000 +v -0.500000 1.000000 1.000000 +v -0.125000 1.062500 1.125000 +v -0.500000 1.062500 1.125000 +v -0.125000 1.062500 1.000000 +v -0.500000 1.062500 1.000000 +v -0.500000 0.906250 1.125000 +v -0.500000 1.156250 1.125000 +v -0.500000 0.906250 1.000000 +v -0.500000 1.156250 1.000000 +v -0.750000 0.968750 1.125000 +v -0.750000 1.093750 1.125000 +v -0.750000 0.968750 1.000000 +v -0.750000 1.093750 1.000000 +v -0.625000 0.906250 1.000000 +v -0.625000 1.156250 1.000000 +v -0.625000 0.906250 1.125000 +v -0.625000 1.156250 1.125000 +vt 0.062271 0.065217 +vt 0.058608 0.043478 +vt 0.062271 0.043478 +vt 0.058608 0.076087 +vt 0.058608 0.065217 +vt 0.062271 0.108696 +vt 0.058608 0.086957 +vt 0.062271 0.086957 +vt 0.058608 0.119565 +vt 0.058608 0.108696 +vt 0.062271 0.152174 +vt 0.058608 0.130435 +vt 0.062271 0.130435 +vt 0.058608 0.163043 +vt 0.058608 0.152174 +vt 0.062271 0.173913 +vt 0.058608 0.184783 +vt 0.058608 0.173913 +vt 0.062271 0.195652 +vt 0.058608 0.206522 +vt 0.058608 0.195652 +vt 0.062271 0.217391 +vt 0.058608 0.228261 +vt 0.058608 0.217391 +vt 0.062271 0.260870 +vt 0.058608 0.239130 +vt 0.062271 0.239130 +vt 0.062271 -0.000000 +vt 0.058608 0.010870 +vt 0.058608 -0.000000 +vt 0.058608 0.021739 +vt 0.062271 0.021739 +vt 0.007326 0.260986 +vt 0.013637 0.271797 +vt 0.007326 0.304232 +vt 0.315018 0.923913 +vt 0.307692 0.956522 +vt 0.307692 0.934783 +vt 0.307692 0.478261 +vt 0.315018 0.510870 +vt 0.307692 0.500000 +vt 0.315018 0.467391 +vt 0.307692 0.423913 +vt 0.315018 0.423913 +vt 0.333333 0.684783 +vt 0.329670 0.630435 +vt 0.333333 0.630435 +vt 0.329670 0.467391 +vt 0.333333 0.500000 +vt 0.329670 0.510870 +vt 0.333333 0.956522 +vt 0.329670 0.923913 +vt 0.333333 0.934783 +vt 0.366300 0.630435 +vt 0.369963 0.510870 +vt 0.369963 0.630435 +vt 0.329670 0.423913 +vt 0.333333 0.467391 +vt 0.311355 0.684783 +vt 0.315018 0.630435 +vt 0.315018 0.695652 +vt 0.311355 0.739130 +vt 0.315018 0.728261 +vt 0.315018 0.739130 +vt 0.329670 0.728261 +vt 0.333333 0.706522 +vt 0.333333 0.728261 +vt 0.311355 0.695652 +vt 0.315018 0.706522 +vt 0.311355 0.706522 +vt 0.333333 0.804348 +vt 0.333333 0.913043 +vt 0.329670 0.804348 +vt 0.333333 0.750000 +vt 0.311355 0.521739 +vt 0.311355 0.630435 +vt 0.311355 0.750000 +vt 0.315018 0.804348 +vt 0.311355 0.804348 +vt 0.329670 0.706522 +vt 0.333333 0.695652 +vt 0.311355 0.913043 +vt 0.333333 0.510870 +vt 0.336996 0.630435 +vt 0.333333 0.630435 +vt 0.333333 0.706522 +vt 0.336996 0.728261 +vt 0.333333 0.728261 +vt 0.333333 0.695652 +vt 0.336996 0.706522 +vt 0.366300 0.728261 +vt 0.369963 0.706522 +vt 0.369963 0.728261 +vt 0.369963 0.739130 +vt 0.333333 0.739130 +vt 0.336996 0.739130 +vt 0.366300 0.706522 +vt 0.369963 0.695652 +vt 0.366300 0.923913 +vt 0.369963 0.804348 +vt 0.369963 0.923913 +vt 0.333333 0.804348 +vt 0.336996 0.923913 +vt 0.333333 0.923913 +vt 0.366300 0.804348 +vt 0.369963 0.750000 +vt 0.333333 0.750000 +vt 0.336996 0.804348 +vt 0.369963 0.684783 +vt 0.333333 0.684783 +vt 0.336996 0.695652 +vt 0.336996 0.467391 +vt 0.333333 0.423913 +vt 0.336996 0.423913 +vt 0.622711 0.826087 +vt 0.619048 0.847826 +vt 0.619048 0.826087 +vt 0.622711 0.858696 +vt 0.622711 0.847826 +vt 0.622711 0.869565 +vt 0.619048 0.891304 +vt 0.619048 0.869565 +vt 0.622711 0.902174 +vt 0.622711 0.891304 +vt 0.622711 0.923913 +vt 0.619048 0.913043 +vt 0.622711 0.913043 +vt 0.622711 0.945652 +vt 0.619048 0.934783 +vt 0.622711 0.934783 +vt 0.622711 0.967391 +vt 0.619048 0.956522 +vt 0.622711 0.956522 +vt 0.622711 0.978261 +vt 0.619048 1.000000 +vt 0.619048 0.978261 +vt 0.622711 0.750000 +vt 0.619048 0.739130 +vt 0.622711 0.739130 +vt 0.622711 0.760870 +vt 0.619048 0.782609 +vt 0.619048 0.760870 +vt 0.622711 0.782609 +vt 0.619048 0.804348 +vt 0.622711 0.815217 +vt 0.622711 0.804348 +vt 0.333333 0.521739 +vt 0.311355 0.728261 +vt 0.333333 0.739130 +vt 0.653009 0.771718 +vt 0.659341 0.739173 +vt 0.665673 0.771718 +vt 0.058608 0.630435 +vt 0.183150 0.673913 +vt 0.058608 0.673913 +vt 0.058608 0.260870 +vt 0.183150 0.326087 +vt 0.058608 0.326087 +vt 0.058608 0.347826 +vt 0.183150 0.391304 +vt 0.058608 0.391304 +vt 0.183150 0.695652 +vt 0.058608 0.695652 +vt 0.183150 0.347826 +vt 0.219780 0.565217 +vt 0.219780 0.456522 +vt 0.241758 0.478261 +vt 0.205128 0.565217 +vt 0.205128 0.456522 +vt 0.197802 0.565217 +vt 0.197802 0.456522 +vt 0.021978 0.456522 +vt 0.010989 0.467391 +vt 0.007326 0.456522 +vt 0.036630 0.456522 +vt 0.021978 0.467391 +vt 0.043956 0.456522 +vt 0.036630 0.467391 +vt 0.036630 0.565217 +vt 0.043956 0.554348 +vt 0.043956 0.565217 +vt 0.021978 0.565217 +vt 0.036630 0.554348 +vt 0.010989 0.554348 +vt 0.021978 0.554348 +vt 0.000000 0.478261 +vt 0.003663 0.532609 +vt 0.000000 0.543478 +vt 0.007326 0.565217 +vt 0.003663 0.489130 +vt 0.131868 0.478261 +vt 0.131868 0.543478 +vt 0.723636 0.674017 +vt 0.748892 0.674017 +vt 0.736264 0.738921 +vt 0.022092 0.858808 +vt 0.043842 0.858808 +vt 0.032967 0.912594 +vt 0.043736 0.945870 +vt 0.032967 0.999130 +vt 0.022198 0.945870 +vt 0.690786 0.755520 +vt 0.690786 0.787959 +vt 0.681319 0.804179 +vt 0.886447 0.858696 +vt 0.879121 0.869565 +vt 0.879121 0.858696 +vt 0.893773 0.858696 +vt 0.886447 0.869565 +vt 0.901099 0.858696 +vt 0.893773 0.869565 +vt 0.908425 0.869565 +vt 0.901099 0.869565 +vt 0.908425 0.858696 +vt 0.915751 0.869565 +vt 0.915751 0.858696 +vt 0.923077 0.869565 +vt 0.915751 0.793478 +vt 0.923077 0.782609 +vt 0.923077 0.793478 +vt 0.908425 0.793478 +vt 0.915751 0.782609 +vt 0.901099 0.793478 +vt 0.908425 0.782609 +vt 0.893773 0.782609 +vt 0.893773 0.793478 +vt 0.886447 0.782609 +vt 0.886447 0.793478 +vt 0.879121 0.782609 +vt 0.879121 0.793478 +vt 0.857143 0.793478 +vt 0.857143 0.782609 +vt 0.816850 0.793478 +vt 0.835165 0.858696 +vt 0.816850 0.858696 +vt 0.857143 0.858696 +vt 0.857143 0.869565 +vt 0.945055 0.793478 +vt 0.963370 0.858696 +vt 0.945055 0.858696 +vt 0.945055 0.869565 +vt 0.945055 0.782609 +vt 0.267399 0.913043 +vt 0.260073 0.934783 +vt 0.260073 0.913043 +vt 0.838828 0.858696 +vt 0.835165 0.793478 +vt 0.838828 0.793478 +vt 0.967033 0.858696 +vt 0.963370 0.793478 +vt 0.967033 0.793478 +vt 0.838828 0.869565 +vt 0.985348 0.793478 +vt 0.963370 0.782609 +vt 0.963370 0.869565 +vt 0.838828 0.782609 +vt 0.805861 0.793478 +vt 0.813187 0.858696 +vt 0.805861 0.858696 +vt 0.267399 0.847826 +vt 0.260073 0.847826 +vt 0.864469 0.771739 +vt 0.871795 0.771739 +vt 0.864469 0.880435 +vt 0.857143 0.880435 +vt 0.267399 0.826087 +vt 0.260073 0.826087 +vt 0.937729 0.771739 +vt 0.945055 0.771739 +vt 0.996337 0.793478 +vt 0.989011 0.858696 +vt 0.989011 0.793478 +vt 0.937729 0.880435 +vt 0.930403 0.880435 +vt 0.985348 0.858696 +vt 0.289377 0.880435 +vt 0.278388 0.902174 +vt 0.274725 0.880435 +vt 0.311355 0.847826 +vt 0.296703 0.880435 +vt 0.296703 0.847826 +vt 0.289377 0.847826 +vt 0.274725 0.847826 +vt 0.267399 0.880435 +vt 0.267399 0.847826 +vt 0.285714 0.913043 +vt 0.285714 0.902174 +vt 0.293040 0.902174 +vt 0.271062 0.902174 +vt 0.311355 0.880435 +vt 0.300366 0.902174 +vt 0.608059 0.847826 +vt 0.611722 0.826087 +vt 0.611722 0.847826 +vt 0.608059 0.869565 +vt 0.611722 0.869565 +vt 0.608059 0.608696 +vt 0.611722 0.630435 +vt 0.608059 0.630435 +vt 0.611722 0.652174 +vt 0.608059 0.652174 +vt 0.534799 0.695652 +vt 0.531136 0.673913 +vt 0.534799 0.673913 +vt 0.531136 0.717391 +vt 0.534799 0.717391 +vt 0.531136 0.739130 +vt 0.534799 0.739130 +vt 0.534799 0.760870 +vt 0.534799 0.782609 +vt 0.531136 0.760870 +vt 0.534799 0.804348 +vt 0.531136 0.782609 +vt 0.534799 0.826087 +vt 0.531136 0.804348 +vt 0.534799 0.847826 +vt 0.531136 0.826087 +vt 0.534799 0.869565 +vt 0.531136 0.847826 +vt 0.531136 0.630435 +vt 0.534799 0.608696 +vt 0.534799 0.630435 +vt 0.531136 0.652174 +vt 0.534799 0.652174 +vt 0.608059 0.695652 +vt 0.611722 0.717391 +vt 0.608059 0.717391 +vt 0.611722 0.739130 +vt 0.608059 0.739130 +vt 0.608059 0.760870 +vt 0.611722 0.760870 +vt 0.608059 0.782609 +vt 0.611722 0.782609 +vt 0.586081 0.782609 +vt 0.608059 0.793478 +vt 0.586081 0.793478 +vt 0.586081 0.684783 +vt 0.586081 0.695652 +vt 0.223443 0.586957 +vt 0.227106 0.565217 +vt 0.227106 0.586957 +vt 0.227106 0.608696 +vt 0.223443 0.608696 +vt 0.227106 0.630435 +vt 0.223443 0.630435 +vt 0.223443 0.652174 +vt 0.227106 0.652174 +vt 0.223443 0.673913 +vt 0.227106 0.673913 +vt 0.223443 0.695652 +vt 0.227106 0.695652 +vt 0.201465 0.586957 +vt 0.197802 0.565217 +vt 0.201465 0.565217 +vt 0.197802 0.608696 +vt 0.201465 0.608696 +vt 0.197802 0.630435 +vt 0.201465 0.630435 +vt 0.201465 0.652174 +vt 0.201465 0.673913 +vt 0.197802 0.652174 +vt 0.201465 0.695652 +vt 0.197802 0.673913 +vt 0.278388 0.750000 +vt 0.274725 0.728261 +vt 0.274725 0.750000 +vt 0.274725 0.750000 +vt 0.278388 0.728261 +vt 0.278388 0.750000 +vt 0.296703 0.793478 +vt 0.293040 0.750000 +vt 0.296703 0.750000 +vt 0.278388 0.804348 +vt 0.293040 0.804348 +vt 0.274725 0.793478 +vt 0.311355 0.750000 +vt 0.311355 0.793478 +vt 0.282051 0.728261 +vt 0.289377 0.717391 +vt 0.289377 0.728261 +vt 0.307692 0.728261 +vt 0.296703 0.728261 +vt 0.296703 0.793478 +vt 0.293040 0.750000 +vt 0.293040 0.804348 +vt 0.311355 0.793478 +vt 0.296703 0.750000 +vt 0.274725 0.793478 +vt 0.278388 0.804348 +vt 0.282051 0.717391 +vt 0.289377 0.728261 +vt 0.289377 0.717391 +vt 0.282051 0.728261 +vt 0.293040 0.728261 +vt 0.311355 0.750000 +vt 0.300366 0.728261 +vt 0.278388 0.815217 +vt 0.274725 0.804348 +vt 0.278388 0.804348 +vt 0.278388 0.826087 +vt 0.307692 0.836957 +vt 0.278388 0.836957 +vt 0.311355 0.815217 +vt 0.307692 0.804348 +vt 0.311355 0.804348 +vt 0.307692 0.815217 +vt 0.278388 0.847826 +vt 0.307692 0.826087 +vt 0.197802 0.434783 +vt 0.886447 0.673913 +vt 0.864469 0.695652 +vt 0.864469 0.673913 +vt 0.864469 0.706522 +vt 0.886447 0.728261 +vt 0.864469 0.728261 +vt 0.886447 0.706522 +vt 0.930403 0.750000 +vt 0.923077 0.706522 +vt 0.930403 0.706522 +vt 0.864469 0.739130 +vt 0.886447 0.739130 +vt 0.842491 0.630435 +vt 0.915751 0.652174 +vt 0.842491 0.652174 +vt 0.842491 0.673913 +vt 0.967033 0.673913 +vt 0.835165 0.673913 +vt 0.842491 0.673913 +vt 0.915751 0.652174 +vt 0.842491 0.652174 +vt 0.901099 0.586957 +vt 0.915751 0.608696 +vt 0.901099 0.608696 +vt 0.908425 0.739130 +vt 0.908425 0.717391 +vt 0.915751 0.706522 +vt 0.886447 0.750000 +vt 0.886447 0.706522 +vt 0.893773 0.706522 +vt 0.945055 0.630435 +vt 0.967033 0.673913 +vt 0.945055 0.630435 +vt 0.842491 0.706522 +vt 0.849817 0.695652 +vt 0.849817 0.706522 +vt 0.849817 0.684783 +vt 0.846154 0.673913 +vt 0.849817 0.673913 +vt 0.853480 0.684783 +vt 0.853480 0.695652 +vt 0.842491 0.673913 +vt 0.846154 0.684783 +vt 0.842491 0.684783 +vt 0.857143 0.695652 +vt 0.864469 0.706522 +vt 0.857143 0.706522 +vt 0.860806 0.673913 +vt 0.857143 0.684783 +vt 0.857143 0.673913 +vt 0.853480 0.684783 +vt 0.853480 0.695652 +vt 0.860806 0.684783 +vt 0.864469 0.673913 +vt 0.864469 0.684783 +vt 0.864469 0.695652 +vt 0.183150 0.630435 +vt 0.000000 0.815217 +vt 0.003663 0.793478 +vt 0.003663 0.815217 +vt 0.000000 0.728261 +vt 0.003663 0.706522 +vt 0.003663 0.728261 +vt 0.128205 0.728261 +vt 0.003663 0.695652 +vt 0.128205 0.706522 +vt 0.003663 0.739130 +vt 0.128205 0.760870 +vt 0.003663 0.760870 +vt 0.128205 0.826087 +vt 0.003663 0.826087 +vt 0.128205 0.815217 +vt 0.128205 0.739130 +vt 0.003663 0.782609 +vt 0.128205 0.793478 +vt 0.003663 0.760870 +vt 0.128205 0.782609 +vt 0.216117 0.282609 +vt 0.260073 0.304348 +vt 0.216117 0.304348 +vt 0.267399 0.260870 +vt 0.216117 0.260870 +vt 0.805861 0.771739 +vt 0.783883 0.684783 +vt 0.805861 0.684783 +vt 0.216117 0.413043 +vt 0.267399 0.391304 +vt 0.267399 0.413043 +vt 0.274725 0.391304 +vt 0.267399 0.282609 +vt 0.274725 0.282609 +vt 0.216117 0.369565 +vt 0.260073 0.369565 +vt 0.216117 0.391304 +vt 0.201465 0.391304 +vt 0.201465 0.282609 +vt 0.802198 0.673913 +vt 0.787546 0.586957 +vt 0.802198 0.586957 +vt 0.783883 0.771739 +vt 0.780220 0.684783 +vt 0.787546 0.782609 +vt 0.783883 0.804348 +vt 0.805861 0.673913 +vt 0.802198 0.782609 +vt 0.809524 0.684783 +vt 0.802198 0.891304 +vt 0.805861 0.804348 +vt 0.805861 0.891304 +vt 0.809524 0.586957 +vt 0.783883 0.891304 +vt 0.787546 0.804348 +vt 0.787546 0.891304 +vt 0.787546 0.673913 +vt 0.780220 0.586957 +vt 0.871795 0.608696 +vt 0.868132 0.619565 +vt 0.868132 0.608696 +vt 0.857143 0.630435 +vt 0.860806 0.619565 +vt 0.860806 0.630435 +vt 0.871795 0.630435 +vt 0.871795 0.619565 +vt 0.871795 0.586957 +vt 0.868132 0.597826 +vt 0.864469 0.586957 +vt 0.857143 0.586957 +vt 0.860806 0.597826 +vt 0.857143 0.608696 +vt 0.857143 0.619565 +vt 0.842491 0.597826 +vt 0.838828 0.608696 +vt 0.838828 0.586957 +vt 0.853480 0.608696 +vt 0.849817 0.608696 +vt 0.849817 0.597826 +vt 0.842491 0.619565 +vt 0.842491 0.608696 +vt 0.838828 0.630435 +vt 0.838828 0.619565 +vt 0.853480 0.630435 +vt 0.849817 0.619565 +vt 0.853480 0.619565 +vt 0.832911 0.637123 +vt 0.832911 0.667225 +vt 0.822767 0.667225 +vt 0.822767 0.623747 +vt 0.822767 0.593645 +vt 0.832911 0.593645 +vt 0.289377 0.434783 +vt 0.263736 0.413043 +vt 0.267399 0.434783 +vt 0.289377 0.434783 +vt 0.263736 0.413043 +vt 0.300366 0.413043 +vt 0.245421 0.434783 +vt 0.263736 0.413043 +vt 0.260073 0.434783 +vt 0.260073 0.434783 +vt 0.241758 0.413043 +vt 0.245421 0.434783 +vt 0.822767 0.623747 +vt 0.822767 0.593645 +vt 0.832911 0.593645 +vt 0.832911 0.637123 +vt 0.832911 0.667225 +vt 0.822767 0.667225 +vt 0.450549 0.989130 +vt 0.391941 1.000000 +vt 0.391941 0.989130 +vt 0.391941 0.456522 +vt 0.450549 0.521739 +vt 0.391941 0.521739 +vt 0.391941 0.913043 +vt 0.450549 0.913043 +vt 0.369963 0.913043 +vt 0.369963 0.913043 +vt 0.472527 0.913043 +vt 0.531136 0.521739 +vt 0.531136 0.913043 +vt 0.472527 0.521739 +vt 0.450549 0.913043 +vt 0.450549 0.913043 +vt 0.107288 0.837093 +vt 0.113553 0.826359 +vt 0.119818 0.858560 +vt 0.391941 0.923913 +vt 0.450549 0.923913 +vt 0.391941 0.945652 +vt 0.450549 0.967391 +vt 0.391941 0.967391 +vt 0.450549 0.945652 +vt 0.670330 0.652174 +vt 0.626374 0.695652 +vt 0.626374 0.652174 +vt 0.626374 0.739130 +vt 0.670330 0.695652 +vt 0.670330 0.739130 +vt 0.670330 0.608696 +vt 0.626374 0.608696 +vt 0.684982 0.695652 +vt 0.684982 0.652174 +vt 0.611722 0.652174 +vt 0.611722 0.695652 +vt 0.750916 0.586957 +vt 0.772894 0.597826 +vt 0.750916 0.597826 +vt 0.772894 0.630435 +vt 0.750916 0.619565 +vt 0.772894 0.619565 +vt 0.692308 0.586957 +vt 0.728938 0.597826 +vt 0.692308 0.597826 +vt 0.728938 0.630435 +vt 0.692308 0.619565 +vt 0.728938 0.619565 +vt 0.732601 0.586957 +vt 0.732601 0.630435 +vt 0.670330 0.586957 +vt 0.677656 0.597826 +vt 0.670330 0.597826 +vt 0.677656 0.619565 +vt 0.670330 0.630435 +vt 0.670330 0.619565 +vt 0.677656 0.586957 +vt 0.677656 0.630435 +vt 0.688645 0.717391 +vt 0.699634 0.739130 +vt 0.684982 0.739130 +vt 0.688645 0.717391 +vt 0.699634 0.739130 +vt 0.684982 0.739130 +vt 0.688645 0.684783 +vt 0.695971 0.717391 +vt 0.688645 0.684783 +vt 0.695971 0.717391 +vt 0.695971 0.684783 +vt 0.692308 0.652174 +vt 0.695971 0.684783 +vt 0.692308 0.652174 +vt 0.304029 0.195652 +vt 0.274725 0.217391 +vt 0.274725 0.195652 +vt 0.304029 0.217391 +vt 0.285714 0.250000 +vt 0.278388 0.282609 +vt 0.282051 0.326087 +vt 0.274725 0.282609 +vt 0.534799 0.260870 +vt 0.652015 0.250000 +vt 0.652015 0.260870 +vt 0.534799 0.228261 +vt 0.652015 0.228261 +vt 0.531136 0.228261 +vt 0.534799 0.250000 +vt 0.531136 0.250000 +vt 0.652015 0.217391 +vt 0.534799 0.217391 +vt 0.534799 0.206522 +vt 0.652015 0.184783 +vt 0.652015 0.206522 +vt 0.534799 0.217391 +vt 0.652015 0.217391 +vt 0.652015 0.173913 +vt 0.534799 0.184783 +vt 0.534799 0.173913 +vt 0.531136 0.184783 +vt 0.531136 0.206522 +vt 0.300366 0.282609 +vt 0.296703 0.326087 +vt 0.293040 0.315217 +vt 0.282051 0.260870 +vt 0.282051 0.282609 +vt 0.296703 0.260870 +vt 0.300366 0.260870 +vt 0.296703 0.282609 +vt 0.285714 0.315217 +vt 0.366300 0.423913 +vt 0.369963 0.467391 +vt 0.366300 0.467391 +vt 0.333333 0.478261 +vt 0.336996 0.510870 +vt 0.333333 0.500000 +vt 0.369963 0.500000 +vt 0.366300 0.510870 +vt 0.336996 0.967391 +vt 0.333333 0.934783 +vt 0.369963 0.956522 +vt 0.369963 0.934783 +vt 0.304029 0.445652 +vt 0.289377 0.434783 +vt 0.304029 0.434783 +vt 0.289377 0.706522 +vt 0.304029 0.717391 +vt 0.289377 0.717391 +vt 0.285714 0.597826 +vt 0.289377 0.554348 +vt 0.289377 0.597826 +vt 0.307692 0.554348 +vt 0.304029 0.597826 +vt 0.304029 0.554348 +vt 0.307692 0.510870 +vt 0.307692 0.445652 +vt 0.289377 0.445652 +vt 0.285714 0.510870 +vt 0.285714 0.445652 +vt 0.304029 0.706522 +vt 0.307692 0.641304 +vt 0.307692 0.706522 +vt 0.285714 0.641304 +vt 0.285714 0.706522 +vt 0.307692 0.630435 +vt 0.304029 0.641304 +vt 0.285714 0.630435 +vt 0.289377 0.641304 +vt 0.307692 0.521739 +vt 0.304029 0.510870 +vt 0.285714 0.521739 +vt 0.289377 0.510870 +vt 0.915751 0.652174 +vt 0.842491 0.630435 +vt 0.842491 0.652174 +vt 0.842491 0.673913 +vt 0.967033 0.673913 +vt 0.835165 0.673913 +vt 0.842491 0.673913 +vt 0.915751 0.652174 +vt 0.967033 0.673913 +vt 0.915751 0.608696 +vt 0.901099 0.586957 +vt 0.901099 0.608696 +vt 0.945055 0.630435 +vt 0.945055 0.630435 +vt 0.864469 0.695652 +vt 0.886447 0.673913 +vt 0.864469 0.673913 +vt 0.886447 0.728261 +vt 0.864469 0.706522 +vt 0.864469 0.728261 +vt 0.886447 0.706522 +vt 0.886447 0.695652 +vt 0.923077 0.706522 +vt 0.930403 0.750000 +vt 0.930403 0.706522 +vt 0.864469 0.739130 +vt 0.886447 0.739130 +vt 0.915751 0.750000 +vt 0.923077 0.750000 +vt 0.915751 0.706522 +vt 0.893773 0.750000 +vt 0.901099 0.739130 +vt 0.893773 0.706522 +vt 0.058608 0.054348 +vt 0.058608 0.097826 +vt 0.058608 0.141304 +vt 0.058608 0.250000 +vt 0.058608 0.032609 +vt 0.003683 0.301335 +vt 0.001015 0.271797 +vt 0.001015 0.293420 +vt 0.000039 0.282609 +vt 0.003683 0.263883 +vt 0.010969 0.263883 +vt 0.014613 0.282609 +vt 0.013637 0.293420 +vt 0.010969 0.301335 +vt 0.315018 0.967391 +vt 0.307692 0.467391 +vt 0.329670 0.695652 +vt 0.333333 0.478261 +vt 0.329670 0.967391 +vt 0.333333 0.423913 +vt 0.329670 0.739130 +vt 0.366300 0.739130 +vt 0.366300 0.695652 +vt 0.333333 0.467391 +vt 0.622711 0.836957 +vt 0.622711 0.880435 +vt 0.622711 0.989130 +vt 0.622711 0.771739 +vt 0.622711 0.793478 +vt 0.662997 0.779660 +vt 0.659341 0.782566 +vt 0.655685 0.779660 +vt 0.652029 0.760870 +vt 0.653009 0.750021 +vt 0.655685 0.742080 +vt 0.662997 0.742080 +vt 0.665673 0.750021 +vt 0.666652 0.760870 +vt 0.183150 0.260870 +vt 0.234432 0.456522 +vt 0.241758 0.543478 +vt 0.234432 0.565217 +vt 0.043956 0.467391 +vt 0.043956 0.478261 +vt 0.728973 0.733124 +vt 0.723636 0.717287 +vt 0.721682 0.695652 +vt 0.728973 0.658180 +vt 0.736264 0.652383 +vt 0.743554 0.658180 +vt 0.750845 0.695652 +vt 0.748892 0.717287 +vt 0.743554 0.733124 +vt 0.038405 0.830860 +vt 0.042385 0.842672 +vt 0.051093 0.858808 +vt 0.048664 0.885701 +vt 0.042030 0.905388 +vt 0.023904 0.905388 +vt 0.017270 0.885701 +vt 0.014841 0.858808 +vt 0.023549 0.842672 +vt 0.027529 0.830860 +vt 0.032967 0.826536 +vt 0.023641 0.929891 +vt 0.027582 0.918194 +vt 0.032967 0.913913 +vt 0.038352 0.918194 +vt 0.042293 0.929891 +vt 0.050916 0.945870 +vt 0.048511 0.972500 +vt 0.041941 0.991995 +vt 0.023993 0.991995 +vt 0.017423 0.972500 +vt 0.015018 0.945870 +vt 0.675853 0.799833 +vt 0.671852 0.787959 +vt 0.670387 0.771739 +vt 0.671852 0.755520 +vt 0.675853 0.743646 +vt 0.681319 0.739300 +vt 0.686785 0.743646 +vt 0.692251 0.771739 +vt 0.686785 0.799833 +vt 0.923077 0.858696 +vt 0.901099 0.782609 +vt 0.267399 0.934783 +vt 0.813187 0.793478 +vt 0.857143 0.771739 +vt 0.871795 0.880435 +vt 0.930403 0.771739 +vt 0.996337 0.858696 +vt 0.945055 0.880435 +vt 0.278388 0.913043 +vt 0.296703 0.902174 +vt 0.274725 0.902174 +vt 0.307692 0.902174 +vt 0.608059 0.826087 +vt 0.611722 0.608696 +vt 0.531136 0.695652 +vt 0.531136 0.869565 +vt 0.531136 0.608696 +vt 0.611722 0.695652 +vt 0.608059 0.684783 +vt 0.223443 0.565217 +vt 0.197802 0.586957 +vt 0.197802 0.695652 +vt 0.278388 0.728261 +vt 0.274725 0.728261 +vt 0.282051 0.717391 +vt 0.300366 0.728261 +vt 0.293040 0.728261 +vt 0.296703 0.728261 +vt 0.307692 0.728261 +vt 0.274725 0.815217 +vt 0.307692 0.847826 +vt 0.043956 0.434783 +vt 0.886447 0.695652 +vt 0.923077 0.750000 +vt 0.915751 0.630435 +vt 0.835165 0.652174 +vt 0.915751 0.586957 +vt 0.915751 0.750000 +vt 0.901099 0.717391 +vt 0.901099 0.739130 +vt 0.893773 0.750000 +vt 0.915751 0.608696 +vt 0.842491 0.695652 +vt 0.043956 0.586957 +vt 0.197802 0.586957 +vt 0.043956 0.543478 +vt -0.000000 0.793478 +vt 0.000000 0.706522 +vt 0.128205 0.695652 +vt 0.128205 0.760870 +vt 0.208791 0.282609 +vt 0.208791 0.391304 +vt 0.772894 0.771739 +vt 0.783883 0.673913 +vt 0.816850 0.771739 +vt 0.802198 0.804348 +vt 0.868132 0.630435 +vt 0.864469 0.597826 +vt 0.860806 0.608696 +vt 0.846154 0.586957 +vt 0.846154 0.597826 +vt 0.853480 0.586957 +vt 0.842491 0.630435 +vt 0.849817 0.630435 +vt 0.820666 0.652174 +vt 0.822767 0.637123 +vt 0.827839 0.630889 +vt 0.835012 0.652174 +vt 0.827839 0.673459 +vt 0.835012 0.608696 +vt 0.832911 0.623747 +vt 0.827839 0.629981 +vt 0.820666 0.608696 +vt 0.827839 0.587410 +vt 0.300366 0.413043 +vt 0.267399 0.434783 +vt 0.241758 0.413043 +vt 0.835012 0.608696 +vt 0.832911 0.623747 +vt 0.827839 0.629981 +vt 0.820666 0.608696 +vt 0.827839 0.587410 +vt 0.820666 0.652174 +vt 0.822767 0.637123 +vt 0.827839 0.630889 +vt 0.835012 0.652174 +vt 0.827839 0.673459 +vt 0.450549 1.000000 +vt 0.450549 0.456522 +vt 0.369963 0.913043 +vt 0.369963 0.913043 +vt 0.369963 0.521739 +vt 0.369963 0.913043 +vt 0.450549 0.913043 +vt 0.450549 0.913043 +vt 0.117170 0.866417 +vt 0.107288 0.858560 +vt 0.113553 0.869293 +vt 0.109936 0.866417 +vt 0.106319 0.847826 +vt 0.109936 0.829235 +vt 0.117170 0.829235 +vt 0.119818 0.837092 +vt 0.120788 0.847826 +vt 0.772894 0.586957 +vt 0.750916 0.630435 +vt 0.728938 0.586957 +vt 0.692308 0.630435 +vt 0.747253 0.586957 +vt 0.747253 0.630435 +vt 0.688645 0.586957 +vt 0.688645 0.630435 +vt 0.296703 0.260870 +vt 0.293040 0.250000 +vt 0.282051 0.260870 +vt 0.304029 0.282609 +vt 0.278388 0.260870 +vt 0.369963 0.423913 +vt 0.369963 0.478261 +vt 0.333333 0.956522 +vt 0.366300 0.967391 +vt 0.285714 0.554348 +vt 0.307692 0.597826 +vt 0.307692 0.608696 +vt 0.285714 0.608696 +vt 0.307692 0.543478 +vt 0.285714 0.543478 +vt 0.915751 0.630435 +vt 0.835165 0.652174 +vt 0.842491 0.652174 +vt 0.915751 0.586957 +vt 0.915751 0.608696 +vt 0.908425 0.717391 +vt 0.908425 0.739130 +vt 0.901099 0.717391 +vt 0.886447 0.706522 +vt 0.886447 0.750000 +vt 0.274725 0.108696 +vt 0.274725 0.130435 +vt 0.274725 0.086957 +vt 0.274725 0.043478 +vt 0.274725 0.065217 +vt 0.274725 0.021739 +vt 0.274725 0.000000 +vt 0.274725 0.239130 +vt 0.274725 0.260870 +vt 0.274725 0.217391 +vt 0.274725 0.195652 +vt 0.274725 0.173913 +vt 0.274725 0.152174 +vt -0.000000 0.195652 +vt 0.000000 0.086957 +vt -0.000000 0.130435 +vt 0.000000 0.021739 +vt 0.000000 0.217391 +vt -0.000000 0.108696 +vt 0.000000 0.152174 +vt -0.000000 0.043478 +vt -0.000000 0.239130 +vt 0.000000 0.173913 +vt 0.000000 0.065217 +vt -0.000000 -0.000000 +vt 0.274725 0.021739 +vt 0.296703 0.000000 +vt 0.304029 0.021739 +vt 0.560440 0.521739 +vt 0.604396 0.434783 +vt 0.531136 0.434783 +vt 0.560440 0.543478 +vt 0.604396 0.586957 +vt 0.560440 0.586957 +vt 0.560440 0.521739 +vt 0.604396 0.434783 +vt 0.604396 0.521739 +vt 0.619048 0.500000 +vt 0.622711 0.413043 +vt 0.604396 0.152174 +vt 0.531136 0.173913 +vt 0.531136 0.152174 +vt 0.604396 0.543478 +vt 0.604396 0.086957 +vt 0.531136 0.108696 +vt 0.531136 0.086957 +vt 0.560440 0.608696 +vt 0.652015 0.858696 +vt 0.652015 0.902174 +vt 0.652015 0.793478 +vt 0.652015 0.989130 +vt 0.652015 0.923913 +vt 0.652015 0.815217 +vt 0.652015 0.750000 +vt 0.652015 0.945652 +vt 0.652015 0.836957 +vt 0.652015 0.880435 +vt 0.652015 0.771739 +vt 0.652015 0.967391 +vt 0.611722 0.739130 +vt 0.611722 0.934783 +vt 0.611722 0.826087 +vt 0.611722 0.869565 +vt 0.611722 0.760870 +vt 0.611722 0.956522 +vt 0.611722 0.847826 +vt 0.611722 0.891304 +vt 0.611722 0.782609 +vt 0.611722 0.978261 +vt 0.611722 0.913043 +vt 0.611722 0.804348 +vt 0.263736 0.804348 +vt 0.205128 0.826087 +vt 0.205128 0.804348 +vt 0.263736 0.695652 +vt 0.205128 0.717391 +vt 0.205128 0.695652 +vt 0.263736 0.717391 +vt 0.205128 0.739130 +vt 0.263736 0.760870 +vt 0.205128 0.782609 +vt 0.205128 0.760870 +vt 0.263736 0.739130 +vt 0.263736 0.782609 +vt 0.706960 0.760870 +vt 0.721612 0.782609 +vt 0.706960 0.782609 +vt 0.706960 0.673913 +vt 0.721612 0.652174 +vt 0.721612 0.673913 +vt 0.706960 0.695652 +vt 0.721612 0.695652 +vt 0.706960 0.717391 +vt 0.721612 0.739130 +vt 0.706960 0.739130 +vt 0.721612 0.717391 +vt 0.721612 0.760870 +vt -0.000000 0.913043 +vt 0.014652 0.934783 +vt -0.000000 0.934783 +vt -0.000000 0.826087 +vt 0.014652 0.847826 +vt -0.000000 0.847826 +vt 0.014652 0.956522 +vt -0.000000 0.956522 +vt 0.014652 0.869565 +vt -0.000000 0.869565 +vt 0.014652 0.891304 +vt -0.000000 0.891304 +vt 0.014652 0.913043 +vt 0.670330 0.934783 +vt 0.666667 0.956522 +vt 0.666667 0.934783 +vt 0.670330 0.826087 +vt 0.666667 0.847826 +vt 0.666667 0.826087 +vt 0.670330 0.869565 +vt 0.666667 0.891304 +vt 0.666667 0.869565 +vt 0.670330 0.760870 +vt 0.666667 0.782609 +vt 0.666667 0.760870 +vt 0.670330 0.956522 +vt 0.666667 0.978261 +vt 0.670330 0.847826 +vt 0.670330 0.891304 +vt 0.666667 0.913043 +vt 0.670330 0.782609 +vt 0.666667 0.804348 +vt 0.670330 0.978261 +vt 0.666667 1.000000 +vt 0.670330 0.913043 +vt 0.670330 0.804348 +vt 0.670330 0.739130 +vt 0.666667 0.739130 +vt 0.128205 0.739130 +vt 0.205128 0.760870 +vt 0.128205 0.760870 +vt 0.128205 0.782609 +vt 0.205128 0.804348 +vt 0.128205 0.804348 +vt 0.128205 0.717391 +vt 0.205128 0.739130 +vt 0.205128 0.782609 +vt 0.205128 0.826087 +vt 0.128205 0.826087 +vt 0.128205 0.695652 +vt 0.205128 0.717391 +vt 0.571429 0.869565 +vt 0.571429 0.847826 +vt 0.578755 0.804348 +vt 0.578755 0.673913 +vt 0.571429 0.630435 +vt 0.571429 0.608696 +vt 0.571429 0.826087 +vt 0.571429 0.652174 +vt 0.608059 0.673913 +vt 0.611722 0.695652 +vt 0.608059 0.695652 +vt 0.608059 0.804348 +vt 0.611722 0.782609 +vt 0.611722 0.804348 +vt 0.611722 0.673913 +vt 0.901099 0.695652 +vt 0.908425 0.695652 +vt 0.908425 0.782609 +vt 0.901099 0.760870 +vt 0.908425 0.760870 +vt 0.901099 0.673913 +vt 0.908425 0.673913 +vt 0.945055 0.608696 +vt 0.945055 0.586957 +vt 0.967033 0.608696 +vt 0.619048 0.608696 +vt 0.663004 0.586957 +vt 0.663004 0.608696 +vt 0.604396 0.108696 +vt 0.619048 0.086957 +vt 0.619048 0.108696 +vt 0.619048 0.152174 +vt 0.619048 0.543478 +vt 0.619048 0.173913 +vt 0.604396 0.173913 +vt 0.619048 0.500000 +vt 0.604396 0.608696 +vt 0.619048 0.586957 +vt 0.663004 0.521739 +vt 0.677656 0.565217 +vt 0.663004 0.565217 +vt 0.619048 0.521739 +vt 0.663004 0.543478 +vt 0.619048 0.413043 +vt 0.663004 0.456522 +vt 0.648352 0.152174 +vt 0.648352 0.086957 +vt 0.648352 0.108696 +vt 0.648352 0.173913 +vt 0.663004 0.456522 +vt 0.648352 0.369565 +vt 0.677656 0.586957 +vt 0.663004 0.586957 +vt 0.677656 0.500000 +vt 0.677656 0.521739 +vt 0.706960 0.565217 +vt 0.706960 0.586957 +vt 0.706960 0.500000 +vt 0.706960 0.521739 +vt 0.956044 0.565217 +vt 0.956044 0.586957 +vt 0.956044 0.521739 +vt 0.699634 0.152174 +vt 0.699634 0.086957 +vt 0.699634 0.108696 +vt 0.699634 0.173913 +vt 0.684982 0.021739 +vt 0.736264 0.065217 +vt 0.684982 0.065217 +vt 0.684982 -0.000000 +vt 0.736264 0.021739 +vt 0.684982 0.086957 +vt 0.736264 0.086957 +vt 0.794872 0.065217 +vt 0.794872 0.000000 +vt 0.794872 0.021739 +vt 0.794872 0.086957 +vt 0.934066 0.065217 +vt 0.934066 -0.000000 +vt 0.934066 0.021739 +vt 0.934066 0.086957 +vt 0.963370 0.065217 +vt 0.963370 0.021739 +vt 0.963370 0.086957 +vt 0.992674 0.065217 +vt 0.978022 0.108696 +vt 0.978022 0.065217 +vt 1.000000 0.097826 +vt 0.992674 0.108696 +vt 0.970696 0.097826 +vt 0.970696 0.076087 +vt 0.978022 0.456522 +vt 1.000000 0.108696 +vt 0.992674 0.456522 +vt 0.970696 0.456522 +vt 0.970696 0.108696 +vt 0.677656 0.478261 +vt 0.736264 0.260870 +vt 0.684982 0.217391 +vt 0.648352 0.369565 +vt 0.970696 0.467391 +vt 0.978022 0.521739 +vt 0.970696 0.510870 +vt 0.992674 0.521739 +vt 1.000000 0.467391 +vt 1.000000 0.510870 +vt 0.956044 0.500000 +vt 0.736264 0.260870 +vt 0.677656 0.478261 +vt 0.794872 0.239130 +vt 0.970696 0.108696 +vt 0.956044 0.500000 +vt 0.970696 0.456522 +vt 0.706960 0.500000 +vt 0.794872 0.239130 +vt 0.934066 0.086957 +vt 0.684982 0.217391 +vt 0.820513 0.739130 +vt 0.824176 0.750000 +vt 0.820513 0.750000 +vt 0.820513 0.728261 +vt 0.824176 0.739130 +vt 0.835165 0.586957 +vt 0.835165 0.608696 +vt 0.820513 0.717391 +vt 0.824176 0.728261 +vt 0.820513 0.706522 +vt 0.824176 0.717391 +vt 0.820513 0.695652 +vt 0.824176 0.706522 +vt 0.835165 0.619565 +vt 0.820513 0.684783 +vt 0.824176 0.695652 +vt 0.835165 0.630435 +vt 0.820513 0.673913 +vt 0.824176 0.684783 +vt 0.824176 0.760870 +vt 0.820513 0.760870 +vt 0.820513 0.739130 +vt 0.816850 0.717391 +vt 0.820513 0.717391 +vt 0.820513 0.760870 +vt 0.816850 0.739130 +vt 0.820513 0.673913 +vt 0.816850 0.652174 +vt 0.820513 0.652174 +vt 0.816850 0.630435 +vt 0.820513 0.630435 +vt 0.820513 0.608696 +vt 0.816850 0.586957 +vt 0.820513 0.586957 +vt 0.816850 0.608696 +vt 0.820513 0.695652 +vt 0.816850 0.673913 +vt 0.816850 0.695652 +vt 0.820513 0.717391 +vt 0.816850 0.695652 +vt 0.820513 0.695652 +vt 0.816850 0.673913 +vt 0.820513 0.673913 +vt 0.820513 0.630435 +vt 0.816850 0.608696 +vt 0.820513 0.608696 +vt 0.816850 0.586957 +vt 0.820513 0.586957 +vt 0.820513 0.652174 +vt 0.816850 0.630435 +vt 0.816850 0.652174 +vt 0.820513 0.760870 +vt 0.816850 0.739130 +vt 0.820513 0.739130 +vt 0.816850 0.717391 +vt 0.106227 0.836957 +vt 0.069597 0.826087 +vt 0.106227 0.826087 +vt 0.106227 0.934783 +vt 0.069597 0.923913 +vt 0.106227 0.923913 +vt 0.106227 0.880435 +vt 0.069597 0.869565 +vt 0.106227 0.869565 +vt 0.106227 0.902174 +vt 0.069597 0.891304 +vt 0.106227 0.891304 +vt 0.106227 0.847826 +vt 0.069597 0.836957 +vt 0.106227 0.945652 +vt 0.069597 0.934783 +vt 0.069597 0.880435 +vt 0.106227 0.913043 +vt 0.069597 0.902174 +vt 0.106227 0.858696 +vt 0.069597 0.847826 +vt 0.106227 0.956522 +vt 0.069597 0.945652 +vt 0.069597 0.913043 +vt 0.069597 0.858696 +vt 0.058608 0.945652 +vt 0.058608 0.934783 +vt 0.058608 0.891304 +vt 0.058608 0.880435 +vt 0.058608 0.913043 +vt 0.058608 0.902174 +vt 0.058608 0.858696 +vt 0.058608 0.847826 +vt 0.069597 0.956522 +vt 0.058608 0.923913 +vt 0.058608 0.836957 +vt 0.058608 0.826087 +vt 0.058608 0.869565 +vt 0.054945 0.945652 +vt 0.054945 0.934783 +vt 0.054945 0.891304 +vt 0.054945 0.880435 +vt 0.054945 0.913043 +vt 0.054945 0.902174 +vt 0.054945 0.847826 +vt 0.058608 0.956522 +vt 0.054945 0.869565 +vt 0.054945 0.858696 +vt 0.054945 0.836957 +vt 0.054945 0.826087 +vt 0.054945 0.923913 +vt 0.053164 0.826561 +vt 0.054593 0.829009 +vt 0.053164 0.836354 +vt 0.750916 0.652174 +vt 0.692308 0.652174 +vt 0.688645 0.652174 +vt 0.670330 0.652174 +vt 0.732601 0.652174 +vt 0.747253 0.652174 +vt 0.699634 0.717391 +vt 0.706960 0.739130 +vt 0.706960 0.717391 +vt 0.706960 0.739130 +vt 0.699634 0.717391 +vt 0.706960 0.684783 +vt 0.699634 0.684783 +vt 0.706960 0.717391 +vt 0.706960 0.652174 +vt 0.699634 0.652174 +vt 0.699634 0.652174 +vt 0.699634 0.684783 +vt 0.304029 0.086957 +vt 0.274725 0.086957 +vt 0.304029 0.043478 +vt 0.531136 0.065217 +vt 0.406593 0.086957 +vt 0.406593 0.065217 +vt 0.318681 0.021739 +vt 0.369963 0.065217 +vt 0.318681 0.065217 +vt 0.369963 0.021739 +vt 0.355311 0.250000 +vt 0.523810 0.260870 +vt 0.355311 0.260870 +vt 0.406593 0.021739 +vt 0.406593 0.206522 +vt 0.523810 0.206522 +vt 0.523810 0.250000 +vt 0.523810 0.293478 +vt 0.523810 0.336957 +vt 0.406593 0.336957 +vt 0.355311 0.184783 +vt 0.406593 0.184783 +vt 0.355311 0.336957 +vt 0.406593 0.358696 +vt 0.355311 0.358696 +vt 0.369963 0.000000 +vt 0.369963 0.086957 +vt 0.355311 0.282609 +vt 0.355311 0.293478 +vt 0.523810 0.282609 +vt 0.531136 -0.000000 +vt 0.531136 0.021739 +vt 0.406593 -0.000000 +vt 0.311355 0.086957 +vt 0.523810 0.184783 +vt 0.406593 0.456522 +vt 0.369963 0.423913 +vt 0.318681 0.184783 +vt 0.304029 0.141304 +vt 0.274725 0.043478 +vt 0.311355 0.423913 +vt 0.311355 0.119565 +vt 0.369963 0.119565 +vt 0.304029 0.402174 +vt 0.318681 0.358696 +vt 0.945055 0.608696 +vt 0.967033 0.608696 +vt 0.945055 0.586957 +vt 0.901099 0.695652 +vt 0.908425 0.695652 +vt 0.901099 0.760870 +vt 0.908425 0.782609 +vt 0.908425 0.760870 +vt 0.901099 0.673913 +vt 0.908425 0.673913 +vt -0.000000 0.206522 +vt 0.000000 0.097826 +vt -0.000000 0.141304 +vt 0.000000 0.032609 +vt 0.000000 0.228261 +vt -0.000000 0.119565 +vt 0.000000 0.163043 +vt -0.000000 0.054348 +vt -0.000000 0.250000 +vt 0.000000 0.184783 +vt 0.000000 0.076087 +vt -0.000000 0.010870 +vt 0.282051 0.000000 +vt 0.604396 0.521739 +vt 0.531136 0.434783 +vt 0.652015 0.847826 +vt 0.652015 0.891304 +vt 0.652015 0.782609 +vt 0.652015 0.978261 +vt 0.652015 0.913043 +vt 0.652015 0.804348 +vt 0.652015 0.739130 +vt 0.652015 0.934783 +vt 0.652015 0.826087 +vt 0.652015 0.869565 +vt 0.652015 0.760870 +vt 0.652015 0.956522 +vt 0.611722 1.000000 +vt 0.263736 0.826087 +vt 0.706960 0.652174 +vt 0.014652 0.826087 +vt 0.670330 1.000000 +vt 0.205128 0.695652 +vt 0.608059 0.782609 +vt 0.901099 0.782609 +vt 0.967033 0.586957 +vt 0.663004 0.521739 +vt 0.663004 0.500000 +vt 0.736264 -0.000000 +vt 0.963370 -0.000000 +vt 1.000000 0.076087 +vt 1.000000 0.456522 +vt 0.963370 0.086957 +vt 0.824176 0.673913 +vt 0.816850 0.760870 +vt 0.816850 0.760870 +vt 0.054945 0.956522 +vt 0.052339 0.835698 +vt 0.051735 0.829009 +vt 0.051735 0.833906 +vt 0.051514 0.831457 +vt 0.052339 0.827217 +vt 0.053989 0.827217 +vt 0.054814 0.831457 +vt 0.054593 0.833906 +vt 0.053989 0.835698 +vt 0.772894 0.652174 +vt 0.728938 0.652174 +vt 0.677656 0.652174 +vt 0.706960 0.684783 +vt 0.706960 0.652174 +vt 0.531136 0.086957 +vt 0.355311 0.206522 +vt 0.311355 -0.000000 +vt 0.531136 0.119565 +vt 0.523810 0.358696 +vt 0.531136 0.423913 +vt 0.531136 0.456522 +vt 0.967033 0.586957 +vt 0.901099 0.782609 vn 0.0000 0.0000 1.0000 vn 0.0000 0.0000 -1.0000 -vn 0.0000 1.0000 0.0000 vn -1.0000 0.0000 0.0000 vn 0.0000 -1.0000 0.0000 vn 1.0000 0.0000 0.0000 @@ -947,18 +2453,13 @@ vn -0.7071 -0.7071 0.0000 vn 0.7071 -0.7071 0.0000 vn 0.0000 -0.7071 -0.7071 vn 0.0000 -0.7071 0.7071 -vn 0.2588 -0.9659 0.0000 -vn -0.2588 -0.9659 0.0000 -vn -0.9659 -0.2588 -0.0000 -vn 0.9659 -0.2588 0.0000 -vn 0.9872 0.1592 0.0000 -vn -0.9231 0.3846 0.0000 -vn -0.9249 -0.3802 0.0000 -vn -0.9872 0.1592 0.0000 -vn 0.9249 0.3802 0.0000 -vn 0.9231 -0.3846 0.0000 -vn 0.0000 -0.0212 0.9998 -vn 0.0000 0.0212 -0.9998 +vn 0.0000 1.0000 0.0000 +vn -0.9285 0.3714 0.0000 +vn -0.9301 -0.3673 0.0000 +vn 0.9301 0.3673 0.0000 +vn 0.9285 -0.3714 0.0000 +vn 0.0000 -0.0203 0.9998 +vn 0.0000 0.0203 -0.9998 vn 0.9701 0.2425 0.0000 vn 0.0000 0.4472 -0.8944 vn 0.0000 0.4472 0.8944 @@ -967,15 +2468,7 @@ vn -0.5000 -0.8660 0.0000 vn 0.5000 -0.8660 0.0000 vn 0.0000 -0.4472 0.8944 vn 0.0000 -0.4472 -0.8944 -vn 0.4472 -0.8944 0.0000 -vn 0.4472 0.8944 0.0000 -vn -0.4472 -0.8944 0.0000 -vn -0.4472 0.8944 0.0000 -vn 0.9701 0.0000 -0.2425 -vn 0.8321 0.0000 -0.5547 vn 0.7071 0.0000 -0.7071 -vn -0.9701 0.0000 -0.2425 -vn -0.8321 0.0000 -0.5547 vn -0.7071 0.0000 -0.7071 vn 0.7071 0.7071 0.0000 vn -0.7071 0.7071 0.0000 @@ -990,24 +2483,16 @@ vn 0.8660 -0.5000 0.0000 vn -0.8660 -0.5000 -0.0000 vn -0.8660 0.5000 0.0000 vn -0.5000 0.8660 0.0000 -vn 0.0000 0.9239 0.3827 -vn 0.0000 -0.9239 0.3827 -vn 0.0000 -0.9894 0.1452 -vn 0.1602 0.9871 0.0000 -vn -0.3827 0.9239 0.0000 -vn 0.9522 0.3054 0.0000 -vn -0.1602 0.9871 0.0000 -vn -0.9522 0.3054 0.0000 -vn -0.9732 0.2298 0.0000 +vn -0.3827 -0.9239 0.0000 +vn -0.9239 -0.3827 0.0000 +vn -0.9637 0.2669 0.0000 +vn -0.8575 0.5145 0.0000 vn 0.3827 0.9239 0.0000 +vn -0.3827 0.9239 0.0000 vn 0.9239 -0.3827 0.0000 vn 0.9637 0.2669 0.0000 -vn 0.1222 0.9925 0.0000 -vn -0.1222 0.9925 0.0000 -vn -0.9637 0.2669 0.0000 -vn -0.9239 -0.3827 0.0000 -vn -0.3827 -0.9239 0.0000 vn 0.3827 -0.9239 0.0000 +vn 0.8575 0.5145 0.0000 vn -0.9523 0.3051 0.0000 vn -0.9414 -0.3297 0.0706 vn -0.8629 -0.5054 0.0000 @@ -1022,22 +2507,33 @@ vn 0.8629 -0.5054 0.0000 vn 0.3595 0.9099 -0.2070 vn -0.9659 0.2588 0.0000 vn 0.9659 0.2588 0.0000 +vn 0.9988 -0.0483 0.0000 +vn -0.9988 -0.0483 0.0000 +vn 0.9864 0.1644 0.0000 vn -0.9915 0.1299 0.0000 vn -0.7768 0.6297 0.0000 vn 0.9915 0.1299 0.0000 vn -0.8911 -0.4538 0.0000 vn 0.8911 -0.4538 0.0000 -vn 0.0000 -0.7689 -0.6394 +vn -0.9864 0.1644 0.0000 +vn 0.0447 -0.7380 -0.6733 vn 0.2869 -0.6590 -0.6953 vn 0.3536 -0.6124 -0.7071 -vn -0.0447 -0.7380 -0.6733 +vn -0.0000 -0.7689 -0.6394 vn -0.2869 -0.6590 -0.6953 -vn 0.0407 -0.7592 -0.6496 -vn 0.3057 -0.7078 -0.6369 -vn 0.4000 -0.6928 -0.6000 -vn 0.0000 -0.8000 -0.6000 +vn -0.0000 -0.8000 -0.6000 +vn 0.3535 -0.6124 -0.7071 +vn -0.3057 -0.7078 -0.6369 +vn -0.0407 -0.7592 -0.6496 vn 0.7768 0.6297 0.0000 -vn -0.4192 0.9051 0.0712 +vn 0.8507 0.5257 0.0000 +vn 0.8507 -0.5257 0.0000 +vn 0.2298 -0.9732 0.0000 +vn 0.2298 0.9732 0.0000 +vn 0.9701 0.0000 -0.2425 +vn 0.9145 0.0000 -0.4046 +vn 0.8321 0.0000 -0.5547 +vn -0.3952 0.8715 -0.2905 vn -0.9552 0.2954 0.0181 vn -0.3954 -0.8912 0.2222 vn -0.3568 -0.8355 0.4178 @@ -1047,8 +2543,10 @@ vn 0.9129 -0.3651 0.1826 vn 0.9232 0.3569 -0.1429 vn -0.8994 0.4225 -0.1123 vn -0.3688 0.8568 -0.3605 -vn 0.4192 0.9051 0.0712 +vn 0.3897 0.8237 0.4119 vn -0.3607 0.8769 0.3178 +vn -0.3897 0.8237 0.4119 +vn 0.3952 0.8715 -0.2905 vn 0.9552 0.2954 0.0181 vn 0.3163 -0.6961 0.6445 vn -0.9268 -0.3007 0.2251 @@ -1064,11 +2562,13 @@ vn 0.3711 0.9219 0.1112 vn -0.3416 0.8756 -0.3416 vn -0.8727 0.4330 -0.2257 vn 0.3416 0.8756 -0.3416 -vn 0.3335 -0.8970 0.2902 +vn 0.1967 -0.5699 0.7978 vn -0.8515 -0.4669 0.2386 -vn -0.3335 -0.8970 0.2902 +vn -0.1967 -0.5699 0.7978 vn 0.8515 -0.4669 0.2386 +vn -0.3487 -0.9012 -0.2575 vn 0.4002 -0.9135 -0.0737 +vn 0.3487 -0.9012 -0.2575 vn -0.4002 -0.9135 -0.0737 vn 0.9405 -0.3390 -0.0241 vn 0.3851 -0.8955 0.2233 @@ -1096,7 +2596,7 @@ vn -0.9808 0.1951 0.0000 vn 0.9808 0.1951 0.0000 vn 0.0000 0.7071 0.7071 vn -0.0000 -0.9967 0.0814 -vn -0.9967 -0.0000 0.0814 +vn -0.9967 0.0000 0.0814 vn 0.8632 0.4983 0.0814 vn 0.0000 0.9967 0.0814 vn 0.4983 -0.8632 0.0814 @@ -1111,13 +2611,13 @@ vn -0.4494 -0.7784 0.4382 vn -0.7784 -0.4494 0.4382 vn 0.0000 0.8989 0.4382 vn 0.4494 0.7784 0.4382 +vn -0.7784 0.4494 0.4382 vn -0.4494 0.7784 0.4382 vn 0.8989 -0.0000 0.4382 vn 0.7784 -0.4494 0.4382 -vn -0.8989 -0.0000 0.4382 -vn -0.7784 0.4494 0.4382 +vn -0.8989 0.0000 0.4382 vn 0.4494 -0.7784 0.4382 -vn -0.0000 -0.8989 0.4382 +vn 0.0000 -0.8989 0.4382 vn 0.7784 0.4494 0.4382 vn -0.2172 -0.3762 0.9007 vn -0.3762 -0.2172 0.9007 @@ -1125,1510 +2625,1525 @@ vn 0.0000 0.4344 0.9007 vn 0.2172 0.3762 0.9007 vn -0.3762 0.2172 0.9007 vn -0.2172 0.3762 0.9007 -vn 0.4344 -0.0000 0.9007 vn 0.3762 -0.2172 0.9007 vn 0.3762 0.2172 0.9007 +vn 0.4344 0.0000 0.9007 vn 0.2172 -0.3762 0.9007 vn 0.0000 -0.4344 0.9007 vn -0.4344 0.0000 0.9007 vn 0.0000 -0.3827 -0.9239 vn 0.0000 -0.9239 -0.3827 +vn 0.0000 -0.9239 0.3827 vn 0.0000 -0.5847 0.8112 vn 0.0000 0.3827 0.9239 +vn 0.0000 0.9239 0.3827 vn 0.0000 0.9239 -0.3827 vn 0.0000 0.5847 -0.8112 vn 0.0000 -0.2298 0.9732 vn 0.0000 -0.2298 -0.9732 vn 0.0000 0.1602 0.9871 vn 0.0000 -0.8507 0.5257 -vn 0.9732 0.2298 0.0000 +vn 0.9098 -0.4101 0.0646 +vn 0.3687 -0.9202 0.1318 +vn -0.4444 -0.8959 0.0000 +vn 0.3928 -0.9093 0.1377 +vn 0.4444 -0.8959 0.0000 +vn -0.3928 -0.9093 0.1377 +vn -0.3687 -0.9202 0.1318 +vn 0.9522 0.3054 0.0000 +vn -0.9522 0.3054 0.0000 +vn -0.9732 0.2298 0.0000 +vn -0.9354 -0.3503 0.0483 +vn 0.9354 -0.3503 0.0483 +vn -0.9098 -0.4101 0.0646 +vn 0.9761 -0.2175 0.0000 +vn -0.9761 -0.2175 0.0000 +vn -0.9145 0.0000 -0.4046 +vn -0.9701 0.0000 -0.2425 +vn -0.8321 0.0000 -0.5547 +vn -0.8507 -0.5257 0.0000 +vn -0.8507 0.5257 0.0000 +vn -0.2298 -0.9732 0.0000 +vn -0.2298 0.9732 0.0000 vn -0.3536 -0.6124 -0.7071 +vn -0.4000 -0.6928 -0.6000 vn -0.8727 -0.4330 -0.2257 +vn 0.9732 0.2298 0.0000 s off -f 10//1 34//1 33//1 -f 8//1 35//1 34//1 -f 6//1 36//1 35//1 -f 4//1 25//1 36//1 -f 24//1 25//1 2//1 -f 24//1 27//1 26//1 -f 22//1 28//1 27//1 -f 20//1 29//1 28//1 -f 18//1 30//1 29//1 -f 14//1 30//1 16//1 -f 14//1 32//1 31//1 -f 10//1 32//1 12//1 -f 41//1 45//1 38//1 -f 50//1 67//1 49//1 -f 79//1 81//1 67//1 -f 146//2 134//2 137//2 -f 88//2 70//2 72//2 -f 64//3 86//3 76//3 -f 86//4 80//4 83//4 -f 74//2 85//2 64//2 -f 71//5 80//5 74//5 -f 87//6 90//6 88//6 -f 73//5 88//5 72//5 -f 75//3 89//3 63//3 -f 63//2 87//2 73//2 -f 110//2 98//2 101//2 -f 91//1 108//1 93//1 -f 97//1 114//1 99//1 -f 92//1 113//1 97//1 -f 118//2 105//2 106//2 -f 104//2 118//2 106//2 -f 96//1 114//1 112//1 -f 117//2 100//2 105//2 -f 102//2 122//2 103//2 -f 94//1 120//1 119//1 -f 122//2 104//2 103//2 -f 96//1 120//1 95//1 -f 100//2 110//2 101//2 -f 92//1 108//1 111//1 -f 123//1 107//1 91//1 -f 124//2 126//2 102//2 -f 127//1 144//1 129//1 -f 133//1 150//1 135//1 -f 128//1 149//1 133//1 -f 154//2 141//2 142//2 -f 140//2 154//2 142//2 -f 132//1 150//1 148//1 -f 153//2 136//2 141//2 -f 157//2 139//2 138//2 -f 131//1 155//1 130//1 -f 158//2 140//2 139//2 -f 132//1 156//1 131//1 -f 136//2 146//2 137//2 -f 128//1 144//1 147//1 -f 159//1 143//1 127//1 -f 160//2 162//2 138//2 -f 83//2 69//2 84//2 -f 190//2 200//2 189//2 -f 179//2 201//2 190//2 -f 179//2 191//2 202//2 -f 181//2 191//2 180//2 -f 182//2 192//2 181//2 -f 183//2 193//2 182//2 -f 184//2 194//2 183//2 -f 184//2 196//2 195//2 -f 186//2 196//2 185//2 -f 186//2 198//2 197//2 -f 188//2 198//2 187//2 -f 189//2 199//2 188//2 -f 88//2 227//2 228//2 -f 83//2 230//2 86//2 -f 229//2 84//2 82//2 -f 213//2 209//2 205//2 -f 239//4 247//4 238//4 -f 237//5 245//5 236//5 -f 235//6 243//6 234//6 -f 238//7 246//7 237//7 -f 236//8 244//8 235//8 -f 248//2 243//2 245//2 -f 243//9 712//9 711//9 -f 711//2 242//2 232//2 -f 234//1 252//1 235//1 -f 233//10 251//10 234//10 -f 231//1 250//1 233//1 -f 240//1 256//1 241//1 -f 239//10 255//10 240//10 -f 238//1 254//1 239//1 -f 236//1 258//1 237//1 -f 258//1 238//1 237//1 -f 235//1 257//1 236//1 -f 231//3 285//3 283//3 -f 232//3 286//3 285//3 -f 295//1 297//1 287//1 -f 307//1 312//1 313//1 -f 326//2 328//2 321//2 -f 312//5 331//5 322//5 -f 303//11 318//11 319//11 -f 305//12 318//12 304//12 -f 306//7 317//7 305//7 -f 307//13 325//13 306//13 -f 311//14 321//14 312//14 -f 316//5 326//5 307//5 -f 303//8 320//8 311//8 -f 335//1 337//1 341//1 -f 396//2 416//2 397//2 -f 395//2 417//2 396//2 -f 395//2 419//2 418//2 -f 394//2 420//2 419//2 -f 393//2 421//2 420//2 -f 392//2 422//2 421//2 -f 373//1 415//1 372//1 -f 374//1 414//1 373//1 -f 375//1 413//1 374//1 -f 376//1 412//1 375//1 -f 410//1 376//1 377//1 -f 409//1 377//1 378//1 -f 397//15 405//15 378//15 -f 409//1 405//1 403//1 -f 403//16 434//16 402//16 -f 406//2 416//2 402//2 -f 407//17 430//17 408//17 -f 422//2 408//2 401//2 -f 391//18 407//18 408//18 -f 407//1 415//1 404//1 -f 447//1 438//1 445//1 -f 433//3 431//3 432//3 -f 435//3 429//3 436//3 -f 406//2 434//2 433//2 -f 404//19 435//19 436//19 -f 406//20 432//20 405//20 -f 407//21 436//21 429//21 -f 408//22 435//22 401//22 -f 405//1 431//1 403//1 -f 445//4 440//4 446//4 -f 448//3 445//3 446//3 -f 445//1 438//1 409//1 -f 440//3 403//3 402//3 -f 446//2 440//2 402//2 -f 443//2 446//2 437//2 -f 447//1 441//1 404//1 -f 447//6 444//6 441//6 -f 448//2 443//2 422//2 -f 441//3 401//3 404//3 -f 453//23 460//23 456//23 -f 451//4 454//4 452//4 -f 450//6 456//6 449//6 -f 452//2 453//2 450//2 -f 449//1 455//1 451//1 -f 458//3 460//3 457//3 -f 454//24 457//24 453//24 -f 456//25 459//25 455//25 -f 455//26 458//26 454//26 -f 471//8 493//8 472//8 -f 425//2 469//2 468//2 -f 424//2 468//2 467//2 -f 423//2 467//2 466//2 -f 423//2 465//2 400//2 -f 475//1 388//1 389//1 -f 390//1 475//1 389//1 -f 379//1 474//1 390//1 -f 380//1 473//1 379//1 -f 381//1 484//1 380//1 -f 382//1 483//1 381//1 -f 383//1 482//1 382//1 -f 384//1 481//1 383//1 -f 385//1 480//1 384//1 -f 386//1 479//1 385//1 -f 477//1 386//1 387//1 -f 476//1 387//1 388//1 -f 486//2 492//2 490//2 -f 485//2 490//2 491//2 -f 489//2 491//2 493//2 -f 488//2 493//2 494//2 -f 428//27 494//27 471//27 -f 461//12 490//12 462//12 -f 472//11 491//11 461//11 -f 462//7 492//7 463//7 -f 463//28 487//28 398//28 -f 503//2 508//2 504//2 -f 505//2 508//2 507//2 -f 495//2 507//2 506//2 -f 496//2 506//2 515//2 -f 497//2 515//2 514//2 -f 498//2 514//2 513//2 -f 511//2 520//2 540//2 -f 531//1 529//1 541//1 -f 526//1 521//1 522//1 -f 523//1 526//1 522//1 -f 517//1 524//1 523//1 -f 516//1 525//1 517//1 -f 518//1 534//1 516//1 -f 519//1 533//1 518//1 -f 539//5 542//5 540//5 -f 502//8 540//8 500//8 -f 537//7 541//7 535//7 -f 536//4 537//4 535//4 -f 502//6 499//6 501//6 -f 528//1 535//1 529//1 -f 537//2 510//2 511//2 -f 512//3 501//3 499//3 -f 528//3 538//3 536//3 -f 530//1 502//1 501//1 -f 512//2 500//2 520//2 -f 561//29 563//29 559//29 -f 549//29 551//29 547//29 -f 544//2 550//2 546//2 -f 543//6 548//6 544//6 -f 545//1 547//1 543//1 -f 546//4 549//4 545//4 -f 551//5 554//5 552//5 -f 550//4 553//4 549//4 -f 548//30 554//30 550//30 -f 547//6 552//6 548//6 -f 556//2 562//2 558//2 -f 555//6 560//6 556//6 -f 557//1 559//1 555//1 -f 558//4 561//4 557//4 -f 563//5 566//5 564//5 -f 562//4 565//4 561//4 -f 560//30 566//30 562//30 -f 559//6 564//6 560//6 -f 568//4 569//4 567//4 -f 570//2 573//2 569//2 -f 574//6 571//6 573//6 -f 572//1 567//1 571//1 -f 573//5 567//5 569//5 -f 570//3 572//3 574//3 -f 243//6 711//6 232//6 -f 575//5 578//5 576//5 -f 582//3 579//3 580//3 -f 606//5 603//5 604//5 -f 578//2 581//2 582//2 -f 592//4 593//4 591//4 -f 576//1 579//1 575//1 -f 587//6 590//6 588//6 -f 583//3 590//3 585//3 -f 584//1 588//1 583//1 -f 584//5 589//5 587//5 -f 589//1 624//1 590//1 -f 598//6 595//6 597//6 -f 598//2 597//2 599//2 -f 597//31 601//31 599//31 -f 594//3 602//3 600//3 -f 600//32 596//32 598//32 -f 599//5 591//5 593//5 -f 606//2 609//2 605//2 -f 607//3 610//3 608//3 -f 592//1 591//1 601//1 -f 613//6 612//6 611//6 -f 607//1 604//1 603//1 -f 615//4 618//4 617//4 -f 620//2 614//2 619//2 -f 621//33 617//33 619//33 -f 622//3 614//3 620//3 -f 616//34 620//34 618//34 -f 611//5 619//5 613//5 -f 622//1 616//1 621//1 -f 623//35 626//35 624//35 -f 625//5 589//5 586//5 -f 590//3 626//3 585//3 -f 625//36 585//36 626//36 -f 627//1 630//1 628//1 -f 634//2 631//2 632//2 -f 630//4 632//4 628//4 -f 627//37 633//37 629//37 -f 630//3 633//3 634//3 -f 642//4 639//4 640//4 -f 642//3 635//3 637//3 -f 640//1 636//1 635//1 -f 636//5 641//5 638//5 -f 644//1 641//1 642//1 -f 646//38 643//38 644//38 -f 641//5 645//5 638//5 -f 642//3 646//3 644//3 -f 637//39 645//39 646//39 -f 650//1 647//1 648//1 -f 651//2 654//2 652//2 -f 652//6 650//6 648//6 -f 653//40 647//40 649//40 -f 650//3 653//3 649//3 -f 239//4 242//4 248//4 -f 241//3 256//3 284//3 -f 718//1 716//1 714//1 -f 719//1 713//1 715//1 -f 713//6 722//6 715//6 -f 720//5 721//5 713//5 -f 719//4 727//4 720//4 -f 714//5 726//5 718//5 -f 716//4 724//4 714//4 -f 715//3 728//3 719//3 -f 717//3 723//3 716//3 -f 718//6 725//6 717//6 -f 735//41 737//41 739//41 -f 729//6 735//6 731//6 -f 744//5 741//5 742//5 -f 732//4 734//4 730//4 -f 730//2 733//2 729//2 -f 740//3 737//3 738//3 -f 736//42 738//42 734//42 -f 734//43 737//43 733//43 -f 732//1 731//1 739//1 -f 747//3 750//3 748//3 -f 743//6 745//6 741//6 -f 750//2 751//2 743//2 -f 747//1 746//1 742//1 -f 743//2 748//2 750//2 -f 746//4 744//4 742//4 -f 747//44 752//44 746//44 -f 748//6 753//6 747//6 -f 745//44 754//44 749//44 -f 750//4 749//4 754//4 -f 752//2 748//2 744//2 -f 760//1 769//1 768//1 -f 755//1 763//1 762//1 -f 755//1 769//1 761//1 -f 771//1 767//1 759//1 -f 770//1 765//1 757//1 -f 757//1 763//1 756//1 -f 782//2 775//2 786//2 -f 774//2 779//2 780//2 -f 784//2 775//2 783//2 -f 784//2 772//2 776//2 -f 772//2 778//2 773//2 -f 778//2 774//2 773//2 -f 800//4 795//4 797//4 -f 810//6 806//6 804//6 -f 794//45 788//45 792//45 -f 793//46 787//46 789//46 -f 793//47 790//47 794//47 -f 792//25 787//25 791//25 -f 816//4 811//4 813//4 -f 826//6 822//6 820//6 -f 887//3 828//3 883//3 -f 831//5 834//5 832//5 -f 827//6 834//6 829//6 -f 832//1 885//1 884//1 -f 830//4 831//4 828//4 -f 833//2 888//2 889//2 -f 843//2 841//2 837//2 -f 829//3 886//3 827//3 -f 890//45 885//45 886//45 -f 888//46 883//46 884//46 -f 889//3 884//3 885//3 -f 895//5 897//5 896//5 -f 892//6 898//6 894//6 -f 893//4 896//4 891//4 -f 894//2 895//2 893//2 -f 891//1 897//1 892//1 -f 913//4 899//4 901//4 -f 912//6 902//6 900//6 -f 917//4 903//4 905//4 -f 916//6 906//6 904//6 -f 915//4 901//4 903//4 -f 902//6 916//6 904//6 -f 921//4 907//4 909//4 -f 908//6 922//6 910//6 -f 919//4 905//4 907//4 -f 906//6 920//6 908//6 -f 930//6 924//6 926//6 -f 927//4 925//4 923//4 -f 931//4 929//4 927//4 -f 934//6 928//6 930//6 -f 932//6 934//6 936//6 -f 933//4 931//4 935//4 -f 10//1 8//1 34//1 -f 8//1 6//1 35//1 -f 6//1 4//1 36//1 -f 4//1 2//1 25//1 -f 24//1 26//1 25//1 -f 24//1 22//1 27//1 -f 22//1 20//1 28//1 -f 20//1 18//1 29//1 -f 18//1 16//1 30//1 -f 14//1 31//1 30//1 -f 14//1 12//1 32//1 -f 10//1 33//1 32//1 -f 38//1 37//1 41//1 -f 37//1 39//1 41//1 -f 39//1 40//1 41//1 -f 41//1 42//1 43//1 -f 43//1 44//1 45//1 -f 45//1 46//1 47//1 -f 47//1 48//1 45//1 -f 48//1 38//1 45//1 -f 41//1 43//1 45//1 -f 50//1 68//1 67//1 -f 68//1 52//1 79//1 -f 81//1 51//1 67//1 -f 68//1 79//1 67//1 -f 146//2 145//2 134//2 -f 88//2 82//2 70//2 -f 64//3 85//3 86//3 -f 86//4 85//4 80//4 -f 74//2 80//2 85//2 -f 71//5 83//5 80//5 -f 87//6 89//6 90//6 -f 73//5 87//5 88//5 -f 75//3 90//3 89//3 -f 63//2 89//2 87//2 -f 110//2 109//2 98//2 -f 91//1 107//1 108//1 -f 97//1 113//1 114//1 -f 92//1 111//1 113//1 -f 118//2 117//2 105//2 -f 104//2 116//2 118//2 -f 96//1 99//1 114//1 -f 117//2 115//2 100//2 -f 102//2 121//2 122//2 -f 94//1 95//1 120//1 -f 122//2 116//2 104//2 -f 96//1 112//1 120//1 -f 100//2 115//2 110//2 -f 92//1 93//1 108//1 -f 91//1 94//1 123//1 -f 94//1 119//1 125//1 -f 123//1 94//1 125//1 -f 121//2 102//2 126//2 -f 102//2 98//2 124//2 -f 98//2 109//2 124//2 -f 127//1 143//1 144//1 -f 133//1 149//1 150//1 -f 128//1 147//1 149//1 -f 154//2 153//2 141//2 -f 140//2 152//2 154//2 -f 132//1 135//1 150//1 -f 153//2 151//2 136//2 -f 157//2 158//2 139//2 -f 131//1 156//1 155//1 -f 158//2 152//2 140//2 -f 132//1 148//1 156//1 -f 136//2 151//2 146//2 -f 128//1 129//1 144//1 -f 127//1 130//1 159//1 -f 130//1 155//1 161//1 -f 159//1 130//1 161//1 -f 157//2 138//2 162//2 -f 138//2 134//2 160//2 -f 134//2 145//2 160//2 -f 83//2 71//2 69//2 -f 190//2 201//2 200//2 -f 179//2 202//2 201//2 -f 179//2 180//2 191//2 -f 181//2 192//2 191//2 -f 182//2 193//2 192//2 -f 183//2 194//2 193//2 -f 184//2 195//2 194//2 -f 184//2 185//2 196//2 -f 186//2 197//2 196//2 -f 186//2 187//2 198//2 -f 188//2 199//2 198//2 -f 189//2 200//2 199//2 -f 88//2 90//2 227//2 -f 83//2 229//2 230//2 -f 82//2 88//2 228//2 -f 229//2 83//2 84//2 -f 82//2 228//2 229//2 -f 205//2 204//2 213//2 -f 204//2 203//2 213//2 -f 203//2 214//2 213//2 -f 213//2 212//2 211//2 -f 211//2 210//2 209//2 -f 209//2 208//2 207//2 -f 207//2 206//2 205//2 -f 213//2 211//2 209//2 -f 209//2 207//2 205//2 -f 239//4 248//4 247//4 -f 237//5 246//5 245//5 -f 235//6 244//6 243//6 -f 238//7 247//7 246//7 -f 236//8 245//8 244//8 -f 243//2 244//2 245//2 -f 245//2 246//2 248//2 -f 246//2 247//2 248//2 -f 243//9 248//9 712//9 -f 711//2 712//2 242//2 -f 234//1 251//1 252//1 -f 233//10 250//10 251//10 -f 231//1 249//1 250//1 -f 240//1 255//1 256//1 -f 239//10 254//10 255//10 -f 238//1 253//1 254//1 -f 236//1 257//1 258//1 -f 258//1 253//1 238//1 -f 235//1 252//1 257//1 -f 283//3 249//3 231//3 -f 231//3 232//3 285//3 -f 232//3 242//3 286//3 -f 287//1 288//1 289//1 -f 289//1 290//1 291//1 -f 291//1 292//1 293//1 -f 293//1 294//1 295//1 -f 295//1 296//1 297//1 -f 297//1 298//1 287//1 -f 287//1 289//1 295//1 -f 289//1 291//1 295//1 -f 291//1 293//1 295//1 -f 303//1 311//1 312//1 -f 312//1 322//1 323//1 -f 323//1 324//1 312//1 -f 324//1 313//1 312//1 -f 313//1 314//1 307//1 -f 314//1 315//1 307//1 -f 315//1 316//1 307//1 -f 307//1 306//1 305//1 -f 305//1 304//1 303//1 -f 303//1 312//1 305//1 -f 305//1 312//1 307//1 -f 321//2 320//2 319//2 -f 319//2 318//2 321//2 -f 318//2 317//2 321//2 -f 317//2 325//2 326//2 -f 326//2 330//2 329//2 -f 329//2 327//2 326//2 -f 327//2 328//2 326//2 -f 328//2 333//2 321//2 -f 333//2 332//2 321//2 -f 332//2 331//2 321//2 -f 317//2 326//2 321//2 -f 312//5 321//5 331//5 -f 303//11 304//11 318//11 -f 305//12 317//12 318//12 -f 306//7 325//7 317//7 -f 307//13 326//13 325//13 -f 311//14 320//14 321//14 -f 316//5 330//5 326//5 -f 303//8 319//8 320//8 -f 345//1 334//1 335//1 -f 335//1 336//1 337//1 -f 337//1 338//1 341//1 -f 338//1 339//1 341//1 -f 339//1 340//1 341//1 -f 341//1 342//1 345//1 -f 342//1 343//1 345//1 -f 343//1 344//1 345//1 -f 345//1 335//1 341//1 -f 396//2 417//2 416//2 -f 395//2 418//2 417//2 -f 395//2 394//2 419//2 -f 394//2 393//2 420//2 -f 393//2 392//2 421//2 -f 392//2 391//2 422//2 -f 373//1 414//1 415//1 -f 374//1 413//1 414//1 -f 375//1 412//1 413//1 -f 376//1 411//1 412//1 -f 410//1 411//1 376//1 -f 409//1 410//1 377//1 -f 397//15 406//15 405//15 -f 409//1 378//1 405//1 -f 403//16 431//16 434//16 -f 406//2 397//2 416//2 -f 407//17 429//17 430//17 -f 422//2 391//2 408//2 -f 391//18 372//18 407//18 -f 407//1 372//1 415//1 -f 447//1 442//1 438//1 -f 433//3 434//3 431//3 -f 435//3 430//3 429//3 -f 406//2 402//2 434//2 -f 404//19 401//19 435//19 -f 406//20 433//20 432//20 -f 407//21 404//21 436//21 -f 408//22 430//22 435//22 -f 405//1 432//1 431//1 -f 445//4 439//4 440//4 -f 448//3 447//3 445//3 -f 409//1 403//1 445//1 -f 403//1 439//1 445//1 -f 440//3 439//3 403//3 -f 402//2 416//2 446//2 -f 416//2 437//2 446//2 -f 443//2 448//2 446//2 -f 404//1 415//1 447//1 -f 415//1 442//1 447//1 -f 447//6 448//6 444//6 -f 422//2 401//2 448//2 -f 401//2 444//2 448//2 -f 441//3 444//3 401//3 -f 453//23 457//23 460//23 -f 451//4 455//4 454//4 -f 450//6 453//6 456//6 -f 452//2 454//2 453//2 -f 449//1 456//1 455//1 -f 458//3 459//3 460//3 -f 454//24 458//24 457//24 -f 456//25 460//25 459//25 -f 455//26 459//26 458//26 -f 471//8 494//8 493//8 -f 425//2 426//2 469//2 -f 424//2 425//2 468//2 -f 423//2 424//2 467//2 -f 423//2 466//2 465//2 -f 475//1 476//1 388//1 -f 390//1 474//1 475//1 -f 379//1 473//1 474//1 -f 380//1 484//1 473//1 -f 381//1 483//1 484//1 -f 382//1 482//1 483//1 -f 383//1 481//1 482//1 -f 384//1 480//1 481//1 -f 385//1 479//1 480//1 -f 386//1 478//1 479//1 -f 477//1 478//1 386//1 -f 476//1 477//1 387//1 -f 486//2 487//2 492//2 -f 485//2 486//2 490//2 -f 489//2 485//2 491//2 -f 488//2 489//2 493//2 -f 428//27 488//27 494//27 -f 461//12 491//12 490//12 -f 472//11 493//11 491//11 -f 462//7 490//7 492//7 -f 463//28 492//28 487//28 -f 503//2 509//2 508//2 -f 505//2 504//2 508//2 -f 495//2 505//2 507//2 -f 496//2 495//2 506//2 -f 497//2 496//2 515//2 -f 498//2 497//2 514//2 -f 520//2 500//2 540//2 -f 540//2 542//2 511//2 -f 542//2 537//2 511//2 -f 529//1 535//1 541//1 -f 541//1 539//1 531//1 -f 539//1 502//1 531//1 -f 526//1 527//1 521//1 -f 523//1 524//1 526//1 -f 517//1 525//1 524//1 -f 516//1 534//1 525//1 -f 518//1 533//1 534//1 -f 519//1 532//1 533//1 -f 539//5 541//5 542//5 -f 502//8 539//8 540//8 -f 537//7 542//7 541//7 -f 536//4 538//4 537//4 -f 502//6 500//6 499//6 -f 528//1 536//1 535//1 -f 537//2 538//2 510//2 -f 512//3 530//3 501//3 -f 528//3 510//3 538//3 -f 530//1 531//1 502//1 -f 512//2 499//2 500//2 -f 561//29 565//29 563//29 -f 549//29 553//29 551//29 -f 544//2 548//2 550//2 -f 543//6 547//6 548//6 -f 545//1 549//1 547//1 -f 546//4 550//4 549//4 -f 551//5 553//5 554//5 -f 550//4 554//4 553//4 -f 548//30 552//30 554//30 -f 547//6 551//6 552//6 -f 556//2 560//2 562//2 -f 555//6 559//6 560//6 -f 557//1 561//1 559//1 -f 558//4 562//4 561//4 -f 563//5 565//5 566//5 -f 562//4 566//4 565//4 -f 560//30 564//30 566//30 -f 559//6 563//6 564//6 -f 568//4 570//4 569//4 -f 570//2 574//2 573//2 -f 574//6 572//6 571//6 -f 572//1 568//1 567//1 -f 573//5 571//5 567//5 -f 570//3 568//3 572//3 -f 232//6 231//6 243//6 -f 231//6 233//6 234//6 -f 243//6 231//6 234//6 -f 575//5 577//5 578//5 -f 582//3 581//3 579//3 -f 606//5 605//5 603//5 -f 578//2 577//2 581//2 -f 592//4 594//4 593//4 -f 576//1 580//1 579//1 -f 587//6 589//6 590//6 -f 583//3 588//3 590//3 -f 584//1 587//1 588//1 -f 584//5 586//5 589//5 -f 589//1 623//1 624//1 -f 598//6 596//6 595//6 -f 599//2 593//2 594//2 -f 594//2 600//2 599//2 -f 600//2 598//2 599//2 -f 597//31 595//31 601//31 -f 594//3 592//3 602//3 -f 600//32 602//32 596//32 -f 599//5 601//5 591//5 -f 606//2 610//2 609//2 -f 607//3 609//3 610//3 -f 601//1 595//1 596//1 -f 596//1 602//1 601//1 -f 602//1 592//1 601//1 -f 613//6 614//6 612//6 -f 607//1 608//1 604//1 -f 615//4 616//4 618//4 -f 614//2 613//2 619//2 -f 619//2 617//2 618//2 -f 618//2 620//2 619//2 -f 621//33 615//33 617//33 -f 622//3 612//3 614//3 -f 616//34 622//34 620//34 -f 611//5 621//5 619//5 -f 616//1 615//1 621//1 -f 621//1 611//1 612//1 -f 612//1 622//1 621//1 -f 623//35 625//35 626//35 -f 625//5 623//5 589//5 -f 590//3 624//3 626//3 -f 625//36 586//36 585//36 -f 627//1 629//1 630//1 -f 634//2 633//2 631//2 -f 630//4 634//4 632//4 -f 627//37 631//37 633//37 -f 630//3 629//3 633//3 -f 642//4 641//4 639//4 -f 642//3 640//3 635//3 -f 640//1 639//1 636//1 -f 636//5 639//5 641//5 -f 644//1 643//1 641//1 -f 646//38 645//38 643//38 -f 641//5 643//5 645//5 -f 642//3 637//3 646//3 -f 637//39 638//39 645//39 -f 650//1 649//1 647//1 -f 651//2 653//2 654//2 -f 652//6 654//6 650//6 -f 653//40 651//40 647//40 -f 650//3 654//3 653//3 -f 239//4 240//4 241//4 -f 241//4 242//4 239//4 -f 242//4 712//4 248//4 -f 284//3 286//3 241//3 -f 286//3 242//3 241//3 -f 718//1 717//1 716//1 -f 719//1 720//1 713//1 -f 713//6 721//6 722//6 -f 720//5 727//5 721//5 -f 719//4 728//4 727//4 -f 714//5 724//5 726//5 -f 716//4 723//4 724//4 -f 715//3 722//3 728//3 -f 717//3 725//3 723//3 -f 718//6 726//6 725//6 -f 735//41 733//41 737//41 -f 729//6 733//6 735//6 -f 744//5 743//5 741//5 -f 732//4 736//4 734//4 -f 730//2 734//2 733//2 -f 740//3 739//3 737//3 -f 736//42 740//42 738//42 -f 734//43 738//43 737//43 -f 731//1 735//1 739//1 -f 739//1 740//1 732//1 -f 740//1 736//1 732//1 -f 747//3 749//3 750//3 -f 743//6 751//6 745//6 -f 750//2 754//2 751//2 -f 742//1 741//1 749//1 -f 741//1 745//1 749//1 -f 749//1 747//1 742//1 -f 743//2 744//2 748//2 -f 746//4 752//4 744//4 -f 747//44 753//44 752//44 -f 745//44 751//44 754//44 -f 752//2 753//2 748//2 -f 760//1 761//1 769//1 -f 755//1 756//1 763//1 -f 755//1 762//1 769//1 -f 771//1 760//1 767//1 -f 760//1 768//1 767//1 -f 767//1 766//1 759//1 -f 770//1 759//1 765//1 -f 759//1 766//1 765//1 -f 765//1 764//1 757//1 -f 757//1 764//1 763//1 -f 758//2 781//2 782//2 -f 782//2 783//2 775//2 -f 786//2 758//2 782//2 -f 781//2 758//2 780//2 -f 758//2 785//2 780//2 -f 785//2 774//2 780//2 -f 784//2 776//2 775//2 -f 784//2 777//2 772//2 -f 772//2 777//2 778//2 -f 778//2 779//2 774//2 -f 797//4 798//4 802//4 -f 802//4 801//4 800//4 -f 800//4 799//4 795//4 -f 795//4 796//4 797//4 -f 797//4 802//4 800//4 -f 804//6 803//6 809//6 -f 809//6 808//6 810//6 -f 810//6 807//6 806//6 -f 806//6 805//6 804//6 -f 804//6 809//6 810//6 -f 794//45 790//45 788//45 -f 793//46 791//46 787//46 -f 793//47 789//47 790//47 -f 792//25 788//25 787//25 -f 813//4 814//4 818//4 -f 818//4 817//4 816//4 -f 816//4 815//4 811//4 -f 811//4 812//4 813//4 -f 813//4 818//4 816//4 -f 820//6 819//6 825//6 -f 825//6 824//6 826//6 -f 826//6 823//6 822//6 -f 822//6 821//6 820//6 -f 820//6 825//6 826//6 -f 887//3 830//3 828//3 -f 831//5 833//5 834//5 -f 827//6 832//6 834//6 -f 832//1 827//1 885//1 -f 827//1 886//1 885//1 -f 828//1 831//1 884//1 -f 831//1 832//1 884//1 -f 884//1 883//1 828//1 -f 830//4 833//4 831//4 -f 833//2 830//2 888//2 -f 830//2 887//2 888//2 -f 829//2 834//2 889//2 -f 834//2 833//2 889//2 -f 889//2 890//2 829//2 -f 837//2 836//2 835//2 -f 835//2 846//2 837//2 -f 846//2 845//2 837//2 -f 845//2 844//2 843//2 -f 843//2 842//2 841//2 -f 841//2 840//2 839//2 -f 839//2 838//2 841//2 -f 838//2 837//2 841//2 -f 845//2 843//2 837//2 -f 829//3 890//3 886//3 -f 890//45 889//45 885//45 -f 888//46 887//46 883//46 -f 889//3 888//3 884//3 -f 895//5 898//5 897//5 -f 892//6 897//6 898//6 -f 893//4 895//4 896//4 -f 894//2 898//2 895//2 -f 891//1 896//1 897//1 -f 913//4 911//4 899//4 -f 912//6 914//6 902//6 -f 917//4 915//4 903//4 -f 916//6 918//6 906//6 -f 915//4 913//4 901//4 -f 902//6 914//6 916//6 -f 921//4 919//4 907//4 -f 908//6 920//6 922//6 -f 919//4 917//4 905//4 -f 906//6 918//6 920//6 -f 930//6 928//6 924//6 -f 927//4 929//4 925//4 -f 931//4 933//4 929//4 -f 934//6 932//6 928//6 +f 8/1/1 33/2/1 10/3/1 +f 8/1/1 35/4/1 34/5/1 +f 4/6/1 35/7/1 6/8/1 +f 4/6/1 25/9/1 36/10/1 +f 24/11/1 25/12/1 2/13/1 +f 24/11/1 27/14/1 26/15/1 +f 22/16/1 28/17/1 27/18/1 +f 20/19/1 29/20/1 28/21/1 +f 18/22/1 30/23/1 29/24/1 +f 14/25/1 30/26/1 16/27/1 +f 14/28/1 32/29/1 31/30/1 +f 10/3/1 32/31/1 12/32/1 +f 43/33/1 45/34/1 38/35/1 +f 60/36/1 55/37/1 181/38/1 +f 53/39/1 72/40/1 184/41/1 +f 52/42/1 55/43/1 50/44/1 +f 79/45/2 69/46/2 78/47/2 +f 51/48/2 81/49/2 70/50/2 +f 56/51/2 58/52/2 77/53/2 +f 104/54/2 92/55/2 95/56/2 +f 49/57/2 54/58/2 51/48/2 +f 183/59/1 71/60/1 68/61/1 +f 83/62/1 65/63/1 67/64/1 +f 61/65/2 74/66/2 73/67/2 +f 183/68/1 66/69/1 82/70/1 +f 58/52/2 76/71/2 77/72/2 +f 57/73/2 75/74/2 76/71/2 +f 184/75/1 71/60/1 182/76/1 +f 83/77/1 59/78/1 84/79/1 +f 62/80/2 79/81/2 74/66/2 +f 181/82/1 59/78/1 60/36/1 +f 85/83/1 102/84/1 87/85/1 +f 91/86/1 108/87/1 93/88/1 +f 86/89/1 107/90/1 91/86/1 +f 112/91/2 99/92/2 100/93/2 +f 98/94/2 112/91/2 100/93/2 +f 90/95/1 108/87/1 106/96/1 +f 111/97/2 94/98/2 99/92/2 +f 115/99/2 97/100/2 96/101/2 +f 89/102/1 113/103/1 88/104/1 +f 116/105/2 98/106/2 97/100/2 +f 90/107/1 114/108/1 89/102/1 +f 94/109/2 104/54/2 95/56/2 +f 86/110/1 102/84/1 105/111/1 +f 884/112/1 881/113/1 886/114/1 +f 143/115/2 155/116/2 154/117/2 +f 133/118/2 155/116/2 144/119/2 +f 133/120/2 145/121/2 156/122/2 +f 135/123/2 145/121/2 134/124/2 +f 136/125/2 146/126/2 135/127/2 +f 137/128/2 147/129/2 136/130/2 +f 138/131/2 148/132/2 137/133/2 +f 138/134/2 150/135/2 149/136/2 +f 140/137/2 150/138/2 139/139/2 +f 140/140/2 152/141/2 151/142/2 +f 141/143/2 153/144/2 152/141/2 +f 143/145/2 153/144/2 142/146/2 +f 69/46/2 81/147/2 78/47/2 +f 82/70/1 65/63/1 80/148/1 +f 75/149/2 61/65/2 73/67/2 +f 167/150/2 163/151/2 159/152/2 +f 193/153/3 201/154/3 192/155/3 +f 191/156/4 199/157/4 190/158/4 +f 189/159/5 197/160/5 188/161/5 +f 192/155/6 200/162/6 191/163/6 +f 190/158/7 198/164/7 189/159/7 +f 202/165/2 197/166/2 199/167/2 +f 197/166/8 601/168/8 600/169/8 +f 600/169/2 196/170/2 186/171/2 +f 188/172/1 206/173/1 189/174/1 +f 187/175/9 205/176/9 188/172/9 +f 185/177/1 204/178/1 187/175/1 +f 194/179/1 210/180/1 195/181/1 +f 193/182/9 209/183/9 194/179/9 +f 193/182/1 207/184/1 208/185/1 +f 190/186/1 212/187/1 191/188/1 +f 212/187/1 192/189/1 191/188/1 +f 189/174/1 211/190/1 190/186/1 +f 185/177/10 186/171/10 229/191/10 +f 186/171/10 230/192/10 229/191/10 +f 235/193/1 239/194/1 231/195/1 +f 251/196/1 256/197/1 257/198/1 +f 270/199/2 272/200/2 265/201/2 +f 285/202/1 287/203/1 289/204/1 +f 340/205/2 360/206/2 341/207/2 +f 339/208/2 361/209/2 340/205/2 +f 338/210/2 362/211/2 339/208/2 +f 338/210/2 364/212/2 363/213/2 +f 337/214/2 365/215/2 364/212/2 +f 336/216/2 366/217/2 365/215/2 +f 317/218/1 359/219/1 316/220/1 +f 318/221/1 358/222/1 317/218/1 +f 319/223/1 357/224/1 318/221/1 +f 355/225/1 319/223/1 320/226/1 +f 354/227/1 320/226/1 321/228/1 +f 353/229/1 321/228/1 322/230/1 +f 353/229/1 349/231/1 347/232/1 +f 347/233/11 378/234/11 346/235/11 +f 350/236/2 360/206/2 346/237/2 +f 351/238/12 374/239/12 352/240/12 +f 366/217/2 352/240/2 345/241/2 +f 351/238/1 359/219/1 348/242/1 +f 391/243/1 382/244/1 389/245/1 +f 377/246/10 375/247/10 376/248/10 +f 379/249/10 373/250/10 380/251/10 +f 350/236/2 378/252/2 377/246/2 +f 348/253/13 379/249/13 380/251/13 +f 350/236/14 376/248/14 349/231/14 +f 351/238/15 380/254/15 373/250/15 +f 352/240/16 379/255/16 345/241/16 +f 349/231/1 375/256/1 347/232/1 +f 389/257/3 384/258/3 390/259/3 +f 392/260/10 389/245/10 390/261/10 +f 389/262/1 382/263/1 353/229/1 +f 384/258/10 347/233/10 346/235/10 +f 390/264/2 384/265/2 346/237/2 +f 387/266/2 390/261/2 381/267/2 +f 391/268/1 385/269/1 348/242/1 +f 391/270/5 388/271/5 385/272/5 +f 392/273/2 387/274/2 366/217/2 +f 385/272/10 345/275/10 348/253/10 +f 397/276/17 404/277/17 400/278/17 +f 395/279/3 398/280/3 396/281/3 +f 394/282/5 400/278/5 393/283/5 +f 396/281/2 397/276/2 394/282/2 +f 393/283/1 399/284/1 395/285/1 +f 402/286/10 404/277/10 401/287/10 +f 398/280/18 401/288/18 397/276/18 +f 400/278/19 403/289/19 399/284/19 +f 399/290/20 402/291/20 398/280/20 +f 369/292/2 411/293/2 410/294/2 +f 368/295/2 410/294/2 409/296/2 +f 368/297/2 408/298/2 367/299/2 +f 367/299/2 407/300/2 344/301/2 +f 333/302/1 417/303/1 332/304/1 +f 415/305/1 333/302/1 334/306/1 +f 414/307/1 334/306/1 323/308/1 +f 324/309/1 414/307/1 323/308/1 +f 325/310/1 425/311/1 324/309/1 +f 326/312/1 424/313/1 325/310/1 +f 327/314/1 423/315/1 326/312/1 +f 328/316/1 422/317/1 327/314/1 +f 329/318/1 421/319/1 328/316/1 +f 419/320/1 329/321/1 330/322/1 +f 418/323/1 330/322/1 331/324/1 +f 417/303/1 331/324/1 332/304/1 +f 428/325/2 431/326/2 427/327/2 +f 427/327/2 432/328/2 426/329/2 +f 430/330/2 432/328/2 434/331/2 +f 429/332/2 434/331/2 435/333/2 +f 372/334/21 435/335/21 413/336/21 +f 405/337/22 428/325/22 342/338/22 +f 441/339/2 446/340/2 445/341/2 +f 441/339/2 444/342/2 442/343/2 +f 442/343/2 443/344/2 436/345/2 +f 437/346/2 443/344/2 449/347/2 +f 438/348/2 449/347/2 448/349/2 +f 439/350/2 448/349/2 447/351/2 +f 455/352/1 460/353/1 454/354/1 +f 457/355/1 455/352/1 456/356/1 +f 458/357/1 456/356/1 451/358/1 +f 450/359/1 458/357/1 451/358/1 +f 452/360/1 463/361/1 450/359/1 +f 453/362/1 462/363/1 452/360/1 +f 482/364/23 484/365/23 480/366/23 +f 470/367/23 472/368/23 468/369/23 +f 467/370/2 469/371/2 471/372/2 +f 464/373/5 469/371/5 465/374/5 +f 466/375/1 468/369/1 464/373/1 +f 467/370/3 470/376/3 466/377/3 +f 472/378/4 475/379/4 473/380/4 +f 471/372/3 474/381/3 470/376/3 +f 469/371/24 475/382/24 471/372/24 +f 468/369/5 473/380/5 469/371/5 +f 477/383/2 483/384/2 479/385/2 +f 476/386/5 481/387/5 477/383/5 +f 476/388/1 482/364/1 480/366/1 +f 479/385/3 482/364/3 478/389/3 +f 484/390/4 487/391/4 485/392/4 +f 483/384/3 486/393/3 482/364/3 +f 481/387/24 487/394/24 483/384/24 +f 480/395/5 485/396/5 481/387/5 +f 489/397/3 490/398/3 488/399/3 +f 491/400/2 494/401/2 490/402/2 +f 495/403/5 492/404/5 494/405/5 +f 493/406/1 488/399/1 492/404/1 +f 494/401/4 488/407/4 490/402/4 +f 491/400/10 493/406/10 495/408/10 +f 197/160/5 600/409/5 186/171/5 +f 496/410/4 499/411/4 497/412/4 +f 503/413/10 500/414/10 501/415/10 +f 499/411/2 502/416/2 503/413/2 +f 513/417/3 514/418/3 512/419/3 +f 497/420/1 500/414/1 496/421/1 +f 508/422/5 511/423/5 509/424/5 +f 504/425/10 511/423/10 506/426/10 +f 505/427/1 509/424/1 504/425/1 +f 505/428/4 510/429/4 508/430/4 +f 510/431/1 525/432/1 511/433/1 +f 519/434/2 518/435/2 520/436/2 +f 513/437/1 512/438/1 522/439/1 +f 526/440/4 510/429/4 507/441/4 +f 511/423/10 527/442/10 506/426/10 +f 528/443/1 531/444/1 529/445/1 +f 535/446/2 532/447/2 533/448/2 +f 531/444/3 533/449/3 529/450/3 +f 528/451/25 534/452/25 530/453/25 +f 531/444/10 534/452/10 535/446/10 +f 539/454/1 536/455/1 537/456/1 +f 540/457/2 543/458/2 541/459/2 +f 541/460/5 539/454/5 537/461/5 +f 542/462/26 536/463/26 538/464/26 +f 539/454/10 542/462/10 538/465/10 +f 193/153/3 196/170/3 202/466/3 +f 210/180/10 230/192/10 195/181/10 +f 607/467/1 605/468/1 603/469/1 +f 608/470/1 602/471/1 604/472/1 +f 602/471/5 611/473/5 604/472/5 +f 609/474/4 610/475/4 602/471/4 +f 608/476/3 616/477/3 609/478/3 +f 603/469/4 615/479/4 607/480/4 +f 605/468/3 613/481/3 603/469/3 +f 604/472/10 617/482/10 608/476/10 +f 606/483/10 612/484/10 605/468/10 +f 607/485/5 614/486/5 606/483/5 +f 624/487/27 626/488/27 628/489/27 +f 618/490/5 624/487/5 620/491/5 +f 633/492/4 630/493/4 631/494/4 +f 621/495/3 623/496/3 619/497/3 +f 619/498/2 622/499/2 618/500/2 +f 629/501/10 626/488/10 627/502/10 +f 625/503/28 627/502/28 623/496/28 +f 623/496/29 626/488/29 622/499/29 +f 621/504/1 620/505/1 628/489/1 +f 636/506/10 639/507/10 637/508/10 +f 632/509/5 634/510/5 630/493/5 +f 639/511/2 640/512/2 632/509/2 +f 636/506/1 635/513/1 631/494/1 +f 632/509/2 637/514/2 639/511/2 +f 635/515/3 633/492/3 631/494/3 +f 636/516/30 641/517/30 635/518/30 +f 637/508/5 642/519/5 636/506/5 +f 634/520/30 643/521/30 638/522/30 +f 639/507/3 638/523/3 643/524/3 +f 641/517/2 637/514/2 633/492/2 +f 649/525/1 658/526/1 657/527/1 +f 644/528/1 652/529/1 651/530/1 +f 644/531/1 658/526/1 650/532/1 +f 660/533/1 656/534/1 648/535/1 +f 659/536/1 654/537/1 646/538/1 +f 646/538/1 652/529/1 645/539/1 +f 671/540/2 664/541/2 675/542/2 +f 663/543/2 668/544/2 669/545/2 +f 673/546/2 664/541/2 672/547/2 +f 673/546/2 661/548/2 665/549/2 +f 661/550/2 667/551/2 662/552/2 +f 667/551/2 663/543/2 662/552/2 +f 689/553/3 684/554/3 686/555/3 +f 699/556/5 695/557/5 693/558/5 +f 683/559/31 677/560/31 681/561/31 +f 682/562/32 676/563/32 678/564/32 +f 682/565/33 679/566/33 683/567/33 +f 681/568/19 676/569/19 680/570/19 +f 700/571/5 704/572/5 706/573/5 +f 710/574/3 715/575/3 713/576/3 +f 776/577/10 717/578/10 772/579/10 +f 720/580/4 723/581/4 721/582/4 +f 716/583/5 723/581/5 718/584/5 +f 721/582/1 774/585/1 773/586/1 +f 719/587/3 720/588/3 717/589/3 +f 722/590/2 777/591/2 778/592/2 +f 732/593/2 730/594/2 726/595/2 +f 718/584/10 775/596/10 716/583/10 +f 779/597/31 774/598/31 775/596/31 +f 777/599/32 772/579/32 773/600/32 +f 778/601/10 773/600/10 774/598/10 +f 784/602/4 786/603/4 785/604/4 +f 781/605/5 787/606/5 783/607/5 +f 782/608/3 785/604/3 780/609/3 +f 783/610/2 784/602/2 782/611/2 +f 780/612/1 786/603/1 781/613/1 +f 802/614/3 788/615/3 790/616/3 +f 801/617/5 791/618/5 789/619/5 +f 806/620/3 792/621/3 794/622/3 +f 805/623/5 795/624/5 793/625/5 +f 804/626/3 790/616/3 792/621/3 +f 791/618/5 805/627/5 793/625/5 +f 810/628/3 796/629/3 798/630/3 +f 797/631/5 811/632/5 799/633/5 +f 808/634/3 794/622/3 796/629/3 +f 795/624/5 809/635/5 797/631/5 +f 819/636/5 813/637/5 815/638/5 +f 816/639/3 814/640/3 812/641/3 +f 820/642/3 818/643/3 816/639/3 +f 823/644/5 817/645/5 819/636/5 +f 821/646/5 823/644/5 825/647/5 +f 822/648/3 820/642/3 824/649/3 +f 827/650/1 844/651/1 826/652/1 +f 844/651/1 845/653/1 858/654/1 +f 865/655/2 847/656/2 849/657/2 +f 841/658/10 863/659/10 853/660/10 +f 863/659/3 857/661/3 860/662/3 +f 851/663/2 862/664/2 841/665/2 +f 848/666/4 857/661/4 851/667/4 +f 864/668/5 867/669/5 865/670/5 +f 850/671/4 865/670/4 849/672/4 +f 852/673/10 866/674/10 840/675/10 +f 840/676/2 864/668/2 850/677/2 +f 860/678/2 846/679/2 861/680/2 +f 865/655/2 868/681/2 869/682/2 +f 860/678/2 871/683/2 863/684/2 +f 870/685/2 861/680/2 859/686/2 +f 887/687/2 882/688/2 885/689/2 +f 883/690/1 101/691/1 85/692/1 +f 885/689/2 92/693/2 103/694/2 +f 886/695/1 88/696/1 113/103/1 +f 880/697/2 115/99/2 96/698/2 +f 893/699/10 888/700/10 890/701/10 +f 894/702/10 891/703/10 889/704/10 +f 906/705/1 900/706/1 902/707/1 +f 905/708/2 903/709/2 901/710/2 +f 910/711/2 893/699/2 890/712/2 +f 892/713/1 908/714/1 888/715/1 +f 895/716/2 911/717/2 891/718/2 +f 909/719/1 894/702/1 889/720/1 +f 903/709/2 911/721/2 899/722/2 +f 909/723/1 902/707/1 898/724/1 +f 910/725/2 901/710/2 897/726/2 +f 900/706/1 908/727/1 896/728/1 +f 919/729/3 916/730/3 917/731/3 +f 919/729/10 912/732/10 914/733/10 +f 917/731/1 913/734/1 912/732/1 +f 913/735/4 918/736/4 915/737/4 +f 921/738/1 918/739/1 919/740/1 +f 918/736/4 922/741/4 915/737/4 +f 919/729/10 923/742/10 921/738/10 +f 927/743/4 924/744/4 925/745/4 +f 928/746/10 931/747/10 929/748/10 +f 927/743/2 930/749/2 926/750/2 +f 934/751/5 933/752/5 932/753/5 +f 928/746/1 925/754/1 924/755/1 +f 941/756/2 935/757/2 940/758/2 +f 943/759/1 937/760/1 942/761/1 +f 8/1/1 34/762/1 33/2/1 +f 8/1/1 6/8/1 35/4/1 +f 4/6/1 36/763/1 35/7/1 +f 4/6/1 2/13/1 25/9/1 +f 24/11/1 26/764/1 25/12/1 +f 24/11/1 22/16/1 27/14/1 +f 22/16/1 20/19/1 28/17/1 +f 20/19/1 18/22/1 29/20/1 +f 18/22/1 16/27/1 30/23/1 +f 14/25/1 31/765/1 30/26/1 +f 14/28/1 12/32/1 32/29/1 +f 10/3/1 33/766/1 32/31/1 +f 38/35/1 37/767/1 41/768/1 +f 37/767/1 39/769/1 41/768/1 +f 39/769/1 40/770/1 41/768/1 +f 41/768/1 42/771/1 43/33/1 +f 43/33/1 44/772/1 45/34/1 +f 45/34/1 46/773/1 47/774/1 +f 47/774/1 48/775/1 45/34/1 +f 48/775/1 38/35/1 45/34/1 +f 41/768/1 43/33/1 38/35/1 +f 60/36/1 50/776/1 55/37/1 +f 53/39/1 52/42/1 72/40/1 +f 52/42/1 53/777/1 55/43/1 +f 79/45/2 64/778/2 69/46/2 +f 51/48/2 54/779/2 81/49/2 +f 56/51/2 49/780/2 58/52/2 +f 104/54/2 103/694/2 92/55/2 +f 49/57/2 56/781/2 54/58/2 +f 183/59/1 182/76/1 71/60/1 +f 83/62/1 80/148/1 65/63/1 +f 61/65/2 62/80/2 74/66/2 +f 183/68/1 68/61/1 66/69/1 +f 58/52/2 57/73/2 76/71/2 +f 57/73/2 63/782/2 75/74/2 +f 184/75/1 72/40/1 71/60/1 +f 83/77/1 67/64/1 59/78/1 +f 62/80/2 64/778/2 79/81/2 +f 181/82/1 84/79/1 59/78/1 +f 85/83/1 101/691/1 102/84/1 +f 91/86/1 107/90/1 108/87/1 +f 86/89/1 105/111/1 107/90/1 +f 112/91/2 111/97/2 99/92/2 +f 98/94/2 110/783/2 112/91/2 +f 90/95/1 93/88/1 108/87/1 +f 111/97/2 109/784/2 94/98/2 +f 115/99/2 116/105/2 97/100/2 +f 89/102/1 114/108/1 113/103/1 +f 116/105/2 110/783/2 98/106/2 +f 90/107/1 106/96/1 114/108/1 +f 94/109/2 109/784/2 104/54/2 +f 86/110/1 87/85/1 102/84/1 +f 884/112/1 883/785/1 881/113/1 +f 143/115/2 144/786/2 155/116/2 +f 133/118/2 156/122/2 155/116/2 +f 133/120/2 134/787/2 145/121/2 +f 135/123/2 146/126/2 145/121/2 +f 136/125/2 147/129/2 146/126/2 +f 137/128/2 148/132/2 147/129/2 +f 138/131/2 149/136/2 148/132/2 +f 138/134/2 139/788/2 150/135/2 +f 140/137/2 151/142/2 150/138/2 +f 140/140/2 141/789/2 152/141/2 +f 141/143/2 142/790/2 153/144/2 +f 143/145/2 154/117/2 153/144/2 +f 69/46/2 70/50/2 81/147/2 +f 82/70/1 66/69/1 65/63/1 +f 75/149/2 63/782/2 61/65/2 +f 159/152/2 158/791/2 157/792/2 +f 157/792/2 168/793/2 159/152/2 +f 168/793/2 167/150/2 159/152/2 +f 167/150/2 166/794/2 163/151/2 +f 166/794/2 165/795/2 163/151/2 +f 165/795/2 164/796/2 163/151/2 +f 163/151/2 162/797/2 161/798/2 +f 161/798/2 160/799/2 163/151/2 +f 160/799/2 159/152/2 163/151/2 +f 193/153/3 202/466/3 201/154/3 +f 191/156/4 200/800/4 199/157/4 +f 189/159/5 198/164/5 197/160/5 +f 192/155/6 201/154/6 200/162/6 +f 190/158/7 199/157/7 198/164/7 +f 197/166/2 198/801/2 199/167/2 +f 199/167/2 200/802/2 202/165/2 +f 200/802/2 201/803/2 202/165/2 +f 197/166/8 202/165/8 601/168/8 +f 600/169/2 601/168/2 196/170/2 +f 188/172/1 205/176/1 206/173/1 +f 187/175/9 204/178/9 205/176/9 +f 185/177/1 203/804/1 204/178/1 +f 194/179/1 209/183/1 210/180/1 +f 193/182/9 208/185/9 209/183/9 +f 193/182/1 192/189/1 207/184/1 +f 190/186/1 211/190/1 212/187/1 +f 212/187/1 207/184/1 192/189/1 +f 189/174/1 206/173/1 211/190/1 +f 227/805/10 203/804/10 229/191/10 +f 203/804/10 185/177/10 229/191/10 +f 186/171/10 196/170/10 230/192/10 +f 231/195/1 232/806/1 235/193/1 +f 232/806/1 233/807/1 235/193/1 +f 233/807/1 234/808/1 235/193/1 +f 235/193/1 236/809/1 237/810/1 +f 237/810/1 238/811/1 239/194/1 +f 239/194/1 240/812/1 241/813/1 +f 241/813/1 242/814/1 239/194/1 +f 242/814/1 231/195/1 239/194/1 +f 235/193/1 237/810/1 239/194/1 +f 247/815/1 255/816/1 256/197/1 +f 256/197/1 266/817/1 267/818/1 +f 267/818/1 268/819/1 256/197/1 +f 268/819/1 257/198/1 256/197/1 +f 257/198/1 258/820/1 251/196/1 +f 258/820/1 259/821/1 251/196/1 +f 259/821/1 260/822/1 251/196/1 +f 251/196/1 250/823/1 249/824/1 +f 249/824/1 248/825/1 247/815/1 +f 247/815/1 256/197/1 249/824/1 +f 249/824/1 256/197/1 251/196/1 +f 265/201/2 264/826/2 263/827/2 +f 263/827/2 262/828/2 265/201/2 +f 262/828/2 261/829/2 265/201/2 +f 261/829/2 269/830/2 270/199/2 +f 270/199/2 274/831/2 273/832/2 +f 273/832/2 271/833/2 270/199/2 +f 271/833/2 272/200/2 270/199/2 +f 272/200/2 277/834/2 265/201/2 +f 277/834/2 276/835/2 265/201/2 +f 276/835/2 275/836/2 265/201/2 +f 261/829/2 270/199/2 265/201/2 +f 289/204/1 278/837/1 279/838/1 +f 279/838/1 280/839/1 281/840/1 +f 281/840/1 282/841/1 283/842/1 +f 283/842/1 284/843/1 281/840/1 +f 284/843/1 285/202/1 281/840/1 +f 285/202/1 286/844/1 287/203/1 +f 287/203/1 288/845/1 289/204/1 +f 289/204/1 279/838/1 285/202/1 +f 279/838/1 281/840/1 285/202/1 +f 340/205/2 361/209/2 360/206/2 +f 339/208/2 362/211/2 361/209/2 +f 338/210/2 363/213/2 362/211/2 +f 338/210/2 337/214/2 364/212/2 +f 337/214/2 336/216/2 365/215/2 +f 336/216/2 335/846/2 366/217/2 +f 317/218/1 358/222/1 359/219/1 +f 318/221/1 357/224/1 358/222/1 +f 319/223/1 356/847/1 357/224/1 +f 355/225/1 356/847/1 319/223/1 +f 354/227/1 355/225/1 320/226/1 +f 353/229/1 354/227/1 321/228/1 +f 353/229/1 322/230/1 349/231/1 +f 347/233/11 375/247/11 378/234/11 +f 350/236/2 341/207/2 360/206/2 +f 351/238/12 373/250/12 374/239/12 +f 366/217/2 335/846/2 352/240/2 +f 351/238/1 316/220/1 359/219/1 +f 391/243/1 386/848/1 382/244/1 +f 377/246/10 378/234/10 375/247/10 +f 379/249/10 374/239/10 373/250/10 +f 350/236/2 346/237/2 378/252/2 +f 348/253/13 345/275/13 379/249/13 +f 350/236/14 377/246/14 376/248/14 +f 351/238/15 348/242/15 380/254/15 +f 352/240/16 374/239/16 379/255/16 +f 349/231/1 376/248/1 375/256/1 +f 389/257/3 383/849/3 384/258/3 +f 392/260/10 391/243/10 389/245/10 +f 353/229/1 347/232/1 389/262/1 +f 347/232/1 383/850/1 389/262/1 +f 384/258/10 383/849/10 347/233/10 +f 346/237/2 360/206/2 390/264/2 +f 360/206/2 381/851/2 390/264/2 +f 387/266/2 392/260/2 390/261/2 +f 348/242/1 359/219/1 391/268/1 +f 359/219/1 386/852/1 391/268/1 +f 391/270/5 392/853/5 388/271/5 +f 366/217/2 345/241/2 392/273/2 +f 345/241/2 388/854/2 392/273/2 +f 385/272/10 388/271/10 345/275/10 +f 397/276/17 401/287/17 404/277/17 +f 395/279/3 399/290/3 398/280/3 +f 394/282/5 397/276/5 400/278/5 +f 396/281/2 398/280/2 397/276/2 +f 393/283/1 400/278/1 399/284/1 +f 402/286/10 403/855/10 404/277/10 +f 398/280/18 402/856/18 401/288/18 +f 400/278/19 404/857/19 403/289/19 +f 399/290/20 403/858/20 402/291/20 +f 369/292/2 370/859/2 411/293/2 +f 368/295/2 369/292/2 410/294/2 +f 368/297/2 409/860/2 408/298/2 +f 367/299/2 408/298/2 407/300/2 +f 333/302/1 416/861/1 417/303/1 +f 415/305/1 416/861/1 333/302/1 +f 414/307/1 415/305/1 334/306/1 +f 324/309/1 425/311/1 414/307/1 +f 325/310/1 424/313/1 425/311/1 +f 326/312/1 423/315/1 424/313/1 +f 327/314/1 422/317/1 423/315/1 +f 328/316/1 421/319/1 422/317/1 +f 329/318/1 420/862/1 421/319/1 +f 419/320/1 420/863/1 329/321/1 +f 418/323/1 419/320/1 330/322/1 +f 417/303/1 418/323/1 331/324/1 +f 428/325/2 433/864/2 431/326/2 +f 427/327/2 431/326/2 432/328/2 +f 430/330/2 426/329/2 432/328/2 +f 429/332/2 430/330/2 434/331/2 +f 372/334/21 429/332/21 435/335/21 +f 405/337/22 433/865/22 428/325/22 +f 441/339/2 440/866/2 446/340/2 +f 441/339/2 445/341/2 444/342/2 +f 442/343/2 444/342/2 443/344/2 +f 437/346/2 436/345/2 443/344/2 +f 438/348/2 437/346/2 449/347/2 +f 439/350/2 438/348/2 448/349/2 +f 455/352/1 459/867/1 460/353/1 +f 457/355/1 459/867/1 455/352/1 +f 458/357/1 457/355/1 456/356/1 +f 450/359/1 463/361/1 458/357/1 +f 452/360/1 462/363/1 463/361/1 +f 453/362/1 461/868/1 462/363/1 +f 482/364/23 486/869/23 484/365/23 +f 470/367/23 474/870/23 472/368/23 +f 467/370/2 465/374/2 469/371/2 +f 464/373/5 468/369/5 469/371/5 +f 466/375/1 470/367/1 468/369/1 +f 467/370/3 471/372/3 470/376/3 +f 472/378/4 474/871/4 475/379/4 +f 471/372/3 475/872/3 474/381/3 +f 469/371/24 473/873/24 475/382/24 +f 468/369/5 472/378/5 473/380/5 +f 477/383/2 481/387/2 483/384/2 +f 476/386/5 480/395/5 481/387/5 +f 476/388/1 478/389/1 482/364/1 +f 479/385/3 483/384/3 482/364/3 +f 484/390/4 486/393/4 487/391/4 +f 483/384/3 487/391/3 486/393/3 +f 481/387/24 485/874/24 487/394/24 +f 480/395/5 484/875/5 485/396/5 +f 489/397/3 491/876/3 490/398/3 +f 491/400/2 495/408/2 494/401/2 +f 495/403/5 493/406/5 492/404/5 +f 493/406/1 489/397/1 488/399/1 +f 494/401/4 492/877/4 488/407/4 +f 491/400/10 489/397/10 493/406/10 +f 186/171/5 185/177/5 197/160/5 +f 185/177/5 187/878/5 188/161/5 +f 197/160/5 185/177/5 188/161/5 +f 496/410/4 498/879/4 499/411/4 +f 503/413/10 502/416/10 500/414/10 +f 499/411/2 498/879/2 502/416/2 +f 513/417/3 515/880/3 514/418/3 +f 497/420/1 501/415/1 500/414/1 +f 508/422/5 510/881/5 511/423/5 +f 504/425/10 509/424/10 511/423/10 +f 505/427/1 508/882/1 509/424/1 +f 505/428/4 507/441/4 510/429/4 +f 510/431/1 524/883/1 525/432/1 +f 520/436/2 514/418/2 515/880/2 +f 515/880/2 521/884/2 520/436/2 +f 521/884/2 519/434/2 520/436/2 +f 522/439/1 516/885/1 517/886/1 +f 517/886/1 523/887/1 522/439/1 +f 523/887/1 513/437/1 522/439/1 +f 526/440/4 524/888/4 510/429/4 +f 511/423/10 525/432/10 527/442/10 +f 528/443/1 530/889/1 531/444/1 +f 535/446/2 534/452/2 532/447/2 +f 531/444/3 535/446/3 533/449/3 +f 528/451/25 532/447/25 534/452/25 +f 531/444/10 530/889/10 534/452/10 +f 539/454/1 538/465/1 536/455/1 +f 540/457/2 542/462/2 543/458/2 +f 541/460/5 543/458/5 539/454/5 +f 542/462/26 540/457/26 536/463/26 +f 539/454/10 543/458/10 542/462/10 +f 193/153/3 194/890/3 195/181/3 +f 195/181/3 196/170/3 193/153/3 +f 196/170/3 601/891/3 202/466/3 +f 228/892/10 230/192/10 210/180/10 +f 230/192/10 196/170/10 195/181/10 +f 607/467/1 606/893/1 605/468/1 +f 608/470/1 609/894/1 602/471/1 +f 602/471/5 610/475/5 611/473/5 +f 609/474/4 616/895/4 610/475/4 +f 608/476/3 617/482/3 616/477/3 +f 603/469/4 613/481/4 615/479/4 +f 605/468/3 612/484/3 613/481/3 +f 604/472/10 611/473/10 617/482/10 +f 606/483/10 614/486/10 612/484/10 +f 607/485/5 615/896/5 614/486/5 +f 624/487/27 622/499/27 626/488/27 +f 618/490/5 622/499/5 624/487/5 +f 633/492/4 632/509/4 630/493/4 +f 621/495/3 625/503/3 623/496/3 +f 619/498/2 623/496/2 622/499/2 +f 629/501/10 628/489/10 626/488/10 +f 625/503/28 629/501/28 627/502/28 +f 623/496/29 627/502/29 626/488/29 +f 620/505/1 624/897/1 628/489/1 +f 628/489/1 629/501/1 621/504/1 +f 629/501/1 625/898/1 621/504/1 +f 636/506/10 638/523/10 639/507/10 +f 632/509/5 640/899/5 634/510/5 +f 639/511/2 643/521/2 640/512/2 +f 631/494/1 630/493/1 638/523/1 +f 630/493/1 634/900/1 638/523/1 +f 638/523/1 636/506/1 631/494/1 +f 632/509/2 633/492/2 637/514/2 +f 635/515/3 641/901/3 633/492/3 +f 636/516/30 642/902/30 641/517/30 +f 634/520/30 640/512/30 643/521/30 +f 641/517/2 642/902/2 637/514/2 +f 649/525/1 650/532/1 658/526/1 +f 644/528/1 645/539/1 652/529/1 +f 644/531/1 651/903/1 658/526/1 +f 660/533/1 649/525/1 656/534/1 +f 649/525/1 657/527/1 656/534/1 +f 656/534/1 655/904/1 648/535/1 +f 659/536/1 648/535/1 654/537/1 +f 648/535/1 655/904/1 654/537/1 +f 654/537/1 653/905/1 646/538/1 +f 646/538/1 653/905/1 652/529/1 +f 647/906/2 670/907/2 671/540/2 +f 671/540/2 672/547/2 664/541/2 +f 675/542/2 647/906/2 671/540/2 +f 670/907/2 647/906/2 669/545/2 +f 647/906/2 674/908/2 669/545/2 +f 674/908/2 663/543/2 669/545/2 +f 673/546/2 665/549/2 664/541/2 +f 673/546/2 666/909/2 661/548/2 +f 661/550/2 666/910/2 667/551/2 +f 667/551/2 668/544/2 663/543/2 +f 686/555/3 687/911/3 691/912/3 +f 691/912/3 690/913/3 689/553/3 +f 689/553/3 688/914/3 684/554/3 +f 684/554/3 685/915/3 686/555/3 +f 686/555/3 691/912/3 689/553/3 +f 693/558/5 692/916/5 698/917/5 +f 698/917/5 697/918/5 699/556/5 +f 699/556/5 696/919/5 695/557/5 +f 695/557/5 694/920/5 693/558/5 +f 693/558/5 698/917/5 699/556/5 +f 683/559/31 679/921/31 677/560/31 +f 682/562/32 680/922/32 676/563/32 +f 682/565/33 678/923/33 679/566/33 +f 681/568/19 677/560/19 676/569/19 +f 706/573/5 707/924/5 701/925/5 +f 701/925/5 702/926/5 700/571/5 +f 700/571/5 703/927/5 704/572/5 +f 704/572/5 705/928/5 706/573/5 +f 706/573/5 701/925/5 700/571/5 +f 713/576/3 712/929/3 708/930/3 +f 708/930/3 709/931/3 710/574/3 +f 710/574/3 711/932/3 715/575/3 +f 715/575/3 714/933/3 713/576/3 +f 713/576/3 708/930/3 710/574/3 +f 776/577/10 719/934/10 717/578/10 +f 720/580/4 722/935/4 723/581/4 +f 716/583/5 721/582/5 723/581/5 +f 721/582/1 716/583/1 774/585/1 +f 716/583/1 775/936/1 774/585/1 +f 717/937/1 720/938/1 773/586/1 +f 720/938/1 721/582/1 773/586/1 +f 773/586/1 772/939/1 717/937/1 +f 719/587/3 722/590/3 720/588/3 +f 722/590/2 719/587/2 777/591/2 +f 719/587/2 776/940/2 777/591/2 +f 718/584/2 723/581/2 778/592/2 +f 723/581/2 722/590/2 778/592/2 +f 778/592/2 779/941/2 718/584/2 +f 726/595/2 725/942/2 734/943/2 +f 725/942/2 724/944/2 734/943/2 +f 724/944/2 735/945/2 734/943/2 +f 734/943/2 733/946/2 732/593/2 +f 732/593/2 731/947/2 730/594/2 +f 730/594/2 729/948/2 728/949/2 +f 728/949/2 727/950/2 730/594/2 +f 727/950/2 726/595/2 730/594/2 +f 734/943/2 732/593/2 726/595/2 +f 718/584/10 779/597/10 775/596/10 +f 779/597/31 778/601/31 774/598/31 +f 777/599/32 776/577/32 772/579/32 +f 778/601/10 777/599/10 773/600/10 +f 784/602/4 787/606/4 786/603/4 +f 781/605/5 786/603/5 787/606/5 +f 782/608/3 784/602/3 785/604/3 +f 783/610/2 787/606/2 784/602/2 +f 780/612/1 785/604/1 786/603/1 +f 802/614/3 800/951/3 788/615/3 +f 801/617/5 803/952/5 791/618/5 +f 806/620/3 804/953/3 792/621/3 +f 805/623/5 807/954/5 795/624/5 +f 804/626/3 802/955/3 790/616/3 +f 791/618/5 803/956/5 805/627/5 +f 810/628/3 808/634/3 796/629/3 +f 797/631/5 809/635/5 811/632/5 +f 808/634/3 806/957/3 794/622/3 +f 795/624/5 807/958/5 809/635/5 +f 819/636/5 817/645/5 813/637/5 +f 816/639/3 818/643/3 814/640/3 +f 820/642/3 822/648/3 818/643/3 +f 823/644/5 821/646/5 817/645/5 +f 827/650/1 845/653/1 844/651/1 +f 845/653/1 829/959/1 856/960/1 +f 858/654/1 828/961/1 844/651/1 +f 845/653/1 856/960/1 858/654/1 +f 865/655/2 859/686/2 847/656/2 +f 841/658/10 862/664/10 863/659/10 +f 863/659/3 862/664/3 857/661/3 +f 851/663/2 857/661/2 862/664/2 +f 848/666/4 860/662/4 857/661/4 +f 864/668/5 866/674/5 867/669/5 +f 850/671/4 864/668/4 865/670/4 +f 852/673/10 867/669/10 866/674/10 +f 840/676/2 866/674/2 864/668/2 +f 860/678/2 848/962/2 846/679/2 +f 865/655/2 867/963/2 868/681/2 +f 860/678/2 870/685/2 871/683/2 +f 859/686/2 865/655/2 869/682/2 +f 870/685/2 860/678/2 861/680/2 +f 859/686/2 869/682/2 870/685/2 +f 887/687/2 880/964/2 882/688/2 +f 883/690/1 884/112/1 101/691/1 +f 885/689/2 882/965/2 92/693/2 +f 886/695/1 881/966/1 88/696/1 +f 880/697/2 887/967/2 115/99/2 +f 893/699/10 892/713/10 888/700/10 +f 894/702/10 895/716/10 891/703/10 +f 906/705/1 904/968/1 900/706/1 +f 905/708/2 907/969/2 903/709/2 +f 910/711/2 897/726/2 893/699/2 +f 892/713/1 896/728/1 908/714/1 +f 895/716/2 899/722/2 911/717/2 +f 909/719/1 898/724/1 894/702/1 +f 903/709/2 907/970/2 911/721/2 +f 909/723/1 906/971/1 902/707/1 +f 910/725/2 905/972/2 901/710/2 +f 900/706/1 904/973/1 908/727/1 +f 919/729/3 918/974/3 916/730/3 +f 919/729/10 917/731/10 912/732/10 +f 917/731/1 916/975/1 913/734/1 +f 913/735/4 916/976/4 918/736/4 +f 921/738/1 920/977/1 918/739/1 +f 918/736/4 920/978/4 922/741/4 +f 919/729/10 914/733/10 923/742/10 +f 927/743/4 926/750/4 924/744/4 +f 928/746/10 930/749/10 931/747/10 +f 927/743/2 931/747/2 930/749/2 +f 934/751/5 935/757/5 933/752/5 +f 928/746/1 929/748/1 925/754/1 +f 935/757/2 934/751/2 940/758/2 +f 940/758/2 938/979/2 939/980/2 +f 939/980/2 941/756/2 940/758/2 +f 937/760/1 936/981/1 942/761/1 +f 942/761/1 932/982/1 933/983/1 +f 933/983/1 943/759/1 942/761/1 s 1 -f 2//3 3//48 1//3 -f 4//48 5//49 3//48 -f 6//49 7//6 5//49 -f 8//6 9//50 7//6 -f 10//50 11//28 9//50 -f 12//28 13//5 11//28 -f 14//5 15//27 13//5 -f 16//27 17//51 15//27 -f 18//51 19//4 17//51 -f 20//4 21//52 19//4 -f 22//52 23//53 21//52 -f 24//53 1//3 23//53 -f 29//49 40//6 28//6 -f 36//27 47//51 35//51 -f 26//28 38//5 25//5 -f 33//52 44//53 32//53 -f 30//48 41//49 29//49 -f 25//5 48//27 36//27 -f 27//50 37//28 26//28 -f 34//4 45//52 33//52 -f 31//3 42//48 30//48 -f 28//6 39//50 27//50 -f 35//51 46//4 34//4 -f 32//53 43//3 31//3 -f 49//3 54//54 50//3 -f 53//54 56//1 54//54 -f 55//1 58//55 56//1 -f 57//55 60//56 58//55 -f 59//56 62//56 60//56 -f 52//57 82//58 79//58 -f 61//56 66//5 62//56 -f 73//59 72//46 70//57 -f 69//60 71//45 74//61 -f 73//59 50//6 63//6 -f 67//62 64//4 49//4 -f 63//6 50//6 60//6 -f 57//4 55//4 53//4 -f 81//63 69//60 51//60 -f 79//58 84//63 81//63 -f 107//64 110//65 108//65 -f 111//66 110//65 115//66 -f 111//66 117//58 113//58 -f 113//58 118//63 114//63 -f 114//63 116//67 112//67 -f 120//68 116//67 122//68 -f 120//68 121//69 119//69 -f 121//69 125//70 119//69 -f 107//64 124//71 109//64 -f 123//71 126//70 124//71 -f 143//64 146//65 144//65 -f 147//66 146//65 151//66 -f 147//66 153//58 149//58 -f 149//58 154//63 150//63 -f 150//63 152//67 148//67 -f 156//68 152//67 158//68 -f 156//68 157//69 155//69 -f 157//69 161//70 155//69 -f 143//64 160//71 145//64 -f 159//71 162//70 160//71 -f 168//72 172//73 163//74 -f 170//63 176//75 167//58 -f 169//76 173//77 178//78 -f 172//73 662//79 659//80 -f 174//81 166//82 165//71 -f 170//63 178//78 177//83 -f 172//73 164//70 163//74 -f 176//75 168//72 167//58 -f 164//70 174//81 165//71 -f 190//27 203//5 179//5 -f 180//28 205//50 181//50 -f 187//52 212//4 188//4 -f 184//48 209//3 185//3 -f 181//50 206//6 182//6 -f 188//4 213//51 189//51 -f 185//3 210//53 186//53 -f 182//6 207//49 183//49 -f 189//51 214//27 190//27 -f 179//5 204//28 180//28 -f 186//53 211//52 187//52 -f 183//49 208//48 184//48 -f 197//28 220//5 196//5 -f 194//51 217//4 193//4 -f 201//48 224//49 200//49 -f 191//53 226//3 202//3 -f 198//50 221//28 197//28 -f 195//27 218//51 194//51 -f 202//3 225//48 201//48 -f 192//52 215//53 191//53 -f 199//6 222//50 198//50 -f 196//5 219//27 195//27 -f 193//4 216//52 192//52 -f 200//49 223//6 199//6 -f 272//52 261//4 260//52 -f 279//6 268//49 267//6 -f 276//5 265//28 264//5 -f 273//4 262//51 261//4 -f 280//49 269//48 268//49 -f 282//3 259//53 270//3 -f 277//28 266//50 265//28 -f 274//51 263//27 262//51 -f 281//48 270//3 269//48 -f 271//53 260//52 259//53 -f 278//50 267//6 266//50 -f 275//27 264//5 263//27 -f 289//52 302//84 290//84 -f 296//85 309//49 297//49 -f 298//48 309//49 310//48 -f 287//3 299//53 288//53 -f 298//48 300//3 287//3 -f 288//53 301//52 289//52 -f 314//53 329//52 315//52 -f 322//85 332//49 323//49 -f 315//52 330//84 316//84 -f 323//49 333//48 324//48 -f 324//48 328//3 313//3 -f 313//3 327//53 314//53 -f 348//4 337//51 336//4 -f 355//49 344//48 343//49 -f 357//3 334//53 345//3 -f 352//28 341//50 340//28 -f 349//51 338//27 337//51 -f 356//48 345//3 344//48 -f 346//53 335//52 334//53 -f 353//50 342//6 341//50 -f 350//27 339//5 338//27 -f 347//52 336//4 335//52 -f 354//6 343//49 342//6 -f 351//5 340//28 339//5 -f 362//53 368//3 361//3 -f 360//48 366//49 359//49 -f 363//52 369//53 362//53 -f 361//3 367//48 360//48 -f 359//49 365//85 358//85 -f 364//84 370//52 363//52 -f 394//5 376//28 375//5 -f 395//28 377//50 376//28 -f 396//50 378//14 377//50 -f 391//13 373//51 372//13 -f 392//51 374//27 373//51 -f 393//27 375//5 374//27 -f 424//5 384//27 425//27 -f 427//86 381//52 428//87 -f 399//88 389//49 388//6 -f 423//28 385//5 424//5 -f 426//89 382//4 427//86 -f 400//90 386//28 423//28 -f 425//27 383//51 426//89 -f 428//87 381//52 380//53 -f 485//3 380//53 379//3 -f 400//90 388//6 387//50 -f 399//91 463//92 398//93 -f 427//94 471//95 470//96 -f 426//97 470//96 469//98 -f 399//91 465//95 464//99 -f 486//48 379//3 390//48 -f 496//53 517//3 495//3 -f 497//52 516//53 496//53 -f 504//49 521//85 503//85 -f 498//84 518//52 497//52 -f 505//48 522//49 504//49 -f 495//3 523//48 505//48 -f 390//48 389//49 398//100 -f 662//79 669//101 670//102 -f 171//103 659//80 660//104 -f 171//103 655//105 174//81 -f 178//78 658//106 177//83 -f 174//81 656//107 173//77 -f 173//77 657//108 178//78 -f 175//109 661//110 662//79 -f 177//83 661//110 176//75 -f 666//111 673//112 669//101 -f 657//108 666//111 658//106 -f 656//107 665//113 657//108 -f 660//104 663//114 655//105 -f 660//104 667//115 668//116 -f 655//105 664//117 656//107 -f 658//106 669//101 661//110 -f 659//80 670//102 667//115 -f 669//101 674//118 670//102 -f 666//111 671//119 672//120 -f 672//120 677//121 673//112 -f 673//112 678//122 674//118 -f 672//120 675//123 676//124 -f 676//124 681//125 677//121 -f 677//121 682//126 678//122 -f 675//123 680//127 676//124 -f 668//116 683//128 663//114 -f 668//116 685//129 686//130 -f 663//114 684//131 664//117 -f 686//130 687//132 683//128 -f 685//129 690//133 686//130 -f 684//131 687//132 688//134 -f 690//133 691//135 687//132 -f 690//133 693//136 694//137 -f 687//132 692//138 688//134 -f 694//137 695//139 691//135 -f 694//137 697//140 698//141 -f 691//135 696//142 692//138 -f 698//141 699//143 695//139 -f 697//140 702//144 698//141 -f 695//139 700//145 696//142 -f 702//144 703//146 699//143 -f 702//144 705//147 706//148 -f 699//143 704//149 700//145 -f 706//148 707//150 703//146 -f 705//147 710//151 706//148 -f 703//146 708//152 704//149 -f 674//118 689//153 670//102 -f 684//131 665//113 664//117 -f 708//152 680//127 679//154 -f 681//125 709//155 682//126 -f 707//150 681//125 680//127 -f 675//123 704//149 679//154 -f 688//134 671//119 665//113 -f 692//138 696//142 704//149 -f 679//154 704//149 708//152 -f 705//147 682//126 709//155 -f 705//147 678//122 682//126 -f 693//136 705//147 697//140 -f 685//129 670//102 689//153 -f 756//42 774//156 757//156 -f 764//6 778//8 763//8 -f 757//156 785//4 770//4 -f 765//41 779//6 764//6 -f 771//6 775//157 760//157 -f 766//3 780//41 765//41 -f 767//42 781//3 766//3 -f 768//4 782//42 767//42 -f 760//157 776//41 761//41 -f 769//7 783//4 768//4 -f 761//41 772//3 755//3 -f 755//3 773//42 756//42 -f 762//5 784//7 769//7 -f 763//8 777//5 762//5 -f 800//10 807//1 799//1 -f 801//5 806//10 800//10 -f 796//3 809//43 797//43 -f 797//43 803//2 798//2 -f 802//9 805//5 801//5 -f 798//2 804//9 802//9 -f 795//158 808//3 796//3 -f 799//1 810//158 795//158 -f 816//10 823//1 815//1 -f 817//5 822//10 816//10 -f 812//3 825//43 813//43 -f 813//43 819//2 814//2 -f 818//9 821//5 817//5 -f 814//2 820//9 818//9 -f 811//158 824//3 812//3 -f 815//1 826//158 811//158 -f 842//28 853//159 841//5 -f 839//51 850//160 838//4 -f 846//48 857//161 845//49 -f 836//53 847//162 835//3 -f 843//50 854//163 842//28 -f 840//27 851//164 839//51 -f 835//3 858//165 846//48 -f 837//52 848//166 836//53 -f 844//6 855//167 843//50 -f 841//5 852//168 840//27 -f 838//4 849//169 837//52 -f 845//49 856//170 844//6 -f 851//164 864//171 863//172 -f 858//165 859//173 870//174 -f 849//169 860//175 848//166 -f 855//167 868//176 867//177 -f 853//159 864//171 852//168 -f 849//169 862//178 861//179 -f 857//161 868//176 856//170 -f 853//159 866//180 865//181 -f 851//164 862//178 850//160 -f 858//165 869//182 857//161 -f 848//166 859//173 847//162 -f 855//167 866//180 854//163 -f 863//172 876//183 875//184 -f 870//174 871//185 882//186 -f 860//175 873//187 872//188 -f 867//177 880//189 879//190 -f 865//181 876//183 864//171 -f 862//178 873//187 861//179 -f 868//176 881//191 880//189 -f 865//181 878//192 877//193 -f 862//178 875//184 874//194 -f 870//174 881//191 869//182 -f 860//175 871//185 859//173 -f 867//177 878//192 866//180 -f 875//184 879//190 871//185 -f 902//195 899//2 900//2 -f 904//196 901//195 902//195 -f 906//55 903//196 904//196 -f 908//197 905//55 906//55 -f 910//29 907//197 908//197 -f 912//1 913//198 914//198 -f 916//54 917//199 918//199 -f 917//199 920//200 918//199 -f 920//200 921//24 922//24 -f 915//54 914//198 913//198 -f 929//201 926//29 925//29 -f 924//30 927//202 923//30 -f 928//202 931//195 927//202 -f 933//203 930//201 929//201 -f 936//204 933//203 935//204 -f 936//204 931//195 932//195 -f 2//3 4//48 3//48 -f 4//48 6//49 5//49 -f 6//49 8//6 7//6 -f 8//6 10//50 9//50 -f 10//50 12//28 11//28 -f 12//28 14//5 13//5 -f 14//5 16//27 15//27 -f 16//27 18//51 17//51 -f 18//51 20//4 19//4 -f 20//4 22//52 21//52 -f 22//52 24//53 23//53 -f 24//53 2//3 1//3 -f 29//49 41//49 40//6 -f 36//27 48//27 47//51 -f 26//28 37//28 38//5 -f 33//52 45//52 44//53 -f 30//48 42//48 41//49 -f 25//5 38//5 48//27 -f 27//50 39//50 37//28 -f 34//4 46//4 45//52 -f 31//3 43//3 42//48 -f 28//6 40//6 39//50 -f 35//51 47//51 46//4 -f 32//53 44//53 43//3 -f 49//3 53//54 54//54 -f 53//54 55//1 56//1 -f 55//1 57//55 58//55 -f 57//55 59//56 60//56 -f 59//56 61//56 62//56 -f 52//57 70//57 82//58 -f 61//56 65//5 66//5 -f 70//57 52//57 73//59 -f 52//57 68//205 73//59 -f 74//61 67//62 51//60 -f 51//60 69//60 74//61 -f 73//59 68//205 50//6 -f 67//62 74//61 64//4 -f 50//6 54//6 58//6 -f 54//6 56//6 58//6 -f 58//6 60//6 50//6 -f 60//6 62//6 63//6 -f 62//6 66//6 78//6 -f 63//6 62//6 75//6 -f 78//6 75//6 62//6 -f 53//4 49//4 57//4 -f 49//4 64//4 59//4 -f 59//4 64//4 61//4 -f 64//4 76//4 61//4 -f 76//4 77//4 61//4 -f 77//4 65//4 61//4 -f 59//4 57//4 49//4 -f 81//63 84//63 69//60 -f 79//58 82//58 84//63 -f 107//64 109//64 110//65 -f 111//66 108//65 110//65 -f 111//66 115//66 117//58 -f 113//58 117//58 118//63 -f 114//63 118//63 116//67 -f 120//68 112//67 116//67 -f 120//68 122//68 121//69 -f 121//69 126//70 125//70 -f 107//64 123//71 124//71 -f 123//71 125//70 126//70 -f 143//64 145//64 146//65 -f 147//66 144//65 146//65 -f 147//66 151//66 153//58 -f 149//58 153//58 154//63 -f 150//63 154//63 152//67 -f 156//68 148//67 152//67 -f 156//68 158//68 157//69 -f 157//69 162//70 161//70 -f 143//64 159//71 160//71 -f 159//71 161//70 162//70 -f 168//72 175//109 172//73 -f 170//63 177//83 176//75 -f 169//76 166//82 173//77 -f 172//73 175//109 662//79 -f 174//81 173//77 166//82 -f 170//63 169//76 178//78 -f 172//73 171//103 164//70 -f 176//75 175//109 168//72 -f 164//70 171//103 174//81 -f 190//27 214//27 203//5 -f 180//28 204//28 205//50 -f 187//52 211//52 212//4 -f 184//48 208//48 209//3 -f 181//50 205//50 206//6 -f 188//4 212//4 213//51 -f 185//3 209//3 210//53 -f 182//6 206//6 207//49 -f 189//51 213//51 214//27 -f 179//5 203//5 204//28 -f 186//53 210//53 211//52 -f 183//49 207//49 208//48 -f 197//28 221//28 220//5 -f 194//51 218//51 217//4 -f 201//48 225//48 224//49 -f 191//53 215//53 226//3 -f 198//50 222//50 221//28 -f 195//27 219//27 218//51 -f 202//3 226//3 225//48 -f 192//52 216//52 215//53 -f 199//6 223//6 222//50 -f 196//5 220//5 219//27 -f 193//4 217//4 216//52 -f 200//49 224//49 223//6 -f 272//52 273//4 261//4 -f 279//6 280//49 268//49 -f 276//5 277//28 265//28 -f 273//4 274//51 262//51 -f 280//49 281//48 269//48 -f 282//3 271//53 259//53 -f 277//28 278//50 266//50 -f 274//51 275//27 263//27 -f 281//48 282//3 270//3 -f 271//53 272//52 260//52 -f 278//50 279//6 267//6 -f 275//27 276//5 264//5 -f 289//52 301//52 302//84 -f 296//85 308//85 309//49 -f 298//48 297//49 309//49 -f 287//3 300//3 299//53 -f 298//48 310//48 300//3 -f 288//53 299//53 301//52 -f 314//53 327//53 329//52 -f 322//85 331//85 332//49 -f 315//52 329//52 330//84 -f 323//49 332//49 333//48 -f 324//48 333//48 328//3 -f 313//3 328//3 327//53 -f 348//4 349//51 337//51 -f 355//49 356//48 344//48 -f 357//3 346//53 334//53 -f 352//28 353//50 341//50 -f 349//51 350//27 338//27 -f 356//48 357//3 345//3 -f 346//53 347//52 335//52 -f 353//50 354//6 342//6 -f 350//27 351//5 339//5 -f 347//52 348//4 336//4 -f 354//6 355//49 343//49 -f 351//5 352//28 340//28 -f 362//53 369//53 368//3 -f 360//48 367//48 366//49 -f 363//52 370//52 369//53 -f 361//3 368//3 367//48 -f 359//49 366//49 365//85 -f 364//84 371//84 370//52 -f 394//5 395//28 376//28 -f 395//28 396//50 377//50 -f 396//50 397//14 378//14 -f 391//13 392//51 373//51 -f 392//51 393//27 374//27 -f 393//27 394//5 375//5 -f 424//5 385//5 384//27 -f 427//86 382//4 381//52 -f 399//88 398//100 389//49 -f 423//28 386//28 385//5 -f 426//89 383//51 382//4 -f 400//90 387//50 386//28 -f 425//27 384//27 383//51 -f 380//53 489//53 428//87 -f 489//53 488//42 428//87 -f 485//3 489//53 380//53 -f 400//90 399//88 388//6 -f 399//91 464//99 463//92 -f 427//94 428//206 471//95 -f 426//97 427//94 470//96 -f 399//91 400//206 465//95 -f 486//48 485//3 379//3 -f 496//53 516//53 517//3 -f 497//52 518//52 516//53 -f 504//49 522//49 521//85 -f 498//84 519//84 518//52 -f 505//48 523//48 522//49 -f 495//3 517//3 523//48 -f 487//41 486//48 398//100 -f 486//48 390//48 398//100 -f 662//79 661//110 669//101 -f 171//103 172//73 659//80 -f 171//103 660//104 655//105 -f 178//78 657//108 658//106 -f 174//81 655//105 656//107 -f 173//77 656//107 657//108 -f 175//109 176//75 661//110 -f 177//83 658//106 661//110 -f 666//111 672//120 673//112 -f 657//108 665//113 666//111 -f 656//107 664//117 665//113 -f 660//104 668//116 663//114 -f 660//104 659//80 667//115 -f 655//105 663//114 664//117 -f 658//106 666//111 669//101 -f 659//80 662//79 670//102 -f 669//101 673//112 674//118 -f 666//111 665//113 671//119 -f 672//120 676//124 677//121 -f 673//112 677//121 678//122 -f 672//120 671//119 675//123 -f 676//124 680//127 681//125 -f 677//121 681//125 682//126 -f 675//123 679//154 680//127 -f 668//116 686//130 683//128 -f 668//116 667//115 685//129 -f 663//114 683//128 684//131 -f 686//130 690//133 687//132 -f 685//129 689//153 690//133 -f 684//131 683//128 687//132 -f 690//133 694//137 691//135 -f 690//133 689//153 693//136 -f 687//132 691//135 692//138 -f 694//137 698//141 695//139 -f 694//137 693//136 697//140 -f 691//135 695//139 696//142 -f 698//141 702//144 699//143 -f 697//140 701//207 702//144 -f 695//139 699//143 700//145 -f 702//144 706//148 703//146 -f 702//144 701//207 705//147 -f 699//143 703//146 704//149 -f 706//148 710//151 707//150 -f 705//147 709//155 710//151 -f 703//146 707//150 708//152 -f 674//118 678//122 689//153 -f 684//131 688//134 665//113 -f 708//152 707//150 680//127 -f 681//125 710//151 709//155 -f 707//150 710//151 681//125 -f 688//134 675//123 671//119 -f 700//145 704//149 696//142 -f 704//149 675//123 692//138 -f 675//123 688//134 692//138 -f 693//136 689//153 678//122 -f 678//122 705//147 693//136 -f 705//147 701//207 697//140 -f 685//129 667//115 670//102 -f 756//42 773//42 774//156 -f 764//6 779//6 778//8 -f 757//156 774//156 785//4 -f 765//41 780//41 779//6 -f 771//6 786//6 775//157 -f 766//3 781//3 780//41 -f 767//42 782//42 781//3 -f 768//4 783//4 782//42 -f 760//157 775//157 776//41 -f 769//7 784//7 783//4 -f 761//41 776//41 772//3 -f 755//3 772//3 773//42 -f 762//5 777//5 784//7 -f 763//8 778//8 777//5 -f 800//10 806//10 807//1 -f 801//5 805//5 806//10 -f 796//3 808//3 809//43 -f 797//43 809//43 803//2 -f 802//9 804//9 805//5 -f 798//2 803//2 804//9 -f 795//158 810//158 808//3 -f 799//1 807//1 810//158 -f 816//10 822//10 823//1 -f 817//5 821//5 822//10 -f 812//3 824//3 825//43 -f 813//43 825//43 819//2 -f 818//9 820//9 821//5 -f 814//2 819//2 820//9 -f 811//158 826//158 824//3 -f 815//1 823//1 826//158 -f 842//28 854//163 853//159 -f 839//51 851//164 850//160 -f 846//48 858//165 857//161 -f 836//53 848//166 847//162 -f 843//50 855//167 854//163 -f 840//27 852//168 851//164 -f 835//3 847//162 858//165 -f 837//52 849//169 848//166 -f 844//6 856//170 855//167 -f 841//5 853//159 852//168 -f 838//4 850//160 849//169 -f 845//49 857//161 856//170 -f 851//164 852//168 864//171 -f 858//165 847//162 859//173 -f 849//169 861//179 860//175 -f 855//167 856//170 868//176 -f 853//159 865//181 864//171 -f 849//169 850//160 862//178 -f 857//161 869//182 868//176 -f 853//159 854//163 866//180 -f 851//164 863//172 862//178 -f 858//165 870//174 869//182 -f 848//166 860//175 859//173 -f 855//167 867//177 866//180 -f 863//172 864//171 876//183 -f 870//174 859//173 871//185 -f 860//175 861//179 873//187 -f 867//177 868//176 880//189 -f 865//181 877//193 876//183 -f 862//178 874//194 873//187 -f 868//176 869//182 881//191 -f 865//181 866//180 878//192 -f 862//178 863//172 875//184 -f 870//174 882//186 881//191 -f 860//175 872//188 871//185 -f 867//177 879//190 878//192 -f 871//185 872//188 875//184 -f 872//188 873//187 875//184 -f 873//187 874//194 875//184 -f 875//184 876//183 877//193 -f 877//193 878//192 879//190 -f 879//190 880//189 881//191 -f 881//191 882//186 879//190 -f 882//186 871//185 879//190 -f 875//184 877//193 879//190 -f 902//195 901//195 899//2 -f 904//196 903//196 901//195 -f 906//55 905//55 903//196 -f 908//197 907//197 905//55 -f 910//29 909//29 907//197 -f 912//1 911//1 913//198 -f 916//54 915//54 917//199 -f 917//199 919//200 920//200 -f 920//200 919//200 921//24 -f 915//54 916//54 914//198 -f 929//201 930//201 926//29 -f 924//30 928//202 927//202 -f 928//202 932//195 931//195 -f 933//203 934//203 930//201 -f 936//204 934//203 933//203 -f 936//204 935//204 931//195 +f 2/13/10 3/984/34 1/985/10 +f 4/6/34 5/986/35 3/984/34 +f 8/1/5 9/987/36 7/988/5 +f 10/3/36 11/989/22 9/987/36 +f 12/32/22 13/990/4 11/989/22 +f 14/25/4 15/991/21 13/992/4 +f 16/27/21 17/993/37 15/991/21 +f 18/22/37 19/994/3 17/993/37 +f 20/19/3 21/995/38 19/994/3 +f 22/16/38 23/996/39 21/995/38 +f 24/11/39 1/985/10 23/996/39 +f 29/20/35 40/997/5 28/21/5 +f 36/763/21 47/998/37 35/7/37 +f 26/764/22 38/999/4 25/12/4 +f 33/766/38 44/1000/39 32/31/39 +f 30/23/34 41/1001/35 29/24/35 +f 25/9/4 48/1002/21 36/10/21 +f 27/14/36 37/1003/22 26/15/22 +f 34/762/3 45/1004/38 33/2/38 +f 31/765/10 42/1005/34 30/26/34 +f 28/17/5 39/1006/36 27/18/36 +f 35/4/37 46/1007/3 34/5/3 +f 32/29/39 43/1008/10 31/30/10 +f 49/780/40 60/36/41 58/52/41 +f 59/78/42 58/52/41 60/36/41 +f 59/78/42 63/782/43 57/73/42 +f 65/63/44 63/782/27 67/64/27 +f 68/61/28 62/80/45 66/69/45 +f 72/40/46 69/46/47 71/60/47 +f 66/69/45 61/65/44 65/63/44 +f 52/42/48 49/57/40 51/48/48 +f 72/40/46 51/48/48 70/50/46 +f 854/1009/9 835/1010/9 855/1011/9 +f 101/691/46 104/54/47 102/84/47 +f 105/111/49 104/54/47 109/784/49 +f 105/111/28 111/97/45 107/90/45 +f 107/90/45 112/91/44 108/87/44 +f 108/87/44 110/783/27 106/96/27 +f 114/108/42 110/783/43 116/105/42 +f 114/108/42 115/99/41 113/103/41 +f 884/112/48 887/687/40 885/689/48 +f 122/1012/50 126/1013/51 117/1014/52 +f 124/1015/44 130/1016/53 121/1017/45 +f 123/1018/54 127/1019/55 132/1020/56 +f 126/1013/51 551/1021/57 548/1022/58 +f 128/1023/59 120/1024/60 119/1025/48 +f 124/1015/44 132/1020/56 131/1026/61 +f 126/1027/51 118/1028/40 117/1029/52 +f 130/1016/53 122/1030/50 121/1017/45 +f 118/1028/40 128/1023/59 119/1025/48 +f 68/61/49 69/46/47 64/778/49 +f 144/119/21 157/1031/4 133/118/4 +f 134/124/22 159/1032/36 135/123/36 +f 141/143/38 166/1033/3 142/790/3 +f 138/134/34 163/1034/10 139/788/10 +f 135/127/36 160/1035/5 136/125/5 +f 142/146/3 167/1036/37 143/145/37 +f 139/139/10 164/1037/39 140/137/39 +f 136/130/5 161/1038/35 137/128/35 +f 143/115/37 168/1039/21 144/786/21 +f 133/120/4 158/1040/22 134/787/22 +f 140/140/39 165/1041/38 141/789/38 +f 137/133/35 162/1042/34 138/131/34 +f 151/142/22 174/1043/4 150/138/4 +f 148/132/37 171/1044/3 147/129/3 +f 155/116/34 178/1045/35 154/117/35 +f 145/121/39 180/1046/10 156/122/10 +f 152/141/36 175/1047/22 151/142/22 +f 149/136/21 172/1048/37 148/132/37 +f 156/122/10 179/1049/34 155/116/34 +f 146/126/38 169/1050/39 145/121/39 +f 153/144/5 176/1051/36 152/141/36 +f 150/135/4 173/1052/21 149/136/21 +f 147/129/3 170/1053/38 146/126/38 +f 154/117/35 177/1054/5 153/144/5 +f 221/1055/38 215/1056/62 214/1057/38 +f 223/1058/63 217/1059/35 216/1060/63 +f 224/1061/35 218/1062/34 217/1059/35 +f 226/1063/10 213/1064/39 219/1065/10 +f 225/1066/34 219/1065/10 218/1062/34 +f 220/1067/39 214/1057/38 213/1064/39 +f 233/1068/38 246/1069/62 234/1070/62 +f 241/1071/35 252/1072/63 253/1073/35 +f 242/1074/34 253/1073/35 254/1075/34 +f 231/1076/10 243/1077/39 232/1078/39 +f 242/1074/34 244/1079/10 231/1076/10 +f 232/1078/39 245/1080/38 233/1068/38 +f 258/1081/39 273/1082/38 259/1083/38 +f 266/1084/63 276/1085/35 267/1086/35 +f 259/1083/38 274/1087/62 260/1088/62 +f 267/1086/35 277/1089/34 268/1090/34 +f 268/1090/34 272/1091/10 257/1092/10 +f 257/1092/10 271/1093/39 258/1081/39 +f 292/1094/3 281/1095/37 280/1096/3 +f 299/1097/35 288/1098/34 287/1099/35 +f 301/1100/10 278/1101/39 289/1102/10 +f 296/1103/22 285/1104/36 284/1105/22 +f 293/1106/37 282/1107/21 281/1095/37 +f 300/1108/34 289/1102/10 288/1098/34 +f 290/1109/39 279/1110/38 278/1101/39 +f 297/1111/36 286/1112/5 285/1104/36 +f 294/1113/21 283/1114/4 282/1107/21 +f 291/1115/38 280/1096/3 279/1110/38 +f 298/1116/5 287/1099/35 286/1112/5 +f 295/1117/4 284/1105/22 283/1118/4 +f 306/1119/39 312/1120/10 305/1121/10 +f 304/1122/34 310/1123/35 303/1124/35 +f 307/1125/38 313/1126/39 306/1119/39 +f 305/1121/10 311/1127/34 304/1122/34 +f 303/1124/35 309/1128/63 302/1129/63 +f 308/1130/62 314/1131/38 307/1125/38 +f 338/210/4 320/226/22 319/223/4 +f 339/208/22 321/228/36 320/226/22 +f 340/205/36 322/230/64 321/228/36 +f 335/846/65 317/218/37 316/220/65 +f 336/216/37 318/221/21 317/218/37 +f 337/214/21 319/223/4 318/221/21 +f 341/207/64 349/231/66 322/230/64 +f 368/1132/4 328/316/21 369/1133/21 +f 371/1134/67 325/310/38 372/334/68 +f 343/1135/69 333/302/35 332/304/5 +f 367/1136/22 329/321/4 368/1137/4 +f 370/1138/70 326/312/3 371/1134/67 +f 344/1139/71 330/322/22 367/1136/22 +f 369/1133/21 327/314/37 370/1138/70 +f 372/334/68 325/310/38 324/309/39 +f 426/329/10 324/309/39 323/308/10 +f 344/1139/71 332/304/5 331/324/36 +f 335/846/65 351/238/72 352/240/72 +f 343/1140/73 405/1141/74 342/1142/75 +f 371/1143/76 413/1144/77 412/1145/78 +f 371/1143/76 411/293/74 370/859/79 +f 344/301/80 406/1146/81 343/1140/73 +f 427/327/34 323/308/10 334/306/34 +f 437/346/39 451/358/10 436/345/10 +f 438/348/38 450/359/39 437/346/39 +f 441/339/35 454/354/63 440/866/63 +f 439/350/62 452/360/38 438/348/38 +f 442/343/34 455/352/35 441/339/35 +f 436/345/10 456/356/34 442/343/34 +f 334/306/34 333/302/35 342/338/82 +f 519/434/83 516/885/84 518/435/84 +f 518/435/84 522/1147/85 520/1148/85 +f 515/1149/10 523/1150/86 521/1151/86 +f 521/1151/86 517/886/83 519/434/83 +f 520/1148/85 512/1152/4 514/1153/4 +f 524/883/87 527/1154/88 525/432/87 +f 526/1155/88 506/1156/89 527/1154/88 +f 551/1157/57 558/1158/90 559/1159/91 +f 125/1160/92 548/1161/58 549/1162/93 +f 125/1160/92 544/1163/94 128/1023/59 +f 132/1020/56 547/1164/95 131/1026/61 +f 128/1023/59 545/1165/96 127/1166/55 +f 127/1019/55 546/1167/97 132/1020/56 +f 129/1168/98 550/1169/99 551/1157/57 +f 131/1026/61 550/1169/99 130/1016/53 +f 555/1170/100 562/1171/101 558/1172/102 +f 546/1173/97 555/1174/103 547/1164/95 +f 545/1175/96 554/1176/104 546/1167/97 +f 549/1162/93 552/1177/105 544/1163/94 +f 549/1162/93 556/1178/106 557/1179/107 +f 544/1163/94 553/1180/108 545/1165/96 +f 547/1164/95 558/1158/90 550/1169/99 +f 548/1022/58 559/1181/91 556/1182/106 +f 558/1172/102 563/1183/109 559/1184/91 +f 555/1170/100 560/1185/110 561/1186/111 +f 561/1186/111 566/1187/112 562/1171/101 +f 562/1171/101 567/1188/113 563/1183/109 +f 561/1186/111 564/1189/114 565/1190/115 +f 565/1190/115 570/1191/116 566/1187/112 +f 566/1187/112 571/1192/117 567/1188/113 +f 564/1189/114 569/1193/118 565/1190/115 +f 557/1179/107 572/1194/119 552/1177/105 +f 557/1179/107 574/1195/120 575/1196/121 +f 552/1177/105 573/1197/122 553/1180/108 +f 575/1198/123 576/1199/124 572/1200/125 +f 574/1201/120 579/1202/126 575/1198/123 +f 573/1203/122 576/1199/124 577/1204/127 +f 579/1202/126 580/1205/128 576/1199/124 +f 579/1202/126 582/1206/129 583/1207/130 +f 576/1199/124 581/1208/131 577/1204/127 +f 583/1207/130 584/1209/132 580/1205/128 +f 583/1207/130 586/1210/133 587/1211/134 +f 580/1205/128 585/1212/135 581/1208/131 +f 587/1211/134 588/1213/136 584/1209/132 +f 586/1210/133 591/1214/137 587/1211/134 +f 584/1209/132 589/1215/138 585/1212/135 +f 591/1216/137 592/1217/139 588/1218/136 +f 591/1216/137 594/1219/140 595/1220/141 +f 588/1218/136 593/1221/142 589/1222/138 +f 595/1220/141 596/1223/143 592/1217/139 +f 594/1224/140 599/1225/144 595/1220/141 +f 592/1217/139 597/1226/145 593/1227/142 +f 563/1228/109 578/1229/146 559/1181/91 +f 573/1230/122 554/1176/104 553/1231/108 +f 597/1232/145 569/1233/118 568/1234/147 +f 570/1235/116 598/1236/148 571/1237/117 +f 596/1223/143 570/1235/116 569/1233/118 +f 564/1189/114 593/1227/142 568/1238/147 +f 577/1239/127 560/1240/110 554/1176/104 +f 581/1241/131 585/1212/135 593/1227/142 +f 568/1238/147 593/1227/142 597/1226/145 +f 594/1242/140 571/1243/117 598/1244/148 +f 594/1242/140 567/1245/113 571/1243/117 +f 582/1246/129 594/1242/140 586/1247/133 +f 574/1248/120 559/1181/91 578/1229/146 +f 645/539/28 663/543/149 646/538/149 +f 653/1249/5 667/1250/7 652/1251/7 +f 646/538/149 674/908/3 659/536/3 +f 654/1252/27 668/1253/5 653/1249/5 +f 660/1254/5 664/541/150 649/1255/150 +f 655/1256/10 669/1257/27 654/1252/27 +f 656/1258/28 670/1259/10 655/1256/10 +f 657/1260/3 671/1261/28 656/1258/28 +f 649/1255/150 665/549/27 650/1262/27 +f 658/1263/6 672/1264/3 657/1260/3 +f 650/1262/27 661/548/10 644/1265/10 +f 644/528/10 662/552/28 645/539/28 +f 651/1266/4 673/1267/6 658/1263/6 +f 652/1251/7 666/1268/4 651/1269/4 +f 689/1270/9 696/1271/1 688/1272/1 +f 690/1273/4 695/1274/9 689/1270/9 +f 685/1275/10 698/1276/29 686/1277/29 +f 686/1277/29 692/1278/2 687/1279/2 +f 691/1280/8 694/1281/4 690/1282/4 +f 687/1279/2 693/1283/8 691/1280/8 +f 684/1284/151 697/1285/10 685/1275/10 +f 688/1272/1 699/1286/151 684/1284/151 +f 711/1287/1 700/1288/151 715/1289/151 +f 715/1289/151 702/1290/10 714/1291/10 +f 712/1292/2 706/1293/8 708/1294/8 +f 708/1294/8 705/1295/4 709/1296/4 +f 713/1297/29 707/1298/2 712/1292/2 +f 714/1291/10 701/1299/29 713/1297/29 +f 709/1300/4 704/1301/9 710/1302/9 +f 710/1302/9 703/1303/1 711/1287/1 +f 731/1304/22 742/1305/152 730/1306/4 +f 728/1307/37 739/1308/153 727/1309/3 +f 735/1310/34 746/1311/154 734/1312/35 +f 725/1313/39 736/1314/155 724/1315/10 +f 732/1316/36 743/1317/156 731/1304/22 +f 729/1318/21 740/1319/157 728/1307/37 +f 724/1315/10 747/1320/158 735/1310/34 +f 726/1321/38 737/1322/159 725/1313/39 +f 733/1323/5 744/1324/160 732/1316/36 +f 730/1325/4 741/1326/161 729/1318/21 +f 727/1309/3 738/1327/162 726/1321/38 +f 734/1312/35 745/1328/163 733/1323/5 +f 740/1319/157 753/1329/164 752/1330/165 +f 747/1320/158 748/1331/166 759/1332/167 +f 737/1322/159 750/1333/168 749/1334/169 +f 744/1324/160 757/1335/170 756/1336/171 +f 742/1337/152 753/1329/164 741/1326/161 +f 738/1327/162 751/1338/172 750/1333/168 +f 746/1311/154 757/1335/170 745/1328/163 +f 742/1305/152 755/1339/173 754/1340/174 +f 740/1319/157 751/1338/172 739/1308/153 +f 747/1320/158 758/1341/175 746/1311/154 +f 737/1322/159 748/1331/166 736/1314/155 +f 744/1324/160 755/1339/173 743/1317/156 +f 752/1330/165 765/1342/176 764/1343/177 +f 759/1332/167 760/1344/178 771/1345/179 +f 749/1334/169 762/1346/180 761/1347/181 +f 757/1335/170 768/1348/182 756/1336/171 +f 754/1349/174 765/1342/176 753/1329/164 +f 751/1338/172 762/1346/180 750/1333/168 +f 757/1335/170 770/1350/183 769/1351/184 +f 754/1340/174 767/1352/185 766/1353/186 +f 751/1338/172 764/1343/177 763/1354/187 +f 759/1332/167 770/1350/183 758/1341/175 +f 749/1334/169 760/1344/178 748/1331/166 +f 756/1336/171 767/1352/185 755/1339/173 +f 766/1355/186 768/1356/182 760/1357/178 +f 791/618/188 788/615/2 789/619/2 +f 793/625/189 790/616/188 791/618/188 +f 795/624/190 792/621/189 793/625/189 +f 797/631/191 794/622/190 795/624/190 +f 799/633/23 796/629/191 797/631/191 +f 801/617/1 802/1358/192 803/952/192 +f 805/623/193 806/1359/194 807/954/194 +f 806/1360/194 809/635/195 807/958/194 +f 809/635/195 810/1361/18 811/632/18 +f 804/1362/193 803/956/192 802/1363/192 +f 818/1364/196 815/1365/23 814/640/23 +f 813/637/24 816/1366/197 812/1367/24 +f 817/1368/197 820/1369/188 816/1366/197 +f 822/1370/198 819/1371/196 818/1364/196 +f 825/1372/199 822/1370/198 824/1373/199 +f 825/1374/199 820/1369/188 821/1375/188 +f 826/652/10 831/1376/193 827/650/10 +f 830/1377/193 833/1378/1 831/1376/193 +f 843/1379/48 875/1380/200 839/1381/201 +f 834/1382/202 837/1383/203 835/1384/204 +f 836/1385/205 839/1381/201 837/1383/203 +f 829/1386/28 859/1387/45 856/1388/45 +f 838/1389/206 843/1379/48 839/1381/201 +f 850/1390/207 849/1391/32 847/1392/32 +f 846/1393/31 848/1394/31 851/1395/208 +f 850/1390/207 827/1396/5 840/1397/5 +f 844/1398/209 841/1399/3 826/1400/3 +f 834/1382/202 872/1401/210 836/1385/205 +f 837/1383/203 875/1380/200 873/1402/211 +f 858/1403/44 846/1393/27 828/1404/27 +f 856/1388/45 861/1405/44 858/1403/44 +f 838/1389/206 876/1406/41 842/1407/40 +f 836/1385/205 874/1408/212 838/1389/206 +f 835/1384/204 873/1402/211 855/1409/213 +f 852/1410/5 840/1397/5 875/1380/200 +f 874/1411/212 872/1412/210 841/1399/3 +f 831/1413/5 833/1414/5 827/1396/5 +f 832/1415/1 855/1011/9 833/1378/1 +f 854/1416/214 826/1400/3 872/1412/210 +f 101/691/46 885/689/48 103/694/46 +f 887/967/40 113/103/41 115/99/41 +f 827/1396/5 855/1417/213 873/1418/211 +f 826/1400/3 832/1419/3 830/1420/3 +f 902/707/48 899/722/46 898/724/46 +f 898/724/46 895/716/5 894/702/5 +f 897/726/41 892/713/3 893/699/3 +f 901/710/40 896/728/41 897/726/41 +f 902/707/48 901/710/40 903/709/48 +f 6/8/35 7/988/5 5/986/35 +f 923/1421/215 920/977/216 921/738/216 +f 914/1422/217 922/1423/215 923/1421/215 +f 936/981/218 939/980/219 938/979/218 +f 942/1424/220 938/979/218 940/1425/220 +f 943/1426/221 935/1427/10 941/1428/221 +f 937/760/219 941/1428/221 939/980/219 +f 932/1429/4 940/1425/220 934/1430/4 +f 2/13/10 4/6/34 3/984/34 +f 4/6/34 6/8/35 5/986/35 +f 8/1/5 10/3/36 9/987/36 +f 10/3/36 12/32/22 11/989/22 +f 12/32/22 14/28/4 13/990/4 +f 14/25/4 16/27/21 15/991/21 +f 16/27/21 18/22/37 17/993/37 +f 18/22/37 20/19/3 19/994/3 +f 20/19/3 22/16/38 21/995/38 +f 22/16/38 24/11/39 23/996/39 +f 24/11/39 2/13/10 1/985/10 +f 29/20/35 41/1431/35 40/997/5 +f 36/763/21 48/1432/21 47/998/37 +f 26/764/22 37/1433/22 38/999/4 +f 33/766/38 45/1434/38 44/1000/39 +f 30/23/34 42/1435/34 41/1001/35 +f 25/9/4 38/1436/4 48/1002/21 +f 27/14/36 39/1437/36 37/1003/22 +f 34/762/3 46/1438/3 45/1004/38 +f 31/765/10 43/1439/10 42/1005/34 +f 28/17/5 40/1440/5 39/1006/36 +f 35/4/37 47/1441/37 46/1007/3 +f 32/29/39 44/1442/39 43/1008/10 +f 49/780/40 50/776/40 60/36/41 +f 59/78/42 57/73/42 58/52/41 +f 59/78/42 67/64/43 63/782/43 +f 65/63/44 61/65/44 63/782/27 +f 68/61/28 64/778/28 62/80/45 +f 72/40/46 70/50/46 69/46/47 +f 66/69/45 62/80/45 61/65/44 +f 52/42/48 50/44/40 49/57/40 +f 72/40/46 52/42/48 51/48/48 +f 854/1009/9 834/1443/9 835/1010/9 +f 101/691/46 103/694/46 104/54/47 +f 105/111/49 102/84/47 104/54/47 +f 105/111/28 109/784/28 111/97/45 +f 107/90/45 111/97/45 112/91/44 +f 108/87/44 112/91/44 110/783/27 +f 114/108/42 106/96/43 110/783/43 +f 114/108/42 116/105/42 115/99/41 +f 884/112/48 886/114/40 887/687/40 +f 122/1012/50 129/1444/98 126/1013/51 +f 124/1015/44 131/1026/61 130/1016/53 +f 123/1018/54 120/1445/60 127/1019/55 +f 126/1013/51 129/1444/98 551/1021/57 +f 128/1023/59 127/1166/55 120/1024/60 +f 124/1015/44 123/1018/54 132/1020/56 +f 126/1027/51 125/1160/92 118/1028/40 +f 130/1016/53 129/1168/98 122/1030/50 +f 118/1028/40 125/1160/92 128/1023/59 +f 68/61/49 71/60/47 69/46/47 +f 144/119/21 168/1446/21 157/1031/4 +f 134/124/22 158/1447/22 159/1032/36 +f 141/143/38 165/1448/38 166/1033/3 +f 138/134/34 162/1449/34 163/1034/10 +f 135/127/36 159/1450/36 160/1035/5 +f 142/146/3 166/1451/3 167/1036/37 +f 139/139/10 163/1452/10 164/1037/39 +f 136/130/5 160/1453/5 161/1038/35 +f 143/115/37 167/1454/37 168/1039/21 +f 133/120/4 157/1455/4 158/1040/22 +f 140/140/39 164/1456/39 165/1041/38 +f 137/133/35 161/1457/35 162/1042/34 +f 151/142/22 175/1047/22 174/1043/4 +f 148/132/37 172/1048/37 171/1044/3 +f 155/116/34 179/1049/34 178/1045/35 +f 145/121/39 169/1050/39 180/1046/10 +f 152/141/36 176/1051/36 175/1047/22 +f 149/136/21 173/1052/21 172/1048/37 +f 156/122/10 180/1046/10 179/1049/34 +f 146/126/38 170/1053/38 169/1050/39 +f 153/144/5 177/1054/5 176/1051/36 +f 150/135/4 174/1458/4 173/1052/21 +f 147/129/3 171/1044/3 170/1053/38 +f 154/117/35 178/1045/35 177/1054/5 +f 221/1055/38 222/1459/62 215/1056/62 +f 223/1058/63 224/1061/35 217/1059/35 +f 224/1061/35 225/1066/34 218/1062/34 +f 226/1063/10 220/1067/39 213/1064/39 +f 225/1066/34 226/1063/10 219/1065/10 +f 220/1067/39 221/1055/38 214/1057/38 +f 233/1068/38 245/1080/38 246/1069/62 +f 241/1071/35 240/1460/63 252/1072/63 +f 242/1074/34 241/1071/35 253/1073/35 +f 231/1076/10 244/1079/10 243/1077/39 +f 242/1074/34 254/1075/34 244/1079/10 +f 232/1078/39 243/1077/39 245/1080/38 +f 258/1081/39 271/1093/39 273/1082/38 +f 266/1084/63 275/1461/63 276/1085/35 +f 259/1083/38 273/1082/38 274/1087/62 +f 267/1086/35 276/1085/35 277/1089/34 +f 268/1090/34 277/1089/34 272/1091/10 +f 257/1092/10 272/1091/10 271/1093/39 +f 292/1094/3 293/1106/37 281/1095/37 +f 299/1097/35 300/1108/34 288/1098/34 +f 301/1100/10 290/1109/39 278/1101/39 +f 296/1103/22 297/1111/36 285/1104/36 +f 293/1106/37 294/1113/21 282/1107/21 +f 300/1108/34 301/1100/10 289/1102/10 +f 290/1109/39 291/1115/38 279/1110/38 +f 297/1111/36 298/1116/5 286/1112/5 +f 294/1113/21 295/1462/4 283/1114/4 +f 291/1115/38 292/1094/3 280/1096/3 +f 298/1116/5 299/1097/35 287/1099/35 +f 295/1117/4 296/1103/22 284/1105/22 +f 306/1119/39 313/1126/39 312/1120/10 +f 304/1122/34 311/1127/34 310/1123/35 +f 307/1125/38 314/1131/38 313/1126/39 +f 305/1121/10 312/1120/10 311/1127/34 +f 303/1124/35 310/1123/35 309/1128/63 +f 308/1130/62 315/1463/62 314/1131/38 +f 338/210/4 339/208/22 320/226/22 +f 339/208/22 340/205/36 321/228/36 +f 340/205/36 341/207/64 322/230/64 +f 335/846/65 336/216/37 317/218/37 +f 336/216/37 337/214/21 318/221/21 +f 337/214/21 338/210/4 319/223/4 +f 341/207/64 350/236/66 349/231/66 +f 368/1132/4 329/318/4 328/316/21 +f 371/1134/67 326/312/3 325/310/38 +f 343/1135/69 342/338/82 333/302/35 +f 367/1136/22 330/322/22 329/321/4 +f 370/1138/70 327/314/37 326/312/3 +f 344/1139/71 331/324/36 330/322/22 +f 369/1133/21 328/316/21 327/314/37 +f 324/309/39 430/330/39 372/334/68 +f 430/330/39 429/332/28 372/334/68 +f 426/329/10 430/330/39 324/309/39 +f 344/1139/71 343/1135/69 332/304/5 +f 335/846/65 316/220/65 351/238/72 +f 343/1140/73 406/1146/81 405/1141/74 +f 371/1143/76 372/1464/222 413/1144/77 +f 371/1143/76 412/1145/78 411/293/74 +f 344/301/80 407/300/223 406/1146/81 +f 427/327/34 426/329/10 323/308/10 +f 437/346/39 450/359/39 451/358/10 +f 438/348/38 452/360/38 450/359/39 +f 441/339/35 455/352/35 454/354/63 +f 439/350/62 453/362/62 452/360/38 +f 442/343/34 456/356/34 455/352/35 +f 436/345/10 451/358/10 456/356/34 +f 428/325/27 427/327/34 342/338/82 +f 427/327/34 334/306/34 342/338/82 +f 519/434/83 517/886/83 516/885/84 +f 518/435/84 516/885/84 522/1147/85 +f 515/1149/10 513/1465/10 523/1150/86 +f 521/1151/86 523/1150/86 517/886/83 +f 520/1148/85 522/1147/85 512/1152/4 +f 524/883/87 526/1155/88 527/1154/88 +f 526/1155/88 507/1466/89 506/1156/89 +f 551/1157/57 550/1169/99 558/1158/90 +f 125/1160/92 126/1027/51 548/1161/58 +f 125/1160/92 549/1162/93 544/1163/94 +f 132/1020/56 546/1173/97 547/1164/95 +f 128/1023/59 544/1163/94 545/1165/96 +f 127/1019/55 545/1175/96 546/1167/97 +f 129/1168/98 130/1016/53 550/1169/99 +f 131/1026/61 547/1164/95 550/1169/99 +f 555/1170/100 561/1186/111 562/1171/101 +f 546/1173/97 554/1467/104 555/1174/103 +f 545/1175/96 553/1231/108 554/1176/104 +f 549/1162/93 557/1179/107 552/1177/105 +f 549/1162/93 548/1161/58 556/1178/106 +f 544/1163/94 552/1177/105 553/1180/108 +f 547/1164/95 555/1174/103 558/1158/90 +f 548/1022/58 551/1021/57 559/1181/91 +f 558/1172/102 562/1171/101 563/1183/109 +f 555/1170/100 554/1468/104 560/1185/110 +f 561/1186/111 565/1190/115 566/1187/112 +f 562/1171/101 566/1187/112 567/1188/113 +f 561/1186/111 560/1185/110 564/1189/114 +f 565/1190/115 569/1193/118 570/1191/116 +f 566/1187/112 570/1191/116 571/1192/117 +f 564/1189/114 568/1238/147 569/1193/118 +f 557/1179/107 575/1196/121 572/1194/119 +f 557/1179/107 556/1178/106 574/1195/120 +f 552/1177/105 572/1194/119 573/1197/122 +f 575/1198/123 579/1202/126 576/1199/124 +f 574/1201/120 578/1469/146 579/1202/126 +f 573/1203/122 572/1200/125 576/1199/124 +f 579/1202/126 583/1207/130 580/1205/128 +f 579/1202/126 578/1469/146 582/1206/129 +f 576/1199/124 580/1205/128 581/1208/131 +f 583/1207/130 587/1211/134 584/1209/132 +f 583/1207/130 582/1206/129 586/1210/133 +f 580/1205/128 584/1209/132 585/1212/135 +f 587/1211/134 591/1214/137 588/1213/136 +f 586/1210/133 590/1470/224 591/1214/137 +f 584/1209/132 588/1213/136 589/1215/138 +f 591/1216/137 595/1220/141 592/1217/139 +f 591/1216/137 590/1471/224 594/1219/140 +f 588/1218/136 592/1217/139 593/1221/142 +f 595/1220/141 599/1225/144 596/1223/143 +f 594/1224/140 598/1472/148 599/1225/144 +f 592/1217/139 596/1223/143 597/1226/145 +f 563/1228/109 567/1245/113 578/1229/146 +f 573/1230/122 577/1239/127 554/1176/104 +f 597/1232/145 596/1223/143 569/1233/118 +f 570/1235/116 599/1225/144 598/1236/148 +f 596/1223/143 599/1225/144 570/1235/116 +f 577/1239/127 564/1189/114 560/1240/110 +f 589/1215/138 593/1227/142 585/1212/135 +f 593/1227/142 564/1189/114 581/1241/131 +f 564/1189/114 577/1239/127 581/1241/131 +f 582/1246/129 578/1229/146 567/1245/113 +f 567/1245/113 594/1242/140 582/1246/129 +f 594/1242/140 590/1473/224 586/1247/133 +f 574/1248/120 556/1182/106 559/1181/91 +f 645/539/28 662/552/28 663/543/149 +f 653/1249/5 668/1253/5 667/1250/7 +f 646/538/149 663/543/149 674/908/3 +f 654/1252/27 669/1257/27 668/1253/5 +f 660/1254/5 675/542/5 664/541/150 +f 655/1256/10 670/1259/10 669/1257/27 +f 656/1258/28 671/1261/28 670/1259/10 +f 657/1260/3 672/1264/3 671/1261/28 +f 649/1255/150 664/541/150 665/549/27 +f 658/1263/6 673/1267/6 672/1264/3 +f 650/1262/27 665/549/27 661/548/10 +f 644/528/10 661/550/10 662/552/28 +f 651/1266/4 666/1474/4 673/1267/6 +f 652/1251/7 667/1250/7 666/1268/4 +f 689/1270/9 695/1274/9 696/1271/1 +f 690/1273/4 694/1475/4 695/1274/9 +f 685/1275/10 697/1285/10 698/1276/29 +f 686/1277/29 698/1276/29 692/1278/2 +f 691/1280/8 693/1283/8 694/1281/4 +f 687/1279/2 692/1278/2 693/1283/8 +f 684/1284/151 699/1286/151 697/1285/10 +f 688/1272/1 696/1271/1 699/1286/151 +f 711/1287/1 703/1303/1 700/1288/151 +f 715/1289/151 700/1288/151 702/1290/10 +f 712/1292/2 707/1298/2 706/1293/8 +f 708/1294/8 706/1293/8 705/1295/4 +f 713/1297/29 701/1299/29 707/1298/2 +f 714/1291/10 702/1290/10 701/1299/29 +f 709/1300/4 705/1476/4 704/1301/9 +f 710/1302/9 704/1301/9 703/1303/1 +f 731/1304/22 743/1317/156 742/1305/152 +f 728/1307/37 740/1319/157 739/1308/153 +f 735/1310/34 747/1320/158 746/1311/154 +f 725/1313/39 737/1322/159 736/1314/155 +f 732/1316/36 744/1324/160 743/1317/156 +f 729/1318/21 741/1326/161 740/1319/157 +f 724/1315/10 736/1314/155 747/1320/158 +f 726/1321/38 738/1327/162 737/1322/159 +f 733/1323/5 745/1328/163 744/1324/160 +f 730/1325/4 742/1337/152 741/1326/161 +f 727/1309/3 739/1308/153 738/1327/162 +f 734/1312/35 746/1311/154 745/1328/163 +f 740/1319/157 741/1326/161 753/1329/164 +f 747/1320/158 736/1314/155 748/1331/166 +f 737/1322/159 738/1327/162 750/1333/168 +f 744/1324/160 745/1328/163 757/1335/170 +f 742/1337/152 754/1349/174 753/1329/164 +f 738/1327/162 739/1308/153 751/1338/172 +f 746/1311/154 758/1341/175 757/1335/170 +f 742/1305/152 743/1317/156 755/1339/173 +f 740/1319/157 752/1330/165 751/1338/172 +f 747/1320/158 759/1332/167 758/1341/175 +f 737/1322/159 749/1334/169 748/1331/166 +f 744/1324/160 756/1336/171 755/1339/173 +f 752/1330/165 753/1329/164 765/1342/176 +f 759/1332/167 748/1331/166 760/1344/178 +f 749/1334/169 750/1333/168 762/1346/180 +f 757/1335/170 769/1351/184 768/1348/182 +f 754/1349/174 766/1477/186 765/1342/176 +f 751/1338/172 763/1354/187 762/1346/180 +f 757/1335/170 758/1341/175 770/1350/183 +f 754/1340/174 755/1339/173 767/1352/185 +f 751/1338/172 752/1330/165 764/1343/177 +f 759/1332/167 771/1345/179 770/1350/183 +f 749/1334/169 761/1347/181 760/1344/178 +f 756/1336/171 768/1348/182 767/1352/185 +f 760/1357/178 761/1478/181 764/1479/177 +f 761/1478/181 762/1480/180 764/1479/177 +f 762/1480/180 763/1481/187 764/1479/177 +f 764/1479/177 765/1482/176 766/1355/186 +f 766/1355/186 767/1483/185 768/1356/182 +f 768/1356/182 769/1484/184 770/1485/183 +f 770/1485/183 771/1486/179 768/1356/182 +f 771/1486/179 760/1357/178 768/1356/182 +f 764/1479/177 766/1355/186 760/1357/178 +f 791/618/188 790/616/188 788/615/2 +f 793/625/189 792/621/189 790/616/188 +f 795/624/190 794/622/190 792/621/189 +f 797/631/191 796/629/191 794/622/190 +f 799/633/23 798/630/23 796/629/191 +f 801/617/1 800/1487/1 802/1358/192 +f 805/623/193 804/1488/193 806/1359/194 +f 806/1360/194 808/1489/195 809/635/195 +f 809/635/195 808/1489/195 810/1361/18 +f 804/1362/193 805/627/193 803/956/192 +f 818/1364/196 819/1371/196 815/1365/23 +f 813/637/24 817/1368/197 816/1366/197 +f 817/1368/197 821/1375/188 820/1369/188 +f 822/1370/198 823/1490/198 819/1371/196 +f 825/1372/199 823/1490/198 822/1370/198 +f 825/1374/199 824/1491/199 820/1369/188 +f 826/652/10 830/1377/193 831/1376/193 +f 830/1377/193 832/1415/1 833/1378/1 +f 843/1379/48 877/1492/46 875/1380/200 +f 834/1382/202 836/1385/205 837/1383/203 +f 836/1385/205 838/1389/206 839/1381/201 +f 829/1386/28 847/1392/28 859/1387/45 +f 838/1389/206 842/1407/40 843/1379/48 +f 847/1392/32 829/1386/32 850/1390/207 +f 829/1386/32 845/1493/225 850/1390/207 +f 851/1395/208 844/1398/209 828/1404/31 +f 828/1404/31 846/1393/31 851/1395/208 +f 850/1390/207 845/1493/225 827/1396/5 +f 844/1398/209 851/1395/208 841/1399/3 +f 834/1382/202 854/1494/214 872/1401/210 +f 837/1383/203 839/1381/201 875/1380/200 +f 858/1403/44 861/1405/44 846/1393/27 +f 856/1388/45 859/1387/45 861/1405/44 +f 838/1389/206 874/1408/212 876/1406/41 +f 836/1385/205 872/1401/210 874/1408/212 +f 835/1384/204 837/1383/203 873/1402/211 +f 840/1397/5 827/1396/5 873/1418/211 +f 873/1418/211 875/1380/200 840/1397/5 +f 875/1380/200 877/1492/46 852/1410/5 +f 877/1492/46 879/1495/5 852/1410/5 +f 872/1412/210 826/1400/3 841/1399/3 +f 841/1399/3 853/1496/3 874/1411/212 +f 853/1496/3 878/1497/3 876/1498/41 +f 874/1411/212 853/1496/3 876/1498/41 +f 832/1415/1 854/1009/9 855/1011/9 +f 854/1416/214 832/1419/3 826/1400/3 +f 101/691/46 884/112/48 885/689/48 +f 887/967/40 886/695/40 113/103/41 +f 827/1396/5 833/1414/5 855/1417/213 +f 902/707/48 903/709/48 899/722/46 +f 898/724/46 899/722/46 895/716/5 +f 897/726/41 896/728/41 892/713/3 +f 901/710/40 900/706/40 896/728/41 +f 902/707/48 900/706/40 901/710/40 +f 6/8/35 8/1/5 7/988/5 +f 923/1421/215 922/1423/215 920/977/216 +f 914/1422/217 915/1499/217 922/1423/215 +f 936/981/218 937/760/219 939/980/219 +f 942/1424/220 936/981/218 938/979/218 +f 943/1426/221 933/1500/10 935/1427/10 +f 937/760/219 943/1426/221 941/1428/221 +f 932/1429/4 942/1424/220 940/1425/220 diff --git a/src/main/resources/assets/hbm/textures/models/weapons/huntsman.png b/src/main/resources/assets/hbm/textures/models/weapons/huntsman.png new file mode 100644 index 0000000000000000000000000000000000000000..e29aabfbc585f64e5beec3e6ecbce76523becb2b GIT binary patch literal 3378 zcmV-24bAe2P)NklKX2T~8OEP6whjy!=@r0`g|r5;ty4y^)4Es$P%Rky75L6q z5PYsus978YxQXweG*>vKfD>?~quc@N69L8*X(t6aD{_`Y&Txk0kbHlDuq*zZ-6bEs z^UOOl0tTB5%3M~*PC~eB$3*14a{6toyc3i9%@p!$kpM{eU2p0OlsMsQbO=^s7l85L zn#L}{XlOyPAv{Hfi3f`alPpwv^%V)ah+P`S28&2!u2ufT+);J;hJZi)tNr4pEnp49 zPpNjXd*Ni*{v(pLL?XV`9VQ+tebH;oi@ym4sPg8nyK?BsxIm>>Uy-0KAV0(|5mU!O zB%%#dQ(QEs;_=5MRE2}U^a^_-R`|g*9xI>7!-UXHM5Yo{zk2mb0l??apZNkE0V=(+ zCz38fo(O>>5tCB^vB{t|R9(I!;O0MhnB7F<#m}CI74}5NV`X0KK)o@j(Rn002|<{5 zB=Ys^*TaR`Z}N*-{@UL~Ys&`-t3)9`Ey-v*&$zDRq+iIEXmdyccquSSVqYcA>)-{+L(8>z&l6b^ zojnnq@=m2?RJ-LNWV}v^wwuNECSm+oyeE<{tDS_vX{io&n*Ug*f41yVtk=I-mzI{A zeG~w^`rki09IctNv$N3sD;KA0-G52Y+WmV`=TPE9`wdTP0EHkE7Uqdej1^8Z6`Tnf zi;sUCy9AA7FQFX5cJ=cBWtlRrLQ>ghE}qB?Nopv7+6>V^?(grT9ZUYGAc?9Ai2zY` zv9EuG3KxRA-)kjPHpY z9UVnKCR4@76FJz|vY)RfqKw=l7=qCxAfHgpk@ySZj76)?J3gH26UdsA&5Rp6dn*+H zNL_8z>-$JH>$)Su3`v_OqM^EF+dLZSI}*{&|4pJ=PR#R4f%nZ!wGki|HgXY3WU!mm zJrSm!E}n?XG57D$?unFB4hV;$(IgvJX0C7Uq8%6g?c~JV>!`oyZNwe3U+8Gc6Wvq7e#hf$u)}MIx=o zG$N28B9ax}2@yO!V=Vsm_pwXhjQRp)MiqMM#-&wf=FAS%tC(0L5q(eUsZWcpDP$QZ z*L;A{7L_L6J`L795(${2RpIA|0`#%-o&wJ+pFv@(2scna{o`O;!Wse>y+sWh3Y)xY zYSo!8o`{ZIn({=%o2obA>u;GJ3K7-*=1n580re&%jh=|M7_{9`_?9*isXO*iBvqYZ zmPJ$l8Cv(0MP1I=+-Gq%@8TmM@)kng+7r#p&)n#VoKpD#pH3e)gJ2OMq&aW{;Rb~I ziaLS2;>N_s6VZ`JTL(P40mPfolDXk)pt@p4S>|^{TYw;;wvWxTzx%@_fWpiBuLR1` zRQ`Ycxh$~%bGIRV4OWR8OshmztTN-hEd%(yy3SX(0w!WxpJk!bjM zBCY~LYd{ztMpK?h9se$R(`b|XI)geDQWSG1DO(b(_9%7|!W<@4Pfk|1pB`G&m3_;} z#bau|zHu)vFQZoHd|D}8#X~b&5$T({z8EP!O_*tr%C+MwAV8pqWY{V)yGxFTlBE`x zF+Gu`HSzX6#%fpeZ%}S2tDEAqfy1Q1hW&R%!%0)`-SU7;b-5fbKPa^W?QiB!$p7Df z_L;J8k*O>Ab;xUrY`Tbtrn87-*rt(NQX<2)A|%YR(E`wQS`@2TIPUL*78ETQ`zlrO zf7$%?O_i@BL^Mn~iAah9qR~Rap2%?MW=$)ql+5^zLu&z1ev7;=wk=vD$hAO4MzPJi zNQJ!@QW~nDPB7|(r42LkFg+2|UkYiR@fMMk1w=DM8TAiuF5|(0)1j_9Q(oSNE#hda z&UC@7=DtOy%%)~twMh+c5lP4csbH2X*KW=eNdil5gY)*j`xlYV>Ei(^s}ID%c6`fX zv#-tLd8;!anCvyCh{hyp28~dUC%!5br2M{kZT2{tR<TsS2!{n^; zC$sz0xbLU-&?2QHEIE+~YmyA@iEv~wC{KX?g@Iw1`NC=MDPkMnC3NtpfN^6wqm=3# zNz@HL>3Yt(6F&lVSEL_#BwwqxtRF8lOZwmISPJ*}wJ zbn9ZU&P{NplJ_zhhP+AJA{4!zBaLo2MkFhV3!#(Es3Z_mPd4)*X6sZ_&r#>00H(^A zPkD|o`k`!$HyNuE7osgsLa&cIx_f_^qrYpWoDZVjRX-ASI7FP1RFQz_^(N*>Vpwc> zI@~%F7jXhnH+fa;?&odOCME$#0gI+XFW&lU&e#N3vreE{&%k}JlopcbvZ!XrYIWmz@k$OkAk?}=8c^{XZxYA? zElM2WOoC3;nUsa3NkAI?oNEBrzZeVu3S9pJVH?lVn2ju(S_F|gu42NG%BXZ6Pb9_u zHe;8GFr6r3QV1b9Yc*YhjMd_%P2%ZWCm@f*9Bd)*Ty*tKbOd8-@zDrCOwP{;MA!%N z>fvNu%}J5PjBGYk)AXP>)l%WeBq3^PfBMI@Cxktt`QGJy!uZ^kUs2uC6bKppoRyGdE5r8AuL8(vRCtp%zGiBRGHZw=(@;?4TBbe7J|K9E>{8$kV zF)Bo)j*gDTE=F8@BAFC~YD8AzBrFq4RtrYBrY){yFt?>slD5Gg`h zW#`ijrI~afA~AM#rV*Qv4CR~5d$;uE z*u8iOc{Fr(b|x+_FZntOWuk(@o`?r;9JiZl-bZJYQfD!bXPbeoY5Oem|ITIiEaTpp zkf5+95}Cyb2-81_3krK8KD2luOB4_VC=oj&vr8n>1vx{>0N!1IJM_W2ouk)jj!M0{xRL}F1+BAbNI zGF4Ax&cqNDv-hs87cYAvX)`%NVbUW+P?|b079zsqiFokh+vfFpj1ldNP{;GQ?$`DB zu}LNUzLhSyBtUqilWL^YRxU@cg*}lTV1t#J6)n}7;3vqEJdtmI+q_;!BATv3LXo%Y zo1`YOY9iDd=*m-`a-~a#s literal 0 HcmV?d00001 From 0115928304869c422831d2c32adf9f0a04e81281 Mon Sep 17 00:00:00 2001 From: George Paton Date: Thu, 22 Aug 2024 09:48:21 +1000 Subject: [PATCH 16/17] fix missing FENSU sync (soz bob) --- .../machine/storage/TileEntityMachineFENSU.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineFENSU.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineFENSU.java index bef292604..6065baa58 100644 --- a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineFENSU.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineFENSU.java @@ -8,7 +8,6 @@ import api.hbm.energymk2.Nodespace; import api.hbm.energymk2.Nodespace.PowerNode; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.util.ForgeDirection; @@ -79,13 +78,7 @@ public class TileEntityMachineFENSU extends TileEntityMachineBattery { this.log[19] = avg; - NBTTagCompound nbt = new NBTTagCompound(); - nbt.setLong("power", avg); - nbt.setLong("delta", delta); - nbt.setShort("redLow", redLow); - nbt.setShort("redHigh", redHigh); - nbt.setByte("priority", (byte) this.priority.ordinal()); - this.networkPack(nbt, 20); + this.networkPackNT(20); } if(worldObj.isRemote) { From 29fb57053dcfe5236a8427cec015075a9bb048f6 Mon Sep 17 00:00:00 2001 From: Bob Date: Thu, 22 Aug 2024 22:47:06 +0200 Subject: [PATCH 17/17] anyway --- changelog | 3 ++ .../api/hbm/redstoneoverradio/IRORInfo.java | 9 ++++++ .../redstoneoverradio/IRORInteractive.java | 31 +++++++++++++++++++ .../redstoneoverradio/IRORValueProvider.java | 6 ++++ .../RORFunctionException.java | 8 +++++ .../hbm/redstoneoverradio/package-info.java | 22 +++++++++++++ .../java/com/hbm/main/CraftingManager.java | 2 +- 7 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 src/main/java/api/hbm/redstoneoverradio/IRORInfo.java create mode 100644 src/main/java/api/hbm/redstoneoverradio/IRORInteractive.java create mode 100644 src/main/java/api/hbm/redstoneoverradio/IRORValueProvider.java create mode 100644 src/main/java/api/hbm/redstoneoverradio/RORFunctionException.java create mode 100644 src/main/java/api/hbm/redstoneoverradio/package-info.java diff --git a/changelog b/changelog index a3f93e205..3c15d7b6d 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,6 @@ +## Changed +* Changed the multi fluid ID recipe, they now use analog circuits instead of silicon based ones, no longer requiring plastic to make + ## Fixed * Fixed pumpjack gauges not syncing properly * Fixed some concrete variants not being revertable into uncolored concrete \ No newline at end of file diff --git a/src/main/java/api/hbm/redstoneoverradio/IRORInfo.java b/src/main/java/api/hbm/redstoneoverradio/IRORInfo.java new file mode 100644 index 000000000..cfd18cb81 --- /dev/null +++ b/src/main/java/api/hbm/redstoneoverradio/IRORInfo.java @@ -0,0 +1,9 @@ +package api.hbm.redstoneoverradio; + +public interface IRORInfo { + + public static String PREFIX_VALUE = "VAL:"; + public static String PREFIX_FUNCTION = "FUN:"; + + public String[] getFunctionInfo(); +} diff --git a/src/main/java/api/hbm/redstoneoverradio/IRORInteractive.java b/src/main/java/api/hbm/redstoneoverradio/IRORInteractive.java new file mode 100644 index 000000000..821fc8598 --- /dev/null +++ b/src/main/java/api/hbm/redstoneoverradio/IRORInteractive.java @@ -0,0 +1,31 @@ +package api.hbm.redstoneoverradio; + +public interface IRORInteractive extends IRORInfo { + + public static String NAME_SEPARATOR = "!"; + public static String PARAM_SEPARATOR = ":"; + + public static String EX_NULL = "Exception: Null Command"; + public static String EX_NAME = "Exception: Multiple Name Separators"; + + public Object runRORFunction(String name, String[] params); + + /** Extracts the command name from a full command string */ + public static String getCommand(String input) { + if(input == null || input.isEmpty()) throw new RORFunctionException(EX_NULL); + String[] parts = input.split(NAME_SEPARATOR); + if(parts.length <= 0 || parts.length > 2) throw new RORFunctionException(EX_NAME); + return parts[0]; + } + + /** Extracts the param list from a full command string */ + public static String[] getParams(String input) { + if(input == null || input.isEmpty()) throw new RORFunctionException(EX_NULL); + String[] parts = input.split(NAME_SEPARATOR); + if(parts.length <= 0 || parts.length > 2) throw new RORFunctionException(EX_NAME); + if(parts.length == 1) return new String[0]; + String paramList = parts[1]; + String[] params = paramList.split(PARAM_SEPARATOR); + return params; + } +} diff --git a/src/main/java/api/hbm/redstoneoverradio/IRORValueProvider.java b/src/main/java/api/hbm/redstoneoverradio/IRORValueProvider.java new file mode 100644 index 000000000..26e615c6b --- /dev/null +++ b/src/main/java/api/hbm/redstoneoverradio/IRORValueProvider.java @@ -0,0 +1,6 @@ +package api.hbm.redstoneoverradio; + +public interface IRORValueProvider extends IRORInfo { + + public Object provideRORValue(String name); +} diff --git a/src/main/java/api/hbm/redstoneoverradio/RORFunctionException.java b/src/main/java/api/hbm/redstoneoverradio/RORFunctionException.java new file mode 100644 index 000000000..5a6a53d3d --- /dev/null +++ b/src/main/java/api/hbm/redstoneoverradio/RORFunctionException.java @@ -0,0 +1,8 @@ +package api.hbm.redstoneoverradio; + +public class RORFunctionException extends RuntimeException { + + public RORFunctionException(String message) { + super(message); + } +} diff --git a/src/main/java/api/hbm/redstoneoverradio/package-info.java b/src/main/java/api/hbm/redstoneoverradio/package-info.java new file mode 100644 index 000000000..ef1d4eaad --- /dev/null +++ b/src/main/java/api/hbm/redstoneoverradio/package-info.java @@ -0,0 +1,22 @@ +/** + * @author hbm + * + */ +package api.hbm.redstoneoverradio; + +/* + + __ __ __ _______ ________ __ __ __ __ ______ __ + /_/| /_/\ /_/| /______/\ /_______/| /_/| /_/| /_/|_____ /_/| /_____/| /_/| +| || | \\ | || | ___ \\ | ______|/ | ||| || | |/_____| || |___ || | || +| || | \ \\ | || | | \ \\ | ||___ | |/| |/ | ______ || /__| || | ||__ +| || | |\ \\| || | | \ || | |/__/| \ // | |/_____| || | ___|/ | |/_/| +| || | ||\ \| || | | | || | ____|/ >