Skip to content

Fix some issues and inconsistencies with MFR laser drill foci #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
koolkrafter5 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix some issues and inconsistencies with MFR laser drill foci #52

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 22 additions & 20 deletions scripts/MFR Laser Drill.zs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,10 +259,10 @@ MiningLaser.removePreferredOre(15, <NetherOres:tile.netherores.ore.1:6> );
MiningLaser.removePreferredOre(15, <NetherOres:tile.netherores.ore.1:10> );

MiningLaser.addPreferredOre(4, <BigReactors:YelloriteOre>);
MiningLaser.addPreferredOre(1, <Metallurgy:base.ore:2>);
MiningLaser.addPreferredOre(7, <Metallurgy:base.ore:2>);
MiningLaser.addPreferredOre(15, <Metallurgy:ender.ore:1>);
MiningLaser.addPreferredOre(15, <Metallurgy:ender.ore>);
MiningLaser.addPreferredOre(7, <Metallurgy:fantasy.ore:1>);
MiningLaser.addPreferredOre(12, <Metallurgy:fantasy.ore:1>);
MiningLaser.addPreferredOre(2, <Metallurgy:fantasy.ore:11>);
MiningLaser.addPreferredOre(2, <Metallurgy:fantasy.ore:14>);
MiningLaser.addPreferredOre(12, <Metallurgy:fantasy.ore:2>);
Expand All @@ -271,7 +271,7 @@ MiningLaser.addPreferredOre(12, <Metallurgy:fantasy.ore:5>);
MiningLaser.addPreferredOre(2, <Metallurgy:fantasy.ore:6>);
MiningLaser.addPreferredOre(12, <Metallurgy:fantasy.ore:8>);
MiningLaser.addPreferredOre(12, <Metallurgy:fantasy.ore>);
MiningLaser.addPreferredOre(7, <Metallurgy:nether.ore:1>);
MiningLaser.addPreferredOre(6, <Metallurgy:nether.ore:1>);
MiningLaser.addPreferredOre(6, <Metallurgy:nether.ore:2>);
MiningLaser.addPreferredOre(6, <Metallurgy:nether.ore:3>);
MiningLaser.addPreferredOre(6, <Metallurgy:nether.ore:4>);
Expand All @@ -281,7 +281,7 @@ MiningLaser.addPreferredOre(6, <Metallurgy:nether.ore:7>);
MiningLaser.addPreferredOre(6, <Metallurgy:nether.ore:8>);
MiningLaser.addPreferredOre(6, <Metallurgy:nether.ore:9>);
MiningLaser.addPreferredOre(6, <Metallurgy:nether.ore>);
MiningLaser.addPreferredOre(1, <Metallurgy:precious.ore>);
MiningLaser.addPreferredOre(7, <Metallurgy:precious.ore>);
MiningLaser.addPreferredOre(1, <Metallurgy:utility.ore:1>);
MiningLaser.addPreferredOre(1, <Metallurgy:utility.ore:2>);
MiningLaser.addPreferredOre(1, <Metallurgy:utility.ore:3>);
Expand All @@ -291,18 +291,20 @@ MiningLaser.addPreferredOre(1, <Metallurgy:utility.ore>);
MiningLaser.addPreferredOre(4, <minecraft:coal_ore>);
MiningLaser.addPreferredOre(3, <minecraft:diamond_ore>);
MiningLaser.addPreferredOre(13, <minecraft:emerald_ore>);
MiningLaser.addPreferredOre(6, <minecraft:glowstone>);
MiningLaser.addPreferredOre(1, <minecraft:glowstone>);
MiningLaser.addPreferredOre(7, <minecraft:gold_ore>);
MiningLaser.addPreferredOre(7, <minecraft:iron_ore>);
MiningLaser.addPreferredOre(11, <minecraft:lapis_ore>);
MiningLaser.addPreferredOre(0, <minecraft:quartz_ore>);
MiningLaser.addPreferredOre(14, <NetherOres:tile.netherores.ore.0:1>);
MiningLaser.addPreferredOre(1, <minecraft:redstone_ore>);
MiningLaser.addPreferredOre(3, <NetherOres:tile.netherores.ore.0:1>);
MiningLaser.addPreferredOre(14, <NetherOres:tile.netherores.ore.0:10>);
MiningLaser.addPreferredOre(14, <NetherOres:tile.netherores.ore.0:13>);
MiningLaser.addPreferredOre(13, <NetherOres:tile.netherores.ore.0:14>);
MiningLaser.addPreferredOre(11, <NetherOres:tile.netherores.ore.0:15>);
MiningLaser.addPreferredOre(14, <NetherOres:tile.netherores.ore.0:2>);
MiningLaser.addPreferredOre(14, <NetherOres:tile.netherores.ore.0:3>);
MiningLaser.addPreferredOre(14, <NetherOres:tile.netherores.ore.0:4>);
MiningLaser.addPreferredOre(11, <NetherOres:tile.netherores.ore.0:4>);
MiningLaser.addPreferredOre(14, <NetherOres:tile.netherores.ore.0:5>);
MiningLaser.addPreferredOre(14, <NetherOres:tile.netherores.ore.0:6>);
MiningLaser.addPreferredOre(14, <NetherOres:tile.netherores.ore.0:7>);
Expand All @@ -318,11 +320,11 @@ MiningLaser.addPreferredOre(14, <NetherOres:tile.netherores.ore.1:2>);
MiningLaser.addPreferredOre(14, <NetherOres:tile.netherores.ore.1:5>);
MiningLaser.addPreferredOre(14, <NetherOres:tile.netherores.ore.1:7>);
MiningLaser.addPreferredOre(14, <NetherOres:tile.netherores.ore.1>);
MiningLaser.addPreferredOre(6, <TConstruct:SearedBrick:1>);
MiningLaser.addPreferredOre(6, <TConstruct:SearedBrick:2>);
MiningLaser.addPreferredOre(8, <TConstruct:SearedBrick:5>);
MiningLaser.addPreferredOre(14, <TConstruct:SearedBrick:1>);
MiningLaser.addPreferredOre(14, <TConstruct:SearedBrick:2>);
MiningLaser.addPreferredOre(7, <TConstruct:SearedBrick:5>);
MiningLaser.addPreferredOre(1, <Thaumcraft:blockCustomOre:7>);
MiningLaser.addPreferredOre(1, <Thaumcraft:blockCustomOre>);
MiningLaser.addPreferredOre(7, <Thaumcraft:blockCustomOre>);
MiningLaser.addPreferredOre(8, <ThermalFoundation:Ore:3>);
MiningLaser.addPreferredOre(8, <ThermalFoundation:Ore:4>);
MiningLaser.addPreferredOre(8, <Metallurgy:base.ore:1>);
Expand All @@ -344,23 +346,23 @@ MiningLaser.addPreferredOre(9, <appliedenergistics2:tile.OreQuartzCharged>);

<MineFactoryReloaded:laserfocus:0>.displayName = "Clear Focus";
<MineFactoryReloaded:laserfocus:0>.addTooltip("Increases the chance of finding");
<MineFactoryReloaded:laserfocus:0>.addTooltip("Salt and Nether Quartz");
<MineFactoryReloaded:laserfocus:0>.addTooltip("Salt and Nether Quartz.");

<MineFactoryReloaded:laserfocus:1>.displayName = "Utility Focus";
<MineFactoryReloaded:laserfocus:1>.addTooltip("Increases the chance of finding some non-");
<MineFactoryReloaded:laserfocus:1>.addTooltip("metal ores such as Zinc, Manganese, or Bitumen");
<MineFactoryReloaded:laserfocus:1>.displayName = "Nonmetal Focus";
<MineFactoryReloaded:laserfocus:1>.addTooltip("Increases the chance of finding some nonmetal");
<MineFactoryReloaded:laserfocus:1>.addTooltip("ores such as Redstone, Sulfur, and Bitumen.");

<MineFactoryReloaded:laserfocus:2>.displayName = "Hard Alien Focus";
<MineFactoryReloaded:laserfocus:2>.addTooltip("Increases the chance of finding high-grade");
<MineFactoryReloaded:laserfocus:2>.addTooltip("alien metals such as Atlarus and Adamantine");
<MineFactoryReloaded:laserfocus:2>.addTooltip("alien metals such as Atlarus and Adamantine.");

<MineFactoryReloaded:laserfocus:3>.displayName = "Diamond Focus";
<MineFactoryReloaded:laserfocus:3>.addTooltip("Increases the chance");
<MineFactoryReloaded:laserfocus:3>.addTooltip("of finding Diamonds.");

<MineFactoryReloaded:laserfocus:4>.displayName = "Power Focus";
<MineFactoryReloaded:laserfocus:4>.addTooltip("Increases the chance of");
<MineFactoryReloaded:laserfocus:4>.addTooltip("finding Coal and Nuclear Fuel");
<MineFactoryReloaded:laserfocus:4>.addTooltip("finding Coal and Nuclear Fuel.");

<MineFactoryReloaded:laserfocus:5>.displayName = "Fishy Focus";
<MineFactoryReloaded:laserfocus:5>.addTooltip("Increases the chance of");
Expand All @@ -371,9 +373,9 @@ MiningLaser.addPreferredOre(9, <appliedenergistics2:tile.OreQuartzCharged>);
<MineFactoryReloaded:laserfocus:6>.addTooltip("Increases the chance of");
<MineFactoryReloaded:laserfocus:6>.addTooltip("finding alien nether ores.");

<MineFactoryReloaded:laserfocus:7>.displayName = "Iron Focus";
<MineFactoryReloaded:laserfocus:7>.displayName = "Utility Metal Focus";
<MineFactoryReloaded:laserfocus:7>.addTooltip("Increases the chance of finding");
<MineFactoryReloaded:laserfocus:7>.addTooltip("Iron and its alien variants.");
<MineFactoryReloaded:laserfocus:7>.addTooltip("useful metals like iron and gold.");

<MineFactoryReloaded:laserfocus:8>.displayName = "Tech Focus";
<MineFactoryReloaded:laserfocus:8>.addTooltip("Increases the chance of");
Expand Down Expand Up @@ -405,7 +407,7 @@ MiningLaser.addPreferredOre(9, <appliedenergistics2:tile.OreQuartzCharged>);

<MineFactoryReloaded:laserfocus:15>.displayName = "End Focus";
<MineFactoryReloaded:laserfocus:15>.addTooltip("Increases the chance of");
<MineFactoryReloaded:laserfocus:15>.addTooltip("finding alien ender metals");
<MineFactoryReloaded:laserfocus:15>.addTooltip("finding alien ender metals.");

furnace.addRecipe(<customnpcs:npcSaphire> *2, <ore:oreNetherSapphire>, 0.5);
mods.thermalexpansion.Pulverizer.addRecipe(3200, <NetherOres:tile.netherores.ore.0:15>, <customnpcs:npcSaphire> *5, <minecraft:netherrack>, 15);
Expand Down