From c2c21301a648b57291a3525dcfb9f82ff013dfae Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Mon, 10 Jun 2013 01:01:30 -0700 Subject: [PATCH] Tweaks to hivegen; still needs more work. Changing references to "biofuel" to "ethanol" --- .../textures/items/essenceFalseLife.png | Bin 3709 -> 3597 bytes .../textures/items/essenceShallowGrave.png | Bin 4145 -> 4068 bytes .../liquids/{biofuel.png => ethanol.png} | Bin .../magicbees/bees/BeeGenomeManager.java | 11 +++--- magicbees_src/magicbees/bees/BeeSpecies.java | 6 ++- .../magicbees/block/types/HiveType.java | 2 +- .../magicbees/item/types/LiquidType.java | 2 +- .../magicbees/item/types/ResourceType.java | 1 + .../magicbees/world/feature/FeatureHive.java | 35 ++++++++---------- 9 files changed, 28 insertions(+), 29 deletions(-) rename magicbees_res/mods/magicbees/textures/items/liquids/{biofuel.png => ethanol.png} (100%) diff --git a/magicbees_res/mods/magicbees/textures/items/essenceFalseLife.png b/magicbees_res/mods/magicbees/textures/items/essenceFalseLife.png index 7678bf6971730210d067749f22c2842f157d0f67..3491f4897b344a921b1bebbce70ba838bcc06557 100644 GIT binary patch delta 859 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 RKC1u#002ovPDHLkV1iQ%tSA5g diff --git a/magicbees_res/mods/magicbees/textures/items/liquids/biofuel.png b/magicbees_res/mods/magicbees/textures/items/liquids/ethanol.png similarity index 100% rename from magicbees_res/mods/magicbees/textures/items/liquids/biofuel.png rename to magicbees_res/mods/magicbees/textures/items/liquids/ethanol.png diff --git a/magicbees_src/magicbees/bees/BeeGenomeManager.java b/magicbees_src/magicbees/bees/BeeGenomeManager.java index 661ce9d..7776189 100644 --- a/magicbees_src/magicbees/bees/BeeGenomeManager.java +++ b/magicbees_src/magicbees/bees/BeeGenomeManager.java @@ -519,13 +519,14 @@ public class BeeGenomeManager genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.getBaseAllele("effectAggressive"); genome[EnumBeeChromosome.NOCTURNAL.ordinal()] = Allele.getBaseAllele("boolTrue"); genome[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = Allele.getBaseAllele("flowersEnd"); + genome[EnumBeeChromosome.CAVE_DWELLING.ordinal()] = Allele.getBaseAllele("boolTrue"); return genome; } public static IAllele[] getTemplateOblivion() { - IAllele[] genome = getTemplateModBase(); + IAllele[] genome = getTemplateBaseExtrinsic(); genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.OBLIVION; genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityMaximum"); @@ -535,7 +536,7 @@ public class BeeGenomeManager public static IAllele[] getTemplateNameless() { - IAllele[] genome = getTemplateModBase(); + IAllele[] genome = getTemplateBaseExtrinsic(); genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.NAMELESS; genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityHigh"); @@ -546,7 +547,7 @@ public class BeeGenomeManager public static IAllele[] getTemplateAbandoned() { - IAllele[] genome = getTemplateModBase(); + IAllele[] genome = getTemplateBaseExtrinsic(); genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.ABANDONED; genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceBoth1"); @@ -560,7 +561,7 @@ public class BeeGenomeManager public static IAllele[] getTemplateForlorn() { - IAllele[] genome = getTemplateModBase(); + IAllele[] genome = getTemplateBaseExtrinsic(); genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.FORLORN; genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityLow"); @@ -574,7 +575,7 @@ public class BeeGenomeManager public static IAllele[] getTemplateDraconic() { - IAllele[] genome = getTemplateModBase(); + IAllele[] genome = getTemplateBaseExtrinsic(); genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.DRACONIC; genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceBoth1"); diff --git a/magicbees_src/magicbees/bees/BeeSpecies.java b/magicbees_src/magicbees/bees/BeeSpecies.java index e546043..4736f13 100644 --- a/magicbees_src/magicbees/bees/BeeSpecies.java +++ b/magicbees_src/magicbees/bees/BeeSpecies.java @@ -400,10 +400,12 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider AWARE.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 18) .setGenome(BeeGenomeManager.getTemplateAware()) .register(); - SPIRIT.addProduct(Config.combs.getStackForType(CombType.SOUL), 13) + SPIRIT.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 22) + .addSpecialty(Config.combs.getStackForType(CombType.SOUL), 16) .setGenome(BeeGenomeManager.getTemplateSpirit()) .register(); - SOUL.addProduct(Config.combs.getStackForType(CombType.SOUL), 24) + SOUL.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 28) + .addSpecialty(Config.combs.getStackForType(CombType.SOUL), 20) .setGenome(BeeGenomeManager.getTemplateSoul()) .register(); diff --git a/magicbees_src/magicbees/block/types/HiveType.java b/magicbees_src/magicbees/block/types/HiveType.java index ff779c3..1f66029 100644 --- a/magicbees_src/magicbees/block/types/HiveType.java +++ b/magicbees_src/magicbees/block/types/HiveType.java @@ -221,7 +221,7 @@ public enum HiveType } break; case UNUSUAL: - for (int i = 0; i < 2; ++i) + for (int i = 0; i < 3; ++i) { int coordX = chunkX * 16 + random.nextInt(16); int coordZ = chunkZ * 16 + random.nextInt(16); diff --git a/magicbees_src/magicbees/item/types/LiquidType.java b/magicbees_src/magicbees/item/types/LiquidType.java index 14c6dad..d46ebfd 100644 --- a/magicbees_src/magicbees/item/types/LiquidType.java +++ b/magicbees_src/magicbees/item/types/LiquidType.java @@ -18,7 +18,7 @@ public enum LiquidType // Forestry BIOMASS("biomass"), - BIOFUEL("biofuel"), + ETHANOL("ethanol"), // Buildcraft OIL("Oil"), diff --git a/magicbees_src/magicbees/item/types/ResourceType.java b/magicbees_src/magicbees/item/types/ResourceType.java index 0230c72..fa62a32 100644 --- a/magicbees_src/magicbees/item/types/ResourceType.java +++ b/magicbees_src/magicbees/item/types/ResourceType.java @@ -13,6 +13,7 @@ public enum ResourceType DRAGON_DUST("dragonDust", true), DRAGON_CHUNK("dragonChunk", true), ESSENCE_FALSE_LIFE("essenceFalseLife", true), + ESSENCE_SHALLOW_GRAVE("essenceShallowGrave", true), // Dummy items for Thaumanomicon research icons. // These won't ever actually exist in-game, and so diff --git a/magicbees_src/magicbees/world/feature/FeatureHive.java b/magicbees_src/magicbees/world/feature/FeatureHive.java index f5ef7cb..82c2db6 100644 --- a/magicbees_src/magicbees/world/feature/FeatureHive.java +++ b/magicbees_src/magicbees/world/feature/FeatureHive.java @@ -18,7 +18,7 @@ public class FeatureHive private static FeatureOreVein glowstoneGen; private static FeatureOreVein endStoneGen; - private static boolean logSpawns = true; + private static boolean logSpawns = false; public static void initialize() { @@ -38,12 +38,7 @@ public class FeatureHive public static boolean generateHiveCurious(World world, Random random, int coordX, int coordZ, boolean initialGen) { - BiomeGenBase biome = world.getBiomeGenForCoords(coordX, coordZ); - int min = (int)(biome.minHeight * 64 + 64); - int max = (int)(biome.maxHeight * 64); - // sanity - max = (max > 1) ? max : 1; - int coordY = min + random.nextInt(max + 5); + int coordY = getHeight(world, random, coordX, coordZ); boolean doSpawn = false; if (world.isAirBlock(coordX, coordY - 1, coordZ) && world.isAirBlock(coordX, coordY, coordZ) && @@ -59,12 +54,7 @@ public class FeatureHive public static boolean generateHiveUnusual(World world, Random random, int coordX, int coordZ, boolean initialGen) { - BiomeGenBase biome = world.getBiomeGenForCoords(coordX, coordZ); - int min = (int)(biome.minHeight * 64 + 64); - int max = (int)(biome.maxHeight * 64); - // sanity - max = (max > 1) ? max : 1; - int coordY = min + random.nextInt(max); + int coordY = getHeight(world, random, coordX, coordZ); boolean doSpawn = false; if (world.isAirBlock(coordX, coordY + 1, coordZ) && world.isAirBlock(coordX, coordY, coordZ) && @@ -84,13 +74,7 @@ public class FeatureHive public static boolean generateHiveResonant(World world, Random random, int coordX, int coordZ, boolean initialGen) { - BiomeGenBase biome = world.getBiomeGenForCoords(coordX, coordZ); - int min = (int)(biome.minHeight * 64 + 62); - int max = (int)(biome.maxHeight * 64); - // sanity - max = (max > 1) ? max : 1; - int coordY = min + random.nextInt(max); - + int coordY = getHeight(world, random, coordX, coordZ); boolean doSpawn = false; if (world.isAirBlock(coordX, coordY + 1, coordZ) && (world.isAirBlock(coordX, coordY, coordZ) || world.getBlockId(coordX, coordY, coordZ) == Block.tallGrass.blockID) && @@ -264,6 +248,17 @@ public class FeatureHive return doSpawn; } + private static int getHeight(World world, Random random, int coordX, int coordZ) + { + BiomeGenBase biome = world.getBiomeGenForCoords(coordX, coordZ); + int min = (int)(biome.minHeight * 64 + 62); + int max = (int)(biome.maxHeight * 64); + // sanity + min = (min > 1) ? min : 1; + max = (max > 5) ? max : 5; + return min + random.nextInt(max); + } + private static int getSurroundCount(World world, int x, int y, int z, Block blockType) { int surroundCount = 0;