Skip to content

Commit

Permalink
Further Fixes and Tweaks for 1.7 (#470)
Browse files Browse the repository at this point in the history 
See Description (#470).

[EXPAND]
[[messages]]
messageTitle = "Fixes QB Issues in [#367](#367)"
messageBody = "[QB]"

[[messages]]
messageTitle = "Reworded and Cleared Up Fluid Rig Quest"
messageBody = "[QB]"

[[messages]]
messageTitle = "Allow Brewery Quest to accept up to IV Tier"
messageBody = "[QB]\n[NM]"

[[messages]]
messageTitle = "Allow LV Battery Buffer Quest to accept any Battery Buffer"
messageBody = "[QB]\n[NM]"

[[messages]]
messageTitle = "Allow Steam Production Quest to accept any Steam Boiler"
messageBody = "[QB]\n[HM]"

[[messages]]
messageTitle = "Fix Titanium Tetrachloride Quest requiring a Bucket"
messageBody = "[QB]"

[[messages]]
messageTitle = "Allow Macerating Charcoal Blocks"
messageBody = "[FEATURE]\n[QOL]"

[[messages]]
messageTitle = "Add GT Machine Recipes for some Crafting Components"
messageBody = "[FEATURE]\n[QOL]"
[EXPAND]

Co-authored-by: IntegerLimit <103940576+IntegerLimit@users.noreply.github.com>
  • Loading branch information
@tracer4b @IntegerLimit
tracer4b and IntegerLimit committed Oct 24, 2023
1 parent 7ca652d commit 60b6c70
Show file tree
Hide file tree
Showing 7 changed files with 897 additions and 681 deletions.
444 changes: 248 additions & 196 deletions overrides/config/betterquesting/saved_quests/ExpertQuestsDev.json
View file

Large diffs are not rendered by default.

1,002 changes: 523 additions & 479 deletions overrides/config/betterquesting/saved_quests/NormalQuestsDev.json
View file

Large diffs are not rendered by default.

18 changes: 18 additions & 0 deletions overrides/scripts/DraconicEvolution.zs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ recipes.addShaped(<draconicevolution:draconic_core>, [
[<ore:ingotTungstenCarbide>, <actuallyadditions:block_crystal_empowered:1>, <ore:ingotTungstenCarbide>],
[<metaitem:ingotDraconium>, <ore:ingotTungstenCarbide>, <metaitem:ingotDraconium>]]);

assembler.recipeBuilder()
.inputs(<metaitem:ingotDraconium> * 4, <ore:ingotTungstenCarbide> * 4, <actuallyadditions:block_crystal_empowered:1>)
.outputs(<draconicevolution:draconic_core>)
.duration(100).EUt(16).buildAndRegister();

var star = <minecraft:nether_star>;
var dblock = <draconicevolution:draconium_block>;
var dragcore = <draconicevolution:draconic_core>;
Expand Down Expand Up @@ -103,13 +108,26 @@ assembly_line.recipeBuilder()
.duration(1200).EUt(30720).buildAndRegister();

recipes.remove(<draconicevolution:energy_storage_core>);

// Infused Lava Crystal Blocks
compressor.recipeBuilder()
.inputs(<armorplus:lava_crystal:1> * 9)
.outputs(<armorplus:block_infused_lava_crystal>)
.duration(300).EUt(2).buildAndRegister();

compressor.recipeBuilder()
.inputs(<armorplus:block_infused_lava_crystal> * 9)
.outputs(<armorplus:block_compressed_infused_lava_crystal>)
.duration(300).EUt(2).buildAndRegister();

assembly_line.recipeBuilder()
.inputs(<metaitem:frameTungstenCarbide>, <ore:plateDraconium> * 6, <draconicevolution:wyvern_core>, <draconicevolution:wyvern_energy_core> * 4, <metaitem:field.generator.iv> * 2, <metaitem:wireGtSingleVanadiumGallium> * 12)
.fluidInputs(<liquid:soldering_alloy> * 1152)
.outputs(<draconicevolution:energy_storage_core>)
.property("research", <draconicevolution:wyvern_energy_core>)
.duration(1200).EUt(30720).buildAndRegister();


recipes.addShapeless(<metaitem:dustDraconium>, [<draconicevolution:draconium_dust>]);

// Hacky fix for broken DE stuff
Expand Down
48 changes: 47 additions & 1 deletion overrides/scripts/Earlygame.zs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,42 +265,77 @@ forge_hammer.recipeBuilder().inputs([<minecraft:sand>]).outputs([<contenttweaker

macerator.recipeBuilder().inputs([<ore:endstone>.firstItem]).outputs([<ore:dustEndstone>.firstItem]).duration(16).EUt(10).buildAndRegister();

// Iron Furnace
assembler.recipeBuilder()
.inputs(<ore:craftingFurnace>, <ore:ingotIron> * 8)
.circuit(8)
.outputs(<morefurnaces:furnaceblock>)
.duration(100).EUt(7).buildAndRegister();

//Copper Furnace
recipes.remove(<morefurnaces:furnaceblock:5>);
recipes.addShaped(<morefurnaces:furnaceblock:5>, [
[<ore:ingotCopper>, <ore:ingotCopper>, <ore:ingotCopper>],
[<ore:ingotCopper>, <morefurnaces:furnaceblock>, <ore:ingotCopper>],
[<ore:ingotCopper>, <ore:ingotCopper>, <ore:ingotCopper>]]);

assembler.recipeBuilder()
.inputs(<morefurnaces:furnaceblock>, <ore:ingotCopper> * 8)
.circuit(8)
.outputs(<morefurnaces:furnaceblock:5>)
.duration(100).EUt(7).buildAndRegister();

//Silver Furnace
recipes.remove(<morefurnaces:furnaceblock:6>);
recipes.addShaped(<morefurnaces:furnaceblock:6>, [
[<ore:ingotSilver>, <ore:ingotSilver>, <ore:ingotSilver>],
[<ore:ingotSilver>, <morefurnaces:furnaceblock:5>, <ore:ingotSilver>],
[<ore:ingotSilver>, <ore:ingotSilver>, <ore:ingotSilver>]]);

assembler.recipeBuilder()
.inputs(<morefurnaces:furnaceblock:5>, <ore:ingotSilver> * 8)
.circuit(8)
.outputs(<morefurnaces:furnaceblock:6>)
.duration(100).EUt(7).buildAndRegister();

//Gold Furnace
recipes.remove(<morefurnaces:furnaceblock:1>);
recipes.addShaped(<morefurnaces:furnaceblock:1>, [
[<minecraft:gold_ingot>, <minecraft:gold_ingot>, <minecraft:gold_ingot>],
[<minecraft:gold_ingot>, <morefurnaces:furnaceblock:6>, <minecraft:gold_ingot>],
[<minecraft:gold_ingot>, <minecraft:gold_ingot>, <minecraft:gold_ingot>]]);

assembler.recipeBuilder()
.inputs(<morefurnaces:furnaceblock:6>, <ore:ingotGold> * 8)
.circuit(8)
.outputs(<morefurnaces:furnaceblock:1>)
.duration(100).EUt(7).buildAndRegister();

//Diamond Furnace
recipes.remove(<morefurnaces:furnaceblock:2>);
recipes.addShaped(<morefurnaces:furnaceblock:2>, [
[<minecraft:diamond>, <minecraft:diamond>, <minecraft:diamond>],
[<minecraft:diamond>, <morefurnaces:furnaceblock:1>, <minecraft:diamond>],
[<minecraft:diamond>, <minecraft:diamond>, <minecraft:diamond>]]);

assembler.recipeBuilder()
.inputs(<morefurnaces:furnaceblock:1>, <ore:gemDiamond> * 8)
.circuit(8)
.outputs(<morefurnaces:furnaceblock:2>)
.duration(100).EUt(7).buildAndRegister();

//Obsidian Furnace
recipes.remove(<morefurnaces:furnaceblock:3>);
recipes.addShaped(<morefurnaces:furnaceblock:3>, [
[<minecraft:obsidian>, <minecraft:obsidian>, <minecraft:obsidian>],
[<morefurnaces:furnaceblock:2>, <minecraft:obsidian>, <morefurnaces:furnaceblock:2>],
[<minecraft:obsidian>, <minecraft:obsidian>, <minecraft:obsidian>]]);


assembler.recipeBuilder()
.inputs(<morefurnaces:furnaceblock:2> * 2, <ore:blockObsidian> * 7)
.circuit(8)
.outputs(<morefurnaces:furnaceblock:3>)
.duration(100).EUt(7).buildAndRegister();

// Battery Alloy
recipes.addShapeless(<metaitem:dustBatteryAlloy> * 4, [<ore:dustLead>,<ore:dustLead>,<ore:dustLead>,<ore:dustLead>,<ore:dustAntimony>]);
Expand Down Expand Up @@ -420,6 +455,17 @@ recipes.addShaped(<naturescompass:naturescompass>,
[<ore:logWood>, <metaitem:prospector.lv>, <ore:logWood>],
[<ore:treeSapling>, <ore:logWood>, <ore:treeSapling>]]);

// Charcoal maceration
macerator.recipeBuilder()
.inputs(<thermalfoundation:storage_resource>)
.outputs(<metaitem:dustCharcoal> * 9)
.duration(108).EUt(2).buildAndRegister();

macerator.recipeBuilder()
.inputs(<chisel:block_charcoal:*>)
.outputs(<metaitem:dustCharcoal> * 9)
.duration(108).EUt(2).buildAndRegister();

/*arc_furnace.recipeBuilder()
.inputs(<minecraft:iron_door>)
.fluidInputs(<liquid:oxygen> * 236)
Expand Down
19 changes: 18 additions & 1 deletion overrides/scripts/Microverse.zs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,12 +218,19 @@ makeExtremeRecipe9(<contenttweaker:tiersevenship>,
);

assembly_line.recipeBuilder()
.inputs([<metaitem:frameMicroversium>, <ore:plateEnderium> * 6, <draconicevolution:item_dislocation_inhibitor>, <draconicevolution:dislocator_advanced> * 2, <ore:plateCrystalMatrix> * 2, <metaitem:field.generator.iv> * 2, <simplyjetpacks:metaitemmods:30> * 2, <simplyjetpacks:metaitemmods:11>])
.inputs([<metaitem:frameMicroversium>, <ore:plateEnderium> * 6, <draconicevolution:item_dislocation_inhibitor>, <draconicevolution:magnet:1>, <ore:plateCrystalMatrix> * 2, <metaitem:field.generator.iv> * 2, <simplyjetpacks:metaitemmods:30> * 2, <simplyjetpacks:metaitemmods:11>])
.fluidInputs(<liquid:soldering_alloy> * 1152)
.outputs(<contenttweaker:warpengine>)
.property("research", <draconicevolution:item_dislocation_inhibitor>)
.duration(1800).EUt(30720).buildAndRegister();

recipes.remove(<draconicevolution:magnet:1>);

recipes.addShaped(<draconicevolution:magnet:1>, [
[<ore:ingotDraconium>, null, <ore:ingotDraconium>],
[<ore:dustRedstone>, <draconicevolution:magnet>, <ore:dustRedstone>],
[<ore:ingotEuropium>, <draconicevolution:dislocator_advanced>, <ore:ingotEuropium>]
]);

///////////// Tier Eight Space Ship //////////////////

Expand Down Expand Up @@ -378,6 +385,11 @@ makeShaped("of_densehydrogen", <contenttweaker:densehydrogen>,
{ H : <contenttweaker:solidifiedhydrogen> }
);

compressor.recipeBuilder()
.inputs(<contenttweaker:solidifiedhydrogen> * 9)
.outputs(<contenttweaker:densehydrogen>)
.duration(300).EUt(2).buildAndRegister();

// Dense -> Solidified decomposition
recipes.addShapeless(<contenttweaker:solidifiedhydrogen> * 9, [<contenttweaker:densehydrogen>]);

Expand All @@ -389,6 +401,11 @@ makeShaped("of_ultradensehydrogen", <contenttweaker:ultradensehydrogen>,
{ D : <contenttweaker:densehydrogen> }
);

compressor.recipeBuilder()
.inputs(<contenttweaker:densehydrogen> * 9)
.outputs(<contenttweaker:ultradensehydrogen>)
.duration(300).EUt(2).buildAndRegister();

// Ultra Dense -> Dense decomposition
recipes.addShapeless(<contenttweaker:densehydrogen> * 9, [<contenttweaker:ultradensehydrogen>]);

Expand Down
25 changes: 25 additions & 0 deletions overrides/scripts/ThermalExpansion.zs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,13 +151,25 @@ recipes.addShaped(<thermalfoundation:material:514>, [
[<minecraft:redstone>, <metaitem:stickSilver>, <minecraft:redstone>],
[<metaitem:stickSilver>, <minecraft:redstone>, null]]);

assembler.recipeBuilder()
.inputs(<ore:dustRedstone> * 3, <ore:boltSilver> * 12)
.circuit(16)
.outputs(<thermalfoundation:material:514>)
.duration(100).EUt(16).buildAndRegister();

//Gold Reception Coil
recipes.remove(<thermalfoundation:material:513>);
recipes.addShaped(<thermalfoundation:material:513>, [
[null, <minecraft:redstone>, <metaitem:stickElectrum>],
[<minecraft:redstone>, <metaitem:stickElectrum>, <minecraft:redstone>],
[<metaitem:stickElectrum>, <minecraft:redstone>, null]]);

assembler.recipeBuilder()
.inputs(<ore:dustRedstone> * 3, <ore:boltElectrum> * 12)
.circuit(16)
.outputs(<thermalfoundation:material:513>)
.duration(100).EUt(16).buildAndRegister();

//Auxiliary Transmission Coil
recipes.remove(<thermalexpansion:augment:512>);
recipes.addShaped(<thermalexpansion:augment:512>, [
Expand Down Expand Up @@ -312,6 +324,12 @@ recipes.addShaped(<contenttweaker:excitationcoil>, [
[<metaitem:plateRedAlloy>, <thermalfoundation:material:515>, <metaitem:plateRedAlloy>],
[<metaitem:plateRedAlloy>, <thermalfoundation:material:515>, <metaitem:plateRedAlloy>]]);

assembler.recipeBuilder()
.inputs(<metaitem:plateRedAlloy> * 5, <thermalfoundation:material:515> * 2)
.circuit(16)
.outputs(<contenttweaker:excitationcoil>)
.duration(100).EUt(16).buildAndRegister();

<contenttweaker:excitationcoil>.addTooltip(format.darkGray(format.italic("Crafting component only.")));

// Boiler Conversion
Expand All @@ -322,11 +340,18 @@ recipes.addShaped(<thermalexpansion:augment:576>, [
[null, <ore:blockGlassHardened>, null]
]);

// Redstone Conductance Coil
recipes.addShaped(<thermalfoundation:material:515>, [
[<metaitem:stickGold>, <minecraft:redstone>, null],
[<minecraft:redstone>, <metaitem:stickGold>, <minecraft:redstone>],
[null, <minecraft:redstone>, <metaitem:stickGold>]]);

assembler.recipeBuilder()
.inputs(<ore:dustRedstone> * 3, <ore:boltGold> * 12)
.circuit(16)
.outputs(<thermalfoundation:material:515>)
.duration(100).EUt(16).buildAndRegister();


mods.jei.JEI.removeAndHide(<thermalexpansion:augment:258>);
mods.jei.JEI.removeAndHide(<thermalexpansion:augment:273>);
Expand Down
22 changes: 18 additions & 4 deletions overrides/scripts/_oreDict.zs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2565,11 +2565,14 @@ recipes.addShapeless(<metaitem:ingotRedAlloy>, [<enderio:item_alloy_ingot:3>]);
//<ore:dustSignalum>.remove(<thermalfoundation:material:101>);

//Questbook things
<ore:questbookBrewery>.add(<meta_tile_entity:brewery.lv>); // LV Brewery
<ore:questbookBrewery>.add(<meta_tile_entity:brewery.mv>); // MV Brewery
<ore:questbookBrewery>.add(<meta_tile_entity:brewery.lv>);
<ore:questbookBrewery>.add(<meta_tile_entity:brewery.mv>);
<ore:questbookBrewery>.add(<meta_tile_entity:brewery.hv>);
<ore:questbookBrewery>.add(<meta_tile_entity:brewery.ev>);
<ore:questbookBrewery>.add(<meta_tile_entity:brewery.iv>);
//
<ore:questbookDistillery>.add(<meta_tile_entity:distillery.lv>); // LV Distillery
<ore:questbookDistillery>.add(<meta_tile_entity:distillery.mv>); // MV Distillery
<ore:questbookDistillery>.add(<meta_tile_entity:distillery.lv>);
<ore:questbookDistillery>.add(<meta_tile_entity:distillery.mv>);
//
//<ore:questbookCentrifuge>.add(<meta_tile_entity:centrifuge.lv>); // LV Centrifuge
//<ore:questbookCentrifuge>.add(<meta_tile_entity:centrifuge.mv>); // MV Centrifuge
Expand All @@ -2594,6 +2597,10 @@ recipes.addShapeless(<metaitem:ingotRedAlloy>, [<enderio:item_alloy_ingot:3>]);
<ore:questbookLvCef>.add(<metaitem:energy_converter.lv.8>);
<ore:questbookLvCef>.add(<metaitem:energy_converter.lv.16>);

<ore:questbookLvBatteryBuffer>.add(<metaitem:battery_buffer.lv.4>);
<ore:questbookLvBatteryBuffer>.add(<metaitem:battery_buffer.lv.8>);
<ore:questbookLvBatteryBuffer>.add(<metaitem:battery_buffer.lv.16>);

<ore:questbookMvCef>.add(<metaitem:energy_converter.mv.1>);
<ore:questbookMvCef>.add(<metaitem:energy_converter.mv.4>);
<ore:questbookMvCef>.add(<metaitem:energy_converter.mv.8>);
Expand All @@ -2604,6 +2611,13 @@ recipes.addShapeless(<metaitem:ingotRedAlloy>, [<enderio:item_alloy_ingot:3>]);
<ore:questbookParallelControlHatch>.add(<metaitem:gcym:parallel_hatch.zpm>);
<ore:questbookParallelControlHatch>.add(<metaitem:gcym:parallel_hatch.uv>);

<ore:questbookSteamBoiler>.add(<gregtech:machine:1>);
<ore:questbookSteamBoiler>.add(<gregtech:machine:2>);
<ore:questbookSteamBoiler>.add(<gregtech:machine:3>);
<ore:questbookSteamBoiler>.add(<gregtech:machine:4>);
<ore:questbookSteamBoiler>.add(<gregtech:machine:5>);
<ore:questbookSteamBoiler>.add(<gregtech:machine:6>);

//<ore:questbookFluidExtractor>.add(<meta_tile_entity:fluid_extractor.lv>); // LV Fluid Extractor
//<ore:questbookFluidExtractor>.add(<meta_tile_entity:fluid_extractor.mv>); // MV Fluid Extractor
//<ore:questbookFluidExtractor>.add(<meta_tile_entity:fluid_extractor.hv>); // HV Fluid Extractor
Expand Down

0 comments on commit 60b6c70

Please sign in to comment.