Master quests (#851)

* Merge master into quest branch (#824)

* uranium stoik fixes

* Update UraniumChain.groovy

* fix some stoik

* thallium chain from zinc

* add thallium dust

* finish thallium and cadmium chain

* fixed everything

* remove circuit 0

* buff latex throughput

you get 4 rubber bar/plate per 1 sulfur now

* fix PVB stoik and PVAc recipe for glue

* readd boiling recipe

* restore PVB recipe to normal?

* radiator stuff

* fix

* fix DTBP distillation recipe

* fix br so2 recipe duration

* fix PVB

* Update AirDistillation.groovy

* buh

* update mgf2 soln. volume convention

* start germanium chain

* fix things

* add waelz oxide proc chain

* add germanium/gallium route 2

* finish up germanium

* update argon-adjusted subcooling

* coagulation tank thingy

* allowing OC recipes to accept power unit regarless of the power units' charge

* finish indium

* init commit

* outline selenium chain

* outline tellurium line

* high purity tellurium outline

* outline high purity selenium

* finish selenium & tellurium

* electrolysis overhaul exodus

* reorganization

* move paper chain

* reduce sulfur consumption for latex

* fix Al2(SO4)3 stoik

* outline caesium chain

* fix co2 dupe

* refactor alcohol & carboxylic acid processes, add formic acid chain

* lepidolite line changes; rubidium line outline

* IR config change in preperation

* Update to SuSyCore 0.1.18

* Make track segments craftable

* Modify recipe for tracks and make the tunnel bore craftable

* finish caesium-rubidium

* delete simplerpc

* revert default quests changes

* fix lang

* update black mesa

* turn cadmium sponge into le block, remove useless crude plat sponge

* update susycore (take 2)

* fixes

* https://www.youtube.com/watch?v=VmGX-IVMpo0

fixes a duplicate and tests a thing

* remove latex for vulcanization

* add metaitems for tunnelbore

* add new metaitems to tunnelbore recipe

* Tunnelbore recipes (MTBOs take)

* Refactor internal naming and add localisation

* Small changes to recipes

* Minor capitalisation mistake

* Mods update (#823)

* update mods

* fix ICBM.groovy

* I'm dumb

* I'm dumb v2

* You can never escape Multiblocked.

---------

Co-authored-by: bruberu <[email protected]>
Co-authored-by: trainvoi <[email protected]>
Co-authored-by: planetme <[email protected]>
Co-authored-by: MCTian-mi <[email protected]>

* Tunnelbore Quests

* Unfuck Questbook

* Make Questbook FPS Great Again:tm: (#825)

Changes slicing mode to 2 for everything

* quest fixes for 1.12.6 (#840)

* fix error 1,2,4 in issue #837

* fix Titanium loc and PET requirements

* Fix the one missed instance of electromagnetic

---------

Co-authored-by: mtbo <[email protected]>

---------

Co-authored-by: bruberu <[email protected]>
Co-authored-by: trainvoi <[email protected]>
Co-authored-by: planetme <[email protected]>
Co-authored-by: MCTian-mi <[email protected]>
Co-authored-by: The Science Demon <[email protected]>

config/betterquesting/DefaultQuests.json

@@ -7337,7 +7337,7 @@
           "requiredItems:9": {
             "0:10": {
               "Count:3": 1,
-              "Damage:2": 290,
+              "Damage:2": 17035,
               "id:8": "gregtech:machine"
             }
           },
@@ -10874,7 +10874,7 @@
           "partialMatch:1": 1,
           "requiredItems:9": {
             "0:10": {
-              "Count:3": 1,
+              "Count:3": 16,
               "Damage:2": 122,
               "id:8": "gregtech:meta_dust"
             }
@@ -11394,7 +11394,7 @@
           "partialMatch:1": 1,
           "requiredItems:9": {
             "0:10": {
-              "Count:3": 1,
+              "Count:3": 16,
               "Damage:2": 77,
               "id:8": "gregtech:meta_dust"
             }
@@ -11580,7 +11580,7 @@
           "partialMatch:1": 1,
           "requiredItems:9": {
             "0:10": {
-              "Count:3": 1,
+              "Count:3": 16,
               "Damage:2": 106,
               "id:8": "gregtech:meta_dust"
             }
@@ -12033,7 +12033,17 @@
       "rewards:9": {},
       "tasks:9": {
         "0:10": {
-          "taskID:8": "bq_standard:checkbox"
+          "entryLogic:8": "AND",
+          "index:3": 1,
+          "partialMatch:1": 1,
+          "requiredItems:9": {
+            "0:10": {
+              "Count:3": 16,
+              "Damage:2": 110,
+              "id:8": "gregtech:meta_dust"
+            }
+          },
+          "taskID:8": "bq_standard:retrieval"
         }
       }
     },
@@ -16194,9 +16204,9 @@
     },
     "438:10": {
       "preRequisites:11": [
-        66,
         369,
-        787
+        787,
+        105
       ],
       "properties:10": {
         "betterquesting:10": {
@@ -16206,6 +16216,8 @@
           },
           "ignoresview:1": 0,
           "name:8": "susy.quest.db.438.title",
+          "questlogic:8": "OR",
+          "tasklogic:8": "OR",
           "visibility:8": "ALWAYS"
         }
       },
@@ -30906,7 +30918,7 @@
           "requiredItems:9": {
             "0:10": {
               "Count:3": 1,
-              "Damage:2": 206,
+              "Damage:2": 6202,
               "id:8": "gregtech:meta_item_2"
             }
           },
@@ -37061,6 +37073,7 @@
           "ignoresview:1": 0,
           "name:8": "susy.quest.db.864.title",
           "questlogic:8": "OR",
+          "tasklogic:8": "OR",
           "visibility:8": "ALWAYS"
         }
       },
@@ -37109,7 +37122,21 @@
       },
       "questID:3": 865,
       "rewards:9": {},
-      "tasks:9": {}
+      "tasks:9": {
+        "0:10": {
+          "requiredFluids:9": {
+            "0:10": {
+              "Amount:3": 1000,
+              "FluidName:8": "dimethyl_terephthalate"
+            }
+          },
+          "taskID:8": "bq_standard:fluid"
+        },
+        "1:10": {
+          "index:3": 1,
+          "taskID:8": "bq_standard:checkbox"
+        }
+      }
     },
     "866:10": {
       "preRequisites:11": [
@@ -37372,7 +37399,20 @@
       },
       "questID:3": 872,
       "rewards:9": {},
-      "tasks:9": {}
+      "tasks:9": {
+        "0:10": {
+          "entryLogic:8": "AND",
+          "partialMatch:1": 1,
+          "requiredItems:9": {
+            "0:10": {
+              "Count:3": 1,
+              "Damage:2": 15289,
+              "id:8": "gregtech:meta_dust"
+            }
+          },
+          "taskID:8": "bq_standard:retrieval"
+        }
+      }
     },
     "873:10": {
       "preRequisites:11": [
@@ -37607,6 +37647,7 @@
           },
           "ignoresview:1": 0,
           "name:8": "susy.quest.db.881.title",
+          "tasklogic:8": "OR",
           "visibility:8": "ALWAYS"
         }
       },

config/betterquesting/resources/supersymmetry/lang/en_us.lang

@@ -373,7 +373,7 @@ susy.quest.db.157.desc=The §6Shipping Container §rcan condense up to §627 §r
 susy.quest.db.158.title=LV Forming Press
 susy.quest.db.158.desc=The Forming Press is used to stamp metal and rubber into a §6plate §rusing a mold. It's used for making §6armor plating§r.
 susy.quest.db.159.title=Steam Armor
-susy.quest.db.159.desc=§6Steam Armor §rplating can be made with bronze, steel and brass (an alloy of 3 Copper and 1 Zinc) in a Forming Press.%n%nThe Steam Armor requires Steam to function. WIP
+susy.quest.db.159.desc=§6Steam Armor §rplating can be made with bronze, steel and brass (an alloy of 3 Copper and 1 Zinc) in a Forming Press.%nUsing an MV Fluid compressor, you can use §bHigh-Pressure Air§r to fill up §7Compressed Air Tanks§r. If these tanks are inside your inventory or your Techgun item slots, they will provide some upgrades to the Steam Armor, such as extra 2 hearts, reduced fall damage, and higher step (1.5 block per step).
 susy.quest.db.160.title=LV Autoclave
 susy.quest.db.160.desc=The §6Autoclave§r is a machine which can be used to convert dusts into crystals, like §6Quartzite§r. §rIt is required for making LV Sensors and Emitters as they require Quartzite crystals.
 susy.quest.db.161.title=Sensors and Emitters
@@ -412,8 +412,8 @@ susy.quest.db.177.title=Steam Grinder
 susy.quest.db.177.desc=The §lSteam Grinder §ris a multiblock macerator that smelts up to 8 items at once. %n%nIt requires:%n22 Bronze Plated Brick Casings%n1 Steam Hatch%n1 Input Bus (Steam)%n1 Output Bus (Steam)%n1 Steam Oven Controller%n%nIt's a 3x3x3 structure, with the controller on the center of one of the faces. %nThe input and output busses go on the sides of the controller.%n%nGood luck!%n
 susy.quest.db.178.title=Sulfuric Oil Fractions
 susy.quest.db.178.desc=Distill§6 §rany type of§6 Desalted Oil §rto get a number of oil fractions:%n%n§6- Sulfuric Refinery Gas%n- Sulfuric Naphtha (can be used as a fuel)%n- Sulfuric Diesel%n- Sulfuric Fuel Oil%n- Sulfuric Oil Residue%n- Sulfuric Gasoline (aka Light Fuel)%n- Sulfuric Kerosene (aka Heavy Fuel) §o§r%n%nYou can choose which one you want by changing the §cconfiguration §rof the Programmed Circuit. Most of these can be used as fuel for energy in a Gas Turbine.%n
-susy.quest.db.179.title=LV Electromagnetic Separator
-susy.quest.db.179.desc=The §6Electromagnetic Separator §ris a machine that uses the power of the magnetic field to §6sift ores §rand §6remove salt from oil§r.
+susy.quest.db.179.title=LV Electrostatic Separator
+susy.quest.db.179.desc=The §Electrostatic Separator §ris a machine that uses the power of the stationary electric charge to  §6remove salt from oil§r.
 susy.quest.db.180.title=Treated Sulfuric Fractions
 susy.quest.db.180.desc=Your §6sulfuric fractions §rhave to be §6treated §rby reacting the fluid with §9hydrogen§r in a Fixed Bed Reactor.
 susy.quest.db.181.title=Desulfurization
@@ -425,7 +425,7 @@ susy.quest.db.183.desc=Putting Water and Salt Water in an Electrolytic Cell with
 susy.quest.db.184.title=:alkaline:
 susy.quest.db.184.desc=§6Distilling §rthe Sodium Hydroxide solution will give §6Sodium Hydroxide §rdust.
 susy.quest.db.185.title=Sodium Aluminate
-susy.quest.db.185.desc=You are about to start a long chemical process for obtaining §baluminium§r, a material needed for MV tier. This is the first page.%nIf you ever feel confused, take a look at the §6Chemistry §rtab.%nIt is recommended that you set this up to be an automatic process, with each machine feeding onto the next one. %n%nFirst, you will need to get §6bauxite§r. Bauxite is found in ore deposits from height level 0 to 80.%n%nThe Bauxite Ore must be §6smelted §rinto Bauxite Dust, which is then reacted with §6Sodium Hydroxide §rin an §6LV Roaster §rto get Impure Sodium Aluminate solution.%n%nThe solution is then §ccentrifuged§r with an LV centrifuge to remove the impurities and get Sodium Aluminate solution.
+susy.quest.db.185.desc=You are about to start a long chemical process for obtaining §baluminium§r, a material needed for MV tier. This is the first page.%nIf you ever feel confused, take a look at the §6Chemistry §rtab.%nIt is recommended that you set this up to be an automatic process, with each machine feeding onto the next one. %n%nFirst, you will need to get §6bauxite§r. Bauxite is found in ore deposits from height level 0 to 80.%n%nThe Bauxite Ore must be §6crushed §rinto Bauxite Dust, which is then reacted with §6Sodium Hydroxide §rin an §6LV Roaster §rto get Impure Sodium Aluminate solution.%n%nThe solution is then §ccentrifuged§r with an LV centrifuge to remove the impurities and get Sodium Aluminate solution.
 susy.quest.db.186.title=LV Centrifuge
 susy.quest.db.186.desc=The §cCentrifuge §r§rcentrifuges impurities out of solids, and it is also used to get §arare materials§r out of ore dusts.
 susy.quest.db.187.title=Workbench V2
@@ -931,7 +931,7 @@ susy.quest.db.436.desc=The§a High Pressure Oxygen §r§r§ris then cooled to ma
 susy.quest.db.437.title=Multiblock Help
 susy.quest.db.437.desc=Many complicated machines that you're going to make are going to be §6multiblocks§r.%n%nMost multiblock machines can share walls. If you set up 2 Blast Furnaces close to each other, you can share their walls, saving 12 Firebricks in the process. Here's how it looks like: §9§nhttps://tinyurl.com/gt-wallsharing§r%n%nInput and Output §6buses §rare required to transport items in and out of a multiblock machine.%nInput and Output §6hatches §rcan transport fluids in and out of a machine.%n§6Energy Hatches §rcan transport energy into a machine.%n§6Energy Output Hatches and Dynamo Hatches §rcan transport energy out of a machine, and they are required for energy generating machines%n%nMost multiblocks can share input buses, but they can't share §aenergy hatches§r.%n%n§6
 susy.quest.db.438.title=Large Bronze Boiler
-susy.quest.db.438.desc=The§6 Large Bronze Boiler§r can boil §3Water §rinto §7Steam§r, using either a Furnace Fuel (Such as §6Coal, Wood, or Coke§f) or a Semi-Fluid Fuel (§6Oil, Diesel, Creosote or Biomass§f)§r.%n%nYou can check JEI to view all the Semi-Fluid Fuel options available.%n%nThe Large Bronze Boiler is useful if you want to create a power setup using a §6Large Steam Turbine§r by generating large amounts of steam.%n§l§c§lWARNING: The machine will explode if it is supplied fuel without water.§r%n%nThe Large Bronze Boiler requires:%n%n- 1 Large Bronze Boiler Controller%n- 4 Output Hatch%n- 2 Input Hatch%n- 1 Input Bus%n- 1 Maintenance Hatch%n- 1 Muffler Hatch%n- 20 Bronze Machine Casings%n- 4 Bronze Firebox Casings%n- 2 Bronze Pipe Casings
+susy.quest.db.438.desc=The§6 Large Bronze Boiler§r can boil §3Water §rinto §7Steam§r, using either a Furnace Fuel (Such as §6Coal, Wood, or Coke§f) or a Semi-Fluid Fuel (§6Oil, Diesel, Creosote or Biomass§f)§r.%n%nYou can check JEI to view all the Semi-Fluid Fuel options available.%n%nThe §6Large Bronze Boiler§r is useful if you want to create a power setup using a §6Large Steam Turbine§r by generating large amounts of steam. Alternatively, you can use the Boiler to supply §7Steam§r to your existing §2§1§4§6§8§6§7§8§6§8§b§eSingleblock Steam Turbines§r.%n§l§c§lWARNING: The machine will explode if it is supplied fuel without water.§r%n%nThe Large Bronze Boiler requires:%n- 1 Large Bronze Boiler Controller%n- 4 Output Hatch%%n- 2 Input Hatch%n- 1 Input Bus%n- 1 Maintenance Hatch%n- 1 Muffler Hatch%%n- 20 Bronze Machine Casings%n- 4 Bronze Firebox Casings%n- 2 Bronze Pipe Casings
 susy.quest.db.439.title=Ore Deposits
 susy.quest.db.439.desc=There are 7 types of ore deposits: §6Orthomagmatic, Metamorphic, Sedimentary, Magmatic Hydrothermal, Hydrothermal, Residual and Alluvial§r.%n%nThe Ore Sorter offers §64 recipes for each power tier§r.%nFor instance, using the HV recipe in the Ore Sorter results in a greater variety of ores being generated compared to the LV recipe.%n%nOrthomagmatic deposits are found in mountains.%nPlacer and Alluvial deposits are found in beaches, deserts and rivers.%nMagmatic Hydrothermal deposits are found in mountains.%nHydrothermal deposits are found in areas near water.%nSedimentary deposits are found in swamps, bogs, and mesa biomes.%nMetamorphic deposits are found close to mountains, but sometimes in plains and forest biomes too.%n%n
 susy.quest.db.440.title=LV Sifting Machine
@@ -1413,7 +1413,7 @@ susy.quest.db.677.desc=§eLiquid Helium§r is even colder, at a temperature of 
 susy.quest.db.678.title=Mercury Barium Calcium Cuprate
 susy.quest.db.678.desc=Mercury Barium Calcium Cuprate is a mixture of the oxides of mercury, barium, calcium and copper. This isn't too advanced to make.
 susy.quest.db.679.title=Getting Titanium
-susy.quest.db.679.desc=Titanium has 2 sources at this stage of the game: §6Vanadiferous Titanomagnetite,§f and §cIlmenite.§f Those are sourced from the Mining Drill only.%n%nWhat you'll want to do is process those dusts into Rutile. Both ores have different processing routes to get to Rutile, but Ilmenite is significantly easier to turn into Rutile, needing only 1 fluidized bed reactor step.%n%nNext, you'll want to react the Rutile with coke and chlorine in a Fluidized Bed Reactor, for Gaseous Titanium Tetrachloride.%n%nAfter several steps of purification, you should have normal Titanium Tetrachloride.%n%nPutting this normal Titanium Tetrachloride in an EBF with magnesium will give you a Titanium Sponge, which is just a few steps away from Titanium Ingots. You'll need better coils than just Cupronickel Coils for this though.%n%n§lYou will have to use fluid voiding mode on your EBF until you are able to put a quad fluid input hatch on your EBF.
+susy.quest.db.679.desc=§e§dTitanium§r has 3 sources at this stage of the game:%n%n§6Vanadiferous Titanomagnetite§f, which can be sourced from the §8Beneath§r, and §cIlmenite§f, which can be sourced from §aOverworld §cBauxite§r veins, and §7Perovskite§r, which can only be sourced from the §eMining Drill§r only.%n%nNOTE: §6Vanadiferous Titanomagnetite§f and §cIlmenite§f can also be sourced from the §eMining Drill§r.%n%n%nWhat you'll want to do is process those dusts into §4Rutile§r. Each ores have different processing routes to get to Rutile, but §cIlmenite§f/§7Perovskite§r is significantly easier to turn into Rutile, needing only 1 §eFluidized Bed Reactor§r step.%n%nNext, you'll want to react the Rutile with §7Coke Dust§r or §8Carbon Dust§r and §2Chlorine§r in a §eFluidized Bed Reactor§r  for §3Gaseous Titanium Tetrachloride§r.%nAfter several steps of purification, you should have normal §3Titanium Tetrachloride§r.%n%n%nPutting this normal Titanium Tetrachloride in an §eEBF§r with magnesium will give you a §dTitanium Sponge§r, which is just a few steps away from §dTitanium Ingots§r. You'll need better coils than just §6Cupronickel Coils§r for this though.%n%nNOTE:§r You will have to use fluid voiding mode on your §eEBF§r until you are able to put a quad fluid input hatch on your §eEBF§r.
 susy.quest.db.680.title=The Big Boy
 susy.quest.db.680.desc=The §6Large Chemical Reactor§r will be needed to carry out some more §cadvanced chemical processes §r§rlater on. It can handle as much as 6 inputs and outputs at the same time.%n%nAll §dOverclocks§r in the §3LCR§r are §6100%% efficient§r; each overclock will §5quadruple the speed§r, as opposed to doubling it.
 susy.quest.db.681.title=Elytra Rockets
@@ -1467,7 +1467,7 @@ susy.quest.db.704.desc=Make the HV Circuit Assembler, which will probably be use
 susy.quest.db.705.title=Trolling Plan: Phase Five
 susy.quest.db.705.desc=Now that you are at HV, you can make more advanced types of §cexplosives §rand §cmissiles §rby putting HV power on a Weapons Factory.%n%nThere are 3 new types of explosives:%n§7Endothermic explosives§r, made with cryogenics%n§3Exothermic explosives§r, made with ethylene oxide%n§aEMP explosives§r, made with superconductors%n%nYou can get most of the ingredients for these at HV.%nRemember that these are Tier 3 missiles, so you will need a T3 missile launching station for them to work.%n%nThe range of this missile is 3,000 meters.
 susy.quest.db.706.title=Titanium
-susy.quest.db.706.desc=Put the Crude Titanium Sponge in a vacuum ejector to purify it. Then, macerate it for titanium dust. Smelt this in an EBF with Kanthal Coils (or better) to get a hot titanium ingot, which has to be cooled in a quencher for normal titanium ingots.
+susy.quest.db.706.desc=Put the §dCrude Titanium Sponge§r in a §6Vacuum Chamber§r to purify it. Then, macerate it for §dTitanium§r dust. Smelt this in an §6EBF§r with §bKanthal Coils§r (or better) to get a §chot§r §dTitanium§r ingot, which has to be cooled in a quencher for normal §dTitanium§r ingots§r.
 susy.quest.db.707.title=Even Better Coils
 susy.quest.db.707.desc=§9Nichrome Coils§f can go all the way up to a whopping §c3,600 Kelvin.
 susy.quest.db.708.title=Better Coils
@@ -1824,3 +1824,7 @@ susy.quest.db.883.title=Monorail Tracks
 susy.quest.db.883.desc=If you want to stick to the $6Black Mesa$r inspired style of railroading, you will require §6monorail track segments§r. They are also required in the §6tunnel bore§r.
 susy.quest.db.884.title=The Tunnel Bore
 susy.quest.db.884.desc=In conjuction with improved logistics, trains also allow you to unleash the glory of tunnel boring onto the very rock you are standing on. Building the tunnelbore requires a hefty amount of resources. In return, it allows you to rapidly excavate giant areas and automatically connect distant places with monorail tracks.%n%nIn order to power the tunnel bore, you need to supply charged batteries. Additionally, you must manufacture monorail tracks that you can put into the specificied slots. Lastly, if you want the tunnel bore to automatically bridge over any hole it encounters, you must supply it with concrete in the main area of the inventory.%n%nOnce this is done, it is just a matter of increasing the tunnelbores throttle and enjoying the glory of digging away at the mountains.
+susy.quest.db.883.title=Monorail Tracks
+susy.quest.db.883.desc=If you want to stick to the $6Black Mesa$r inspired style of railroading, you will require §6monorail track segments§r. They are also required in the §6tunnel bore§r.
+susy.quest.db.884.title=The Tunnel Bore
+susy.quest.db.884.desc=In conjuction with improved logistics, trains also allow you to unleash the glory of tunnel boring onto the very rock you are standing on. Building the tunnelbore requires a hefty amount of resources. In return, it allows you to rapidly excavate giant areas and automatically connect distant places with monorail tracks.%n%nIn order to power the tunnel bore, you need to supply charged batteries. Additionally, you must manufacture monorail tracks that you can put into the specificied slots. Lastly, if you want the tunnel bore to automatically bridge over any hole it encounters, you must supply it with concrete in the main area of the inventory.%n%nOnce this is done, it is just a matter of increasing the tunnelbores throttle and enjoying the glory of digging away at the mountains.

groovy/classes/ChangeFlags.groovy

@@ -95,7 +95,6 @@ class ChangeFlags {
         setupFluidType(BisphenolA, FluidStorageKeys.LIQUID, 428)
         setupFluidType(Iodine, FluidStorageKeys.GAS, 460)
         setupFluidType(Chlorine, FluidStorageKeys.PLASMA)
-        setupFluidType(Selenium, FluidStorageKeys.LIQUID, 494)
 
         Polybenzimidazole.setProperty(SuSyPropertyKey.FIBER, new FiberProperty(false, true, true))
         Polytetrafluoroethylene.setProperty(SuSyPropertyKey.FIBER, new FiberProperty(false, true, false))