From 8f67d107353097a1fa0b7ed09e794684cf3bab21 Mon Sep 17 00:00:00 2001 From: quackquack-11 Date: Mon, 22 Jul 2024 17:47:19 +0200 Subject: [PATCH 01/18] remove grenade crafting table recipes --- groovy/postInit/mod/ICBM.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/groovy/postInit/mod/ICBM.groovy b/groovy/postInit/mod/ICBM.groovy index 0665bb749..3b833af85 100755 --- a/groovy/postInit/mod/ICBM.groovy +++ b/groovy/postInit/mod/ICBM.groovy @@ -84,6 +84,7 @@ def name_removals = [ "icbmclassic:concrete", "icbmclassic:concrete.1", "icbmclassic:concrete.2", + "icbmclassic:grenade:0", ] for (item in name_removals) { From 2b62b62a73a671336619ef663476dd1b0d08e3c0 Mon Sep 17 00:00:00 2001 From: quackquack-11 Date: Mon, 22 Jul 2024 17:48:44 +0200 Subject: [PATCH 02/18] remove crafting table recipes (different naming convention) --- groovy/postInit/mod/ICBM.groovy | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/groovy/postInit/mod/ICBM.groovy b/groovy/postInit/mod/ICBM.groovy index 3b833af85..69f78c7e3 100755 --- a/groovy/postInit/mod/ICBM.groovy +++ b/groovy/postInit/mod/ICBM.groovy @@ -85,6 +85,10 @@ def name_removals = [ "icbmclassic:concrete.1", "icbmclassic:concrete.2", "icbmclassic:grenade:0", + "icbmclassic:launcher/support", + "icbmclassic:launcher/base", + "icbmclassic:launcher/screen", + "icbmclassic:launcher/connector", ] for (item in name_removals) { From 17c4ff145234ede44a412463599ce9403b534ccb Mon Sep 17 00:00:00 2001 From: quackquack-11 Date: Mon, 22 Jul 2024 17:51:37 +0200 Subject: [PATCH 03/18] removed tier 2 and 3 frames, platforms and screens -note quests for higher tiers are obsolete now --- groovy/postInit/mod/ICBM.groovy | 76 --------------------------------- 1 file changed, 76 deletions(-) diff --git a/groovy/postInit/mod/ICBM.groovy b/groovy/postInit/mod/ICBM.groovy index 69f78c7e3..fb4a4c418 100755 --- a/groovy/postInit/mod/ICBM.groovy +++ b/groovy/postInit/mod/ICBM.groovy @@ -394,58 +394,6 @@ mods.gregtech.assembler.recipeBuilder() .EUt(30) .buildAndRegister(); -mods.gregtech.assembler.recipeBuilder() - .inputs([ - ore('plateAluminium')*3, - ore('frameGtAluminium')*2, - ore('stickLongAluminium')*2, - ore('circuitHv') - ]) - .fluidInputs(fluid('soldering_alloy') * 72) - .outputs(item('icbmclassic:launcherbase:1')) - .duration(400) - .EUt(60) - .buildAndRegister(); - -mods.gregtech.assembler.recipeBuilder() - .inputs([ - ore('plateAluminium')*2, - ore('stickAluminium')*2, - ore('paneGlassColorless'), - ore('circuitHv') - ]) - .fluidInputs(fluid('soldering_alloy') * 72) - .outputs(item('icbmclassic:launcherscreen:1')) - .duration(400) - .EUt(60) - .buildAndRegister(); - -mods.gregtech.assembler.recipeBuilder() - .inputs([ - ore('plateStainlessSteel')*3, - ore('frameGtStainlessSteel')*2, - ore('stickLongStainlessSteel')*2, - ore('circuitEv') - ]) - .fluidInputs(fluid('soldering_alloy') * 72) - .outputs(item('icbmclassic:launcherbase:2')) - .duration(400) - .EUt(260) - .buildAndRegister(); - -mods.gregtech.assembler.recipeBuilder() - .inputs([ - ore('plateStainlessSteel')*2, - ore('stickStainlessSteel')*2, - ore('paneGlassColorless'), - ore('circuitEv') - ]) - .fluidInputs(fluid('soldering_alloy') * 72) - .outputs(item('icbmclassic:launcherscreen:2')) - .duration(400) - .EUt(260) - .buildAndRegister(); - mods.gregtech.assembler.recipeBuilder() .inputs([ ore('frameGtSteel')*3, @@ -458,30 +406,6 @@ mods.gregtech.assembler.recipeBuilder() .EUt(30) .buildAndRegister(); -mods.gregtech.assembler.recipeBuilder() - .inputs([ - ore('frameGtAluminium')*3, - ore('stickLongAluminium')*3, - metaitem('sensor.mv') - ]) - .fluidInputs(fluid('soldering_alloy') * 72) - .outputs(item('icbmclassic:launcherframe:1')) - .duration(400) - .EUt(60) - .buildAndRegister(); - -mods.gregtech.assembler.recipeBuilder() - .inputs([ - ore('frameGtStainlessSteel')*3, - ore('stickLongStainlessSteel')*3, - metaitem('sensor.hv') - ]) - .fluidInputs(fluid('soldering_alloy') * 72) - .outputs(item('icbmclassic:launcherframe:2')) - .duration(400) - .EUt(260) - .buildAndRegister(); - //Missiles def solidfuels = [ ore('dustSugar'), From d3a86df0ae518b8cd18bc6799ea0e506a47eb91a Mon Sep 17 00:00:00 2001 From: quackquack-11 Date: Tue, 23 Jul 2024 15:47:14 +0200 Subject: [PATCH 04/18] added launcher connector recipe --- groovy/postInit/mod/ICBM.groovy | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/groovy/postInit/mod/ICBM.groovy b/groovy/postInit/mod/ICBM.groovy index fb4a4c418..503f1a0a2 100755 --- a/groovy/postInit/mod/ICBM.groovy +++ b/groovy/postInit/mod/ICBM.groovy @@ -557,3 +557,18 @@ Globals.solders.each { key, val -> } } } +//launcher connector +mods.gregtech.assembler.recipeBuilder() + .inputs([ + ore('plateSteel')*6, + metaitem('plateWroughtIron')*8, + ore('circuitLv'), + metaitem('conveyor.module.lv'), + metaitem('cableGtSingleCopper')*3 + + ]) + .fluidInputs(fluid('soldering_alloy') * 72) + .outputs(item('icbmclassic:launcher_connector')) + .duration(400) + .EUt(30) + .buildAndRegister(); \ No newline at end of file From f230eed92d0249bd7fcebb14e6f47e66b2fc6a8f Mon Sep 17 00:00:00 2001 From: quackquack-11 Date: Tue, 23 Jul 2024 16:00:17 +0200 Subject: [PATCH 05/18] empty bomblet recipe remove crafting table recipe, added large weapons factory recipe --- groovy/postInit/mod/ICBM.groovy | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/groovy/postInit/mod/ICBM.groovy b/groovy/postInit/mod/ICBM.groovy index 503f1a0a2..28f4854e0 100755 --- a/groovy/postInit/mod/ICBM.groovy +++ b/groovy/postInit/mod/ICBM.groovy @@ -89,6 +89,7 @@ def name_removals = [ "icbmclassic:launcher/base", "icbmclassic:launcher/screen", "icbmclassic:launcher/connector", + "icbmclassic:bomblet/bomblet", ] for (item in name_removals) { @@ -571,4 +572,15 @@ mods.gregtech.assembler.recipeBuilder() .outputs(item('icbmclassic:launcher_connector')) .duration(400) .EUt(30) - .buildAndRegister(); \ No newline at end of file + .buildAndRegister(); +//empty bomblet +recipemap('large_weapons_factory').recipeBuilder() + .inputs([ + ore('plateSteel')*8, + ore('circuitLv'), + ore('frameGtSteel')*2 + ]) + .outputs(item('icbmclassic:empty_bomblet')) + .duration(300) + .EUt(30) + .buildAndRegister(); \ No newline at end of file From a69ebb4b3bbeaa331f658580f23190b595a03cb0 Mon Sep 17 00:00:00 2001 From: quackquack-11 Date: Tue, 23 Jul 2024 16:18:24 +0200 Subject: [PATCH 06/18] filled bomblet recipes --- groovy/postInit/mod/ICBM.groovy | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/groovy/postInit/mod/ICBM.groovy b/groovy/postInit/mod/ICBM.groovy index 28f4854e0..54357f433 100755 --- a/groovy/postInit/mod/ICBM.groovy +++ b/groovy/postInit/mod/ICBM.groovy @@ -90,6 +90,7 @@ def name_removals = [ "icbmclassic:launcher/screen", "icbmclassic:launcher/connector", "icbmclassic:bomblet/bomblet", + "icbmclassic:bomblet/condensed", ] for (item in name_removals) { @@ -583,4 +584,17 @@ recipemap('large_weapons_factory').recipeBuilder() .outputs(item('icbmclassic:empty_bomblet')) .duration(300) .EUt(30) - .buildAndRegister(); \ No newline at end of file + .buildAndRegister(); +//filled bomblets +for (var i = 0; i < 15; i++) { + recipemap('large_weapons_factory').recipeBuilder() + .inputs([ + item('icbmclassic:explosives', i), + item('icbmclassic:empty_bomblet') + ]) + .outputs(item('icbmclassic:explosive_bomblet', i)) + .duration(300) + .EUt(30) + .buildAndRegister(); +} + From c6bafa0f8ec65d4c04661590bf4254405d5896a2 Mon Sep 17 00:00:00 2001 From: quackquack-11 Date: Tue, 23 Jul 2024 16:45:40 +0200 Subject: [PATCH 07/18] payload parachute recipe --- groovy/postInit/mod/ICBM.groovy | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/groovy/postInit/mod/ICBM.groovy b/groovy/postInit/mod/ICBM.groovy index 54357f433..643cb2b1d 100755 --- a/groovy/postInit/mod/ICBM.groovy +++ b/groovy/postInit/mod/ICBM.groovy @@ -91,6 +91,7 @@ def name_removals = [ "icbmclassic:launcher/connector", "icbmclassic:bomblet/bomblet", "icbmclassic:bomblet/condensed", + "icbmclassic:parachute", ] for (item in name_removals) { @@ -597,4 +598,15 @@ for (var i = 0; i < 15; i++) { .EUt(30) .buildAndRegister(); } +//empty payload parachute +mods.gregtech.assembler.recipeBuilder() + .inputs([ + item('techguns:itemshared:60')*6, + item('minecraft:string')*4 + + ]) + .outputs(item('icbmclassic:parachute')) + .duration(200) + .EUt(30) + .buildAndRegister(); From 384508738ea2e776547039f61493f5a9f909ab1e Mon Sep 17 00:00:00 2001 From: quackquack-11 Date: Tue, 23 Jul 2024 17:09:05 +0200 Subject: [PATCH 08/18] payload balloon recipe --- groovy/postInit/mod/ICBM.groovy | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/groovy/postInit/mod/ICBM.groovy b/groovy/postInit/mod/ICBM.groovy index 643cb2b1d..64ab16833 100755 --- a/groovy/postInit/mod/ICBM.groovy +++ b/groovy/postInit/mod/ICBM.groovy @@ -92,6 +92,7 @@ def name_removals = [ "icbmclassic:bomblet/bomblet", "icbmclassic:bomblet/condensed", "icbmclassic:parachute", + "icbmclassic:balloon", ] for (item in name_removals) { @@ -609,4 +610,15 @@ mods.gregtech.assembler.recipeBuilder() .duration(200) .EUt(30) .buildAndRegister(); +//payload baloon +mods.gregtech.assembler.recipeBuilder() + .inputs([ + item('minecraft:carpet')*3, + item('minecraft:string')*2 + + ]) + .outputs(item('icbmclassic:balloon')) + .duration(50) + .EUt(30) + .buildAndRegister(); From 968d01cfd39ed9f85bd978891a280a1edada8e22 Mon Sep 17 00:00:00 2001 From: quackquack-11 Date: Tue, 23 Jul 2024 17:13:45 +0200 Subject: [PATCH 09/18] adjusted previous recipes --- groovy/postInit/mod/ICBM.groovy | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/groovy/postInit/mod/ICBM.groovy b/groovy/postInit/mod/ICBM.groovy index 64ab16833..3162292d0 100755 --- a/groovy/postInit/mod/ICBM.groovy +++ b/groovy/postInit/mod/ICBM.groovy @@ -572,7 +572,7 @@ mods.gregtech.assembler.recipeBuilder() ]) .fluidInputs(fluid('soldering_alloy') * 72) - .outputs(item('icbmclassic:launcher_connector')) + .outputs(item('icbmclassic:launcher_connector')*4) .duration(400) .EUt(30) .buildAndRegister(); @@ -583,6 +583,18 @@ recipemap('large_weapons_factory').recipeBuilder() ore('circuitLv'), ore('frameGtSteel')*2 ]) + .fluidInputs(fluid('tin') * 144) + .outputs(item('icbmclassic:empty_bomblet')) + .duration(300) + .EUt(30) + .buildAndRegister(); +recipemap('large_weapons_factory').recipeBuilder() + .inputs([ + ore('plateSteel')*8, + ore('circuitLv'), + ore('frameGtSteel')*2 + ]) + .fluidInputs(fluid('soldering_alloy') * 72) .outputs(item('icbmclassic:empty_bomblet')) .duration(300) .EUt(30) From 4c1bc73c017b280a35f3eac2c5756434af1d8e79 Mon Sep 17 00:00:00 2001 From: quackquack-11 Date: Tue, 23 Jul 2024 17:34:42 +0200 Subject: [PATCH 10/18] empty missile module recipe + fixed typo --- groovy/postInit/mod/ICBM.groovy | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/groovy/postInit/mod/ICBM.groovy b/groovy/postInit/mod/ICBM.groovy index 3162292d0..37b18083c 100755 --- a/groovy/postInit/mod/ICBM.groovy +++ b/groovy/postInit/mod/ICBM.groovy @@ -63,7 +63,7 @@ def name_removals = [ "icbmclassic:explosives/smoke", "icbmclassic:explosives/nuclear", "icbmclassic:explosives/emp", - "icbmclassic:explosives/exothermie", + "icbmclassic:explosives/exothermic", "icbmclassic:explosives/endothermic", "icbmclassic:explosives/anti_grav", "icbmclassic:explosives/ender", @@ -633,4 +633,28 @@ mods.gregtech.assembler.recipeBuilder() .duration(50) .EUt(30) .buildAndRegister(); - +//missile module (empty missile) +recipemap('large_weapons_factory').recipeBuilder() + .inputs([ + ore('stickAluminium')*4, + ore('ringAluminium')*2, + ore('plateAluminium')*2, + ore('foilAluminium')*16, + ]) + .fluidInputs(fluid('tin') * 144) + .outputs(item('icbmclassic:explosive_missile:' + 24)) + .duration(300) + .EUt(30) + .buildAndRegister(); +recipemap('large_weapons_factory').recipeBuilder() + .inputs([ + ore('stickAluminium')*4, + ore('ringAluminium')*2, + ore('plateAluminium')*2, + ore('foilAluminium')*16, + ]) + .fluidInputs(fluid('soldering_alloy') * 72) + .outputs(item('icbmclassic:explosive_missile:' + 24)) + .duration(300) + .EUt(30) + .buildAndRegister(); From 62d25c7e1ae2b54c6716b306850031d75e567c95 Mon Sep 17 00:00:00 2001 From: quackquack-11 Date: Tue, 23 Jul 2024 18:25:17 +0200 Subject: [PATCH 11/18] cluster missile recipe --- groovy/postInit/mod/ICBM.groovy | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/groovy/postInit/mod/ICBM.groovy b/groovy/postInit/mod/ICBM.groovy index 37b18083c..7605faaaf 100755 --- a/groovy/postInit/mod/ICBM.groovy +++ b/groovy/postInit/mod/ICBM.groovy @@ -658,3 +658,26 @@ recipemap('large_weapons_factory').recipeBuilder() .duration(300) .EUt(30) .buildAndRegister(); +//cluster missile +recipemap('large_weapons_factory').recipeBuilder() + .inputs([ + ore('screwAluminium')*4, + metaitem('crate.aluminium'), + item('icbmclassic:explosive_missile:' + 24) + ]) + .fluidInputs(fluid('tin') * 144) + .outputs(item('icbmclassic:cluster_missile')) + .duration(400) + .EUt(30) + .buildAndRegister(); +recipemap('large_weapons_factory').recipeBuilder() + .inputs([ + ore('screwAluminium')*4, + metaitem('crate.aluminium'), + item('icbmclassic:explosive_missile:' + 24) + ]) + .fluidInputs(fluid('soldering_alloy') * 72) + .outputs(item('icbmclassic:cluster_missile')) + .duration(400) + .EUt(30) + .buildAndRegister(); \ No newline at end of file From c5180743fa2320e30089eee2fea4d7f007549504 Mon Sep 17 00:00:00 2001 From: quackquack-11 Date: Tue, 23 Jul 2024 18:29:10 +0200 Subject: [PATCH 12/18] fixed typo --- groovy/postInit/mod/ICBM.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/groovy/postInit/mod/ICBM.groovy b/groovy/postInit/mod/ICBM.groovy index 7605faaaf..6a398fb28 100755 --- a/groovy/postInit/mod/ICBM.groovy +++ b/groovy/postInit/mod/ICBM.groovy @@ -30,7 +30,7 @@ def name_removals = [ "icbmclassic:missile/ex/smoke", "icbmclassic:missile/ex/nuclear", "icbmclassic:missile/ex/emp", - "icbmclassic:missile/ex/exothermie", + "icbmclassic:missile/ex/exothermic", "icbmclassic:missile/ex/endothermic", "icbmclassic:missile/ex/antigravitational", "icbmclassic:missile/ex/ender", From 60dd072175be108c6f85df7593aa657ef12dd628 Mon Sep 17 00:00:00 2001 From: quackquack-11 Date: Tue, 23 Jul 2024 18:38:19 +0200 Subject: [PATCH 13/18] updated manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 5fd2a507d..ef303d904 100644 --- a/manifest.json +++ b/manifest.json @@ -753,7 +753,7 @@ }, { "projectID": 244451, - "fileID": 4406083, + "fileID": 5452674, "required": true }, { From c99ad085a21bdcf409ea9d481b66359103a81441 Mon Sep 17 00:00:00 2001 From: quackquack-11 Date: Wed, 24 Jul 2024 14:19:42 +0200 Subject: [PATCH 14/18] change quest description --- .../resources/supersymmetry/lang/en_us.lang | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/betterquesting/resources/supersymmetry/lang/en_us.lang b/config/betterquesting/resources/supersymmetry/lang/en_us.lang index c2dd8d596..ad8e3b03a 100644 --- a/config/betterquesting/resources/supersymmetry/lang/en_us.lang +++ b/config/betterquesting/resources/supersymmetry/lang/en_us.lang @@ -828,8 +828,8 @@ susy.quest.db.385.title=Trolling Plan, Phase Two susy.quest.db.385.desc=§6Incendiary explosives§r start fires upon detonation. They use flammable substances like §cgasoline or naphtha §ras their fuel sources. When ignited, these volatile liquids rapidly vaporize and create a combustible mixture with the air, causing fires to spread quickl§yy.§6%n%nChemical explosives§r rely on specific compounds like §ccarbon monoxide, hydrogen sulfide, fluorine, or chlorine gas§r. These highly reactive substances undergo fast oxidation or combustion reactions, releasing large volumes of gas and heat.%n%n§6Debilitation explosives§r have a different objective — they aim to incapacitate rather than cause destruction. They often contain §csulfur dioxide§r, a toxic gas that causes respiratory distress and eye irritation. Debilitation explosives are used for temporary incapacitation or crowd control.%n%n§6Shrapnel explosives§r are a type of explosive device that incorporates lead rounds as shrapnel. These devices are designed to cause damage and injury through the release of high-velocity projectiles upon detonation.%n%nMost of these chemicals are obtainable in LV. Check the Chemistry tab for more info. susy.quest.db.386.title=Surprise Attack susy.quest.db.386.desc=A §6grenade §rcan be useful if you have to clear out hordes of enemies at the same time.%n%nGrenades can even be made with§c special types of explosives§r: there are Chemical Grenades, Debilitating Grenades and Incendiary Grenades. -susy.quest.db.387.title=LV Missile Launcher -susy.quest.db.387.desc=A Tier 1 §6missile launcher §rconsists of §6three primary components§r: a control panel, a base, and a frame.%n%nWhile the base and screen are essential for a basic launch, the inclusion of the frame component can improve the accuracy of the missile. %n%nThe range of this launcher is 500 meters, so you may need to set up a separate base close to your target, solely for launching missile attacks.%n%nAnd yes, it may seem dumb that an ICBM only has a range of 500 meters, but the size of a continent in Minecraft is several hundred blocks anyways. +susy.quest.db.387.title=Missile Launcher +susy.quest.db.387.desc=A §6missile launcher §rconsists of §6three primary components§r: a control panel, a base, and a frame.%n%nWhile the base and screen are essential for a basic launch, the inclusion of the frame component can improve the accuracy of the missile. %n%nThe range of the launcher is 500 meters, so you may need to set up a separate base close to your target, solely for launching missile attacks.%n%nAnd yes, it may seem dumb that an ICBM only has a range of 500 meters, but the size of a continent in Minecraft is several hundred blocks anyways. susy.quest.db.388.title=LV Fluid Compressor susy.quest.db.388.desc=The §6Fluid Compressor §rcompresses fluids into §chot high pressure fluids§r. susy.quest.db.389.title=LV Fluid Decompressor @@ -867,7 +867,7 @@ susy.quest.db.404.desc=§6Monocrystalline Silicon Boules§r need to be cut into susy.quest.db.405.title=MV Cutting Machine susy.quest.db.405.desc=A §6Cutting Machine §rcan use Water or Lubricant to cut items. It's required for making silicon wafers out of boules. susy.quest.db.406.title=Trolling Plan: Phase Four -susy.quest.db.406.desc=Now that you are at MV, you can make more advanced types of §cexplosives §rand §cmissiles §rby putting MV power on a Weapons Factory.%n%nThere are 3 new types of explosives:%n§7Breaching explosives§r, made with steel%n§3Thermobaric explosives§r, made with ethylene oxide%n§aContagious explosives§r, made with biomass%n%nYou can get most of the ingredients for these at MV.%nRemember that these are Tier 2 missiles, so you will need a T2 missile launching station for them to work.%n%nThe range of this launcher is 1,000 meters. +susy.quest.db.406.desc=Now that you are at MV, you can make more advanced types of §cexplosives §rand §cmissiles §rby putting MV power on a Weapons Factory.%n%nThere are 3 new types of explosives:%n§7Breaching explosives§r, made with steel%n§3Thermobaric explosives§r, made with ethylene oxide%n§aContagious explosives§r, made with biomass%n%nYou can get most of the ingredients for these at MV.%n susy.quest.db.407.title=Glycerol susy.quest.db.407.desc=§6Glycerol §rcan be made by treating any type of oil, like fish or seed oil, with ethanol, methanol, or ethanol-water azeotrope. %n%nThis process also produces §6Bio Diesel§r, which can be used as a source of energy in the §cLarge Gas Turbine§r. Check Chapter 2 for more info. susy.quest.db.408.title=Glyceryl Trinitrate @@ -1465,7 +1465,7 @@ susy.quest.db.703.desc=Make the Workstation, from NAND wafers, HV circuits, and susy.quest.db.704.title=HV Circuit Assembler susy.quest.db.704.desc=Make the HV Circuit Assembler, which will probably be useful soon. 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.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.%n susy.quest.db.706.title=Titanium 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 From 76406d7cab37c8cfc376ff9743b35093a892ae5c Mon Sep 17 00:00:00 2001 From: quackquack-11 Date: Wed, 24 Jul 2024 14:58:32 +0200 Subject: [PATCH 15/18] icbm quest logic --- config/betterquesting/DefaultQuests.json | 180 ++++++++++++----------- 1 file changed, 93 insertions(+), 87 deletions(-) diff --git a/config/betterquesting/DefaultQuests.json b/config/betterquesting/DefaultQuests.json index 589f04e6e..ab5e65838 100644 --- a/config/betterquesting/DefaultQuests.json +++ b/config/betterquesting/DefaultQuests.json @@ -14844,53 +14844,56 @@ } }, "405:10": { - "preRequisiteTypes:7": [ - 0, - 1 - ], - "preRequisites:11": [ - 593, - 478 - ], - "properties:10": { - "betterquesting:10": { - "desc:8": "susy.quest.db.406.desc", - "icon:10": { - "Damage:2": 1, - "id:8": "icbmclassic:launcherscreen" - }, - "ignoresview:1": 0, - "name:8": "susy.quest.db.406.title", - "visibility:8": "ALWAYS" - } - }, - "questID:3": 406, - "rewards:9": {}, - "tasks:9": { - "0:10": { - "entryLogic:8": "AND", - "partialMatch:1": 1, - "requiredItems:9": { - "0:10": { - "Count:3": 1, - "Damage:2": 1, - "id:8": "icbmclassic:launcherbase" - }, - "1:10": { - "Count:3": 1, - "Damage:2": 1, - "id:8": "icbmclassic:launcherframe" - }, - "2:10": { - "Count:3": 1, - "Damage:2": 1, - "id:8": "icbmclassic:launcherscreen" + "preRequisiteTypes:7": [ + 0, + 1 + ], + "preRequisites:11": [ + 593, + 478 + ], + "properties:10": { + "betterquesting:10": { + "autoclaim:1": 0, + "desc:8": "susy.quest.db.406.desc", + "frame:8": "ROUNDED_SQUARE", + "globalshare:1": 0, + "icon:10": { + "Count:3": 1, + "Damage:2": 11, + "ForgeCaps:10": { + "Parent:10": { + "explosive:10": { + "customizations:9": {} } - }, - "taskID:8": "bq_standard:retrieval" - } - } - }, + } + }, + "OreDict:8": "", + "id:8": "icbmclassic:explosive_missile" + }, + "ignoresview:1": 0, + "ismain:1": 0, + "issilent:1": 0, + "lockedprogress:1": 0, + "name:8": "susy.quest.db.406.title", + "questlogic:8": "AND", + "repeat_relative:1": 1, + "repeattime:3": -1, + "simultaneous:1": 0, + "snd_complete:8": "minecraft:entity.player.levelup", + "snd_update:8": "minecraft:entity.player.levelup", + "tasklogic:8": "AND", + "visibility:8": "ALWAYS" + } + }, + "rewards:9": {}, + "tasks:9": { + "0:10": { + "index:3": 0, + "taskID:8": "bq_standard:checkbox" + } + } +}, "406:10": { "preRequisites:11": [ 409 @@ -31702,48 +31705,51 @@ } }, "704:10": { - "preRequisites:11": [ - 703 - ], - "properties:10": { - "betterquesting:10": { - "desc:8": "susy.quest.db.705.desc", - "icon:10": { - "Damage:2": 2, - "id:8": "icbmclassic:launcherscreen" - }, - "ignoresview:1": 0, - "name:8": "susy.quest.db.705.title", - "visibility:8": "ALWAYS" - } - }, - "questID:3": 705, - "rewards:9": {}, - "tasks:9": { - "0:10": { - "entryLogic:8": "AND", - "partialMatch:1": 1, - "requiredItems:9": { - "0:10": { - "Count:3": 1, - "Damage:2": 2, - "id:8": "icbmclassic:launcherframe" - }, - "1:10": { - "Count:3": 1, - "Damage:2": 2, - "id:8": "icbmclassic:launcherbase" - }, - "2:10": { - "Count:3": 1, - "Damage:2": 2, - "id:8": "icbmclassic:launcherscreen" + "preRequisites:11": [ + 703 + ], + "properties:10": { + "betterquesting:10": { + "autoclaim:1": 0, + "desc:8": "susy.quest.db.705.desc", + "frame:8": "ROUNDED_SQUARE", + "globalshare:1": 0, + "icon:10": { + "Count:3": 1, + "Damage:2": 18, + "ForgeCaps:10": { + "Parent:10": { + "explosive:10": { + "customizations:9": {} } - }, - "taskID:8": "bq_standard:retrieval" - } - } - }, + } + }, + "OreDict:8": "", + "id:8": "icbmclassic:explosive_missile" + }, + "ignoresview:1": 0, + "ismain:1": 0, + "issilent:1": 0, + "lockedprogress:1": 0, + "name:8": "susy.quest.db.705.title", + "questlogic:8": "AND", + "repeat_relative:1": 1, + "repeattime:3": -1, + "simultaneous:1": 0, + "snd_complete:8": "minecraft:entity.player.levelup", + "snd_update:8": "minecraft:entity.player.levelup", + "tasklogic:8": "AND", + "visibility:8": "ALWAYS" + } + }, + "rewards:9": {}, + "tasks:9": { + "0:10": { + "index:3": 0, + "taskID:8": "bq_standard:checkbox" + } + } +}, "705:10": { "preRequisites:11": [ 679 From 1adccbe6fc59e160a465d68fc9dc5930e4d51856 Mon Sep 17 00:00:00 2001 From: quackquack-11 Date: Wed, 24 Jul 2024 17:24:21 +0200 Subject: [PATCH 16/18] Revert "icbm quest logic" This reverts commit 76406d7cab37c8cfc376ff9743b35093a892ae5c. --- config/betterquesting/DefaultQuests.json | 180 +++++++++++------------ 1 file changed, 87 insertions(+), 93 deletions(-) diff --git a/config/betterquesting/DefaultQuests.json b/config/betterquesting/DefaultQuests.json index ab5e65838..589f04e6e 100644 --- a/config/betterquesting/DefaultQuests.json +++ b/config/betterquesting/DefaultQuests.json @@ -14844,56 +14844,53 @@ } }, "405:10": { - "preRequisiteTypes:7": [ - 0, - 1 - ], - "preRequisites:11": [ - 593, - 478 - ], - "properties:10": { - "betterquesting:10": { - "autoclaim:1": 0, - "desc:8": "susy.quest.db.406.desc", - "frame:8": "ROUNDED_SQUARE", - "globalshare:1": 0, - "icon:10": { - "Count:3": 1, - "Damage:2": 11, - "ForgeCaps:10": { - "Parent:10": { - "explosive:10": { - "customizations:9": {} + "preRequisiteTypes:7": [ + 0, + 1 + ], + "preRequisites:11": [ + 593, + 478 + ], + "properties:10": { + "betterquesting:10": { + "desc:8": "susy.quest.db.406.desc", + "icon:10": { + "Damage:2": 1, + "id:8": "icbmclassic:launcherscreen" + }, + "ignoresview:1": 0, + "name:8": "susy.quest.db.406.title", + "visibility:8": "ALWAYS" + } + }, + "questID:3": 406, + "rewards:9": {}, + "tasks:9": { + "0:10": { + "entryLogic:8": "AND", + "partialMatch:1": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 1, + "id:8": "icbmclassic:launcherbase" + }, + "1:10": { + "Count:3": 1, + "Damage:2": 1, + "id:8": "icbmclassic:launcherframe" + }, + "2:10": { + "Count:3": 1, + "Damage:2": 1, + "id:8": "icbmclassic:launcherscreen" } - } - }, - "OreDict:8": "", - "id:8": "icbmclassic:explosive_missile" - }, - "ignoresview:1": 0, - "ismain:1": 0, - "issilent:1": 0, - "lockedprogress:1": 0, - "name:8": "susy.quest.db.406.title", - "questlogic:8": "AND", - "repeat_relative:1": 1, - "repeattime:3": -1, - "simultaneous:1": 0, - "snd_complete:8": "minecraft:entity.player.levelup", - "snd_update:8": "minecraft:entity.player.levelup", - "tasklogic:8": "AND", - "visibility:8": "ALWAYS" - } - }, - "rewards:9": {}, - "tasks:9": { - "0:10": { - "index:3": 0, - "taskID:8": "bq_standard:checkbox" - } - } -}, + }, + "taskID:8": "bq_standard:retrieval" + } + } + }, "406:10": { "preRequisites:11": [ 409 @@ -31705,51 +31702,48 @@ } }, "704:10": { - "preRequisites:11": [ - 703 - ], - "properties:10": { - "betterquesting:10": { - "autoclaim:1": 0, - "desc:8": "susy.quest.db.705.desc", - "frame:8": "ROUNDED_SQUARE", - "globalshare:1": 0, - "icon:10": { - "Count:3": 1, - "Damage:2": 18, - "ForgeCaps:10": { - "Parent:10": { - "explosive:10": { - "customizations:9": {} + "preRequisites:11": [ + 703 + ], + "properties:10": { + "betterquesting:10": { + "desc:8": "susy.quest.db.705.desc", + "icon:10": { + "Damage:2": 2, + "id:8": "icbmclassic:launcherscreen" + }, + "ignoresview:1": 0, + "name:8": "susy.quest.db.705.title", + "visibility:8": "ALWAYS" + } + }, + "questID:3": 705, + "rewards:9": {}, + "tasks:9": { + "0:10": { + "entryLogic:8": "AND", + "partialMatch:1": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 2, + "id:8": "icbmclassic:launcherframe" + }, + "1:10": { + "Count:3": 1, + "Damage:2": 2, + "id:8": "icbmclassic:launcherbase" + }, + "2:10": { + "Count:3": 1, + "Damage:2": 2, + "id:8": "icbmclassic:launcherscreen" } - } - }, - "OreDict:8": "", - "id:8": "icbmclassic:explosive_missile" - }, - "ignoresview:1": 0, - "ismain:1": 0, - "issilent:1": 0, - "lockedprogress:1": 0, - "name:8": "susy.quest.db.705.title", - "questlogic:8": "AND", - "repeat_relative:1": 1, - "repeattime:3": -1, - "simultaneous:1": 0, - "snd_complete:8": "minecraft:entity.player.levelup", - "snd_update:8": "minecraft:entity.player.levelup", - "tasklogic:8": "AND", - "visibility:8": "ALWAYS" - } - }, - "rewards:9": {}, - "tasks:9": { - "0:10": { - "index:3": 0, - "taskID:8": "bq_standard:checkbox" - } - } -}, + }, + "taskID:8": "bq_standard:retrieval" + } + } + }, "705:10": { "preRequisites:11": [ 679 From 825ff1906660f8dbff2e4047a96e5d0c0ce337c6 Mon Sep 17 00:00:00 2001 From: quackquack-11 Date: Wed, 24 Jul 2024 17:24:29 +0200 Subject: [PATCH 17/18] Revert "change quest description" This reverts commit c99ad085a21bdcf409ea9d481b66359103a81441. --- .../resources/supersymmetry/lang/en_us.lang | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/betterquesting/resources/supersymmetry/lang/en_us.lang b/config/betterquesting/resources/supersymmetry/lang/en_us.lang index ad8e3b03a..c2dd8d596 100644 --- a/config/betterquesting/resources/supersymmetry/lang/en_us.lang +++ b/config/betterquesting/resources/supersymmetry/lang/en_us.lang @@ -828,8 +828,8 @@ susy.quest.db.385.title=Trolling Plan, Phase Two susy.quest.db.385.desc=§6Incendiary explosives§r start fires upon detonation. They use flammable substances like §cgasoline or naphtha §ras their fuel sources. When ignited, these volatile liquids rapidly vaporize and create a combustible mixture with the air, causing fires to spread quickl§yy.§6%n%nChemical explosives§r rely on specific compounds like §ccarbon monoxide, hydrogen sulfide, fluorine, or chlorine gas§r. These highly reactive substances undergo fast oxidation or combustion reactions, releasing large volumes of gas and heat.%n%n§6Debilitation explosives§r have a different objective — they aim to incapacitate rather than cause destruction. They often contain §csulfur dioxide§r, a toxic gas that causes respiratory distress and eye irritation. Debilitation explosives are used for temporary incapacitation or crowd control.%n%n§6Shrapnel explosives§r are a type of explosive device that incorporates lead rounds as shrapnel. These devices are designed to cause damage and injury through the release of high-velocity projectiles upon detonation.%n%nMost of these chemicals are obtainable in LV. Check the Chemistry tab for more info. susy.quest.db.386.title=Surprise Attack susy.quest.db.386.desc=A §6grenade §rcan be useful if you have to clear out hordes of enemies at the same time.%n%nGrenades can even be made with§c special types of explosives§r: there are Chemical Grenades, Debilitating Grenades and Incendiary Grenades. -susy.quest.db.387.title=Missile Launcher -susy.quest.db.387.desc=A §6missile launcher §rconsists of §6three primary components§r: a control panel, a base, and a frame.%n%nWhile the base and screen are essential for a basic launch, the inclusion of the frame component can improve the accuracy of the missile. %n%nThe range of the launcher is 500 meters, so you may need to set up a separate base close to your target, solely for launching missile attacks.%n%nAnd yes, it may seem dumb that an ICBM only has a range of 500 meters, but the size of a continent in Minecraft is several hundred blocks anyways. +susy.quest.db.387.title=LV Missile Launcher +susy.quest.db.387.desc=A Tier 1 §6missile launcher §rconsists of §6three primary components§r: a control panel, a base, and a frame.%n%nWhile the base and screen are essential for a basic launch, the inclusion of the frame component can improve the accuracy of the missile. %n%nThe range of this launcher is 500 meters, so you may need to set up a separate base close to your target, solely for launching missile attacks.%n%nAnd yes, it may seem dumb that an ICBM only has a range of 500 meters, but the size of a continent in Minecraft is several hundred blocks anyways. susy.quest.db.388.title=LV Fluid Compressor susy.quest.db.388.desc=The §6Fluid Compressor §rcompresses fluids into §chot high pressure fluids§r. susy.quest.db.389.title=LV Fluid Decompressor @@ -867,7 +867,7 @@ susy.quest.db.404.desc=§6Monocrystalline Silicon Boules§r need to be cut into susy.quest.db.405.title=MV Cutting Machine susy.quest.db.405.desc=A §6Cutting Machine §rcan use Water or Lubricant to cut items. It's required for making silicon wafers out of boules. susy.quest.db.406.title=Trolling Plan: Phase Four -susy.quest.db.406.desc=Now that you are at MV, you can make more advanced types of §cexplosives §rand §cmissiles §rby putting MV power on a Weapons Factory.%n%nThere are 3 new types of explosives:%n§7Breaching explosives§r, made with steel%n§3Thermobaric explosives§r, made with ethylene oxide%n§aContagious explosives§r, made with biomass%n%nYou can get most of the ingredients for these at MV.%n +susy.quest.db.406.desc=Now that you are at MV, you can make more advanced types of §cexplosives §rand §cmissiles §rby putting MV power on a Weapons Factory.%n%nThere are 3 new types of explosives:%n§7Breaching explosives§r, made with steel%n§3Thermobaric explosives§r, made with ethylene oxide%n§aContagious explosives§r, made with biomass%n%nYou can get most of the ingredients for these at MV.%nRemember that these are Tier 2 missiles, so you will need a T2 missile launching station for them to work.%n%nThe range of this launcher is 1,000 meters. susy.quest.db.407.title=Glycerol susy.quest.db.407.desc=§6Glycerol §rcan be made by treating any type of oil, like fish or seed oil, with ethanol, methanol, or ethanol-water azeotrope. %n%nThis process also produces §6Bio Diesel§r, which can be used as a source of energy in the §cLarge Gas Turbine§r. Check Chapter 2 for more info. susy.quest.db.408.title=Glyceryl Trinitrate @@ -1465,7 +1465,7 @@ susy.quest.db.703.desc=Make the Workstation, from NAND wafers, HV circuits, and susy.quest.db.704.title=HV Circuit Assembler susy.quest.db.704.desc=Make the HV Circuit Assembler, which will probably be useful soon. 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.%n +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 §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 From 41c365f0d30c091b8bf6f05226a4dd763c1bb1b2 Mon Sep 17 00:00:00 2001 From: quackquack-11 Date: Wed, 24 Jul 2024 17:38:14 +0200 Subject: [PATCH 18/18] removed more recipes --- groovy/postInit/mod/ICBM.groovy | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/groovy/postInit/mod/ICBM.groovy b/groovy/postInit/mod/ICBM.groovy index 6a398fb28..885620e80 100755 --- a/groovy/postInit/mod/ICBM.groovy +++ b/groovy/postInit/mod/ICBM.groovy @@ -93,12 +93,20 @@ def name_removals = [ "icbmclassic:bomblet/condensed", "icbmclassic:parachute", "icbmclassic:balloon", + "icbmclassic:missile/special/missile.cluster", + "icbmclassic:spikes", + "icbmclassic:spikes.1", + "icbmclassic:spikes.2", + "icbmclassic:powder.poison", + "icbmclassic:saltpeter_ball", ] for (item in name_removals) { crafting.remove(item); } +furnace.removeByInput(item('icbmclassic:saltpeter_ball')) + for (var i = 0; i < 8; i++) { recipemap('weapons_factory').recipeBuilder() .inputs([