Merge pull request #1228 from sadris/oilgenfreq

Added oil well generation probability scalar to config file
This commit is contained in:
CovertJaguar 2013-09-24 10:11:51 -07:00
commit 93290e0ad9
2 changed files with 3 additions and 0 deletions

View file

@ -80,6 +80,7 @@ public class BuildCraftEnergy {
public static Item bucketFuel;
public static Item fuel;
public static boolean canOilBurn;
public static double oilWellScalar;
public static TreeMap<BlockIndex, Integer> saturationStored = new TreeMap<BlockIndex, Integer>();
public static BCTrigger triggerBlueEngineHeat = new TriggerEngineHeat(DefaultProps.TRIGGER_BLUE_ENGINE_HEAT, EnergyStage.BLUE, "buildcraft.engine.stage.blue");
public static BCTrigger triggerGreenEngineHeat = new TriggerEngineHeat(DefaultProps.TRIGGER_GREEN_ENGINE_HEAT, EnergyStage.GREEN, "buildcraft.engine.stage.green");
@ -106,6 +107,7 @@ public class BuildCraftEnergy {
int oilDesertBiomeId = BuildCraftCore.mainConfiguration.get("biomes", "oilDesert", DefaultProps.BIOME_OIL_DESERT).getInt(DefaultProps.BIOME_OIL_DESERT);
int oilOceanBiomeId = BuildCraftCore.mainConfiguration.get("biomes", "oilOcean", DefaultProps.BIOME_OIL_OCEAN).getInt(DefaultProps.BIOME_OIL_OCEAN);
canOilBurn = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "burnOil", true, "Can oil burn?").getBoolean(true);
oilWellScalar = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "oilWellGenerationRate", 1.0, "Probability of oil well generation").getDouble(1.0);
BuildCraftCore.mainConfiguration.save();
class BiomeIdException extends RuntimeException {

View file

@ -87,6 +87,7 @@ public class OilPopulate {
|| (BiomeDictionary.isBiomeOfType(biome, FOREST) && BiomeDictionary.isBiomeOfType(biome, FROZEN));
double bonus = oilBiome ? 3.0 : 1.0;
bonus *= BuildCraftEnergy.oilWellScalar;
if (excessiveBiomes.contains(biome.biomeID)) {
bonus *= 30.0;
} else if (BuildCraftCore.debugMode) {