From 274ae9704ecc0d67522c34c5d783390bfa1d0f12 Mon Sep 17 00:00:00 2001 From: Chaoschaot234 Date: Sun, 1 May 2022 20:25:26 +0200 Subject: [PATCH 1/4] reenabled angel wings --- config/ExtraUtilities.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/ExtraUtilities.cfg b/config/ExtraUtilities.cfg index 509d9d8ca4..b8825299c3 100644 --- a/config/ExtraUtilities.cfg +++ b/config/ExtraUtilities.cfg @@ -58,7 +58,7 @@ client_options { items { - B:AngelRingEnabled=false + B:AngelRingEnabled=true B:BedrockiumIngotEnabled=true B:BuildersWandEnabled=true B:CreativeBuildersWandEnabled=true From 7c06a9bfdc2ccc07ebd9cb002f4c1f0ec3e34b28 Mon Sep 17 00:00:00 2001 From: Chaoschaot234 Date: Sun, 1 May 2022 20:33:25 +0200 Subject: [PATCH 2/4] adding recipes and researches for Angel Wings disabling vanilla recipes for them --- scripts/Extra-Utilities.zs | 89 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 85 insertions(+), 4 deletions(-) diff --git a/scripts/Extra-Utilities.zs b/scripts/Extra-Utilities.zs index 835ba9d842..1b0e28585c 100644 --- a/scripts/Extra-Utilities.zs +++ b/scripts/Extra-Utilities.zs @@ -11,10 +11,12 @@ import mods.ic2.Compressor; import mods.ic2.Extractor; import mods.gregtech.AlloySmelter; - +import mods.thaumcraft.Research; +import mods.thaumcraft.Infusion; +import mods.thaumcraft.Arcane; +import mods.thaumcraft.Warp; // --- Variables --- - val EnderPump = ; val EnderObsidian = ; val EnderCore = ; @@ -170,11 +172,37 @@ val Screwdriver = ; val Saw = ; val Shears = ; - +val ARInvisableWings = ; +val ARFeatheryWings = ; +val ARFairyWings = ; +val ARDragonWings = ; +val ARGoldenWings = ; +val AngelBlock = ; +val TravelWingsImage = ; +val TravelWings = .withTag({TinkerArmor: {BaseDurability: 1035, BaseDefense: 2.0, Built: 1 as byte, MaxDefense: 8.0, Damage: 0, BonusDurability: 0, Modifiers: 3, DamageReduction: 0.0, TotalDurability: 1035, ModDurability: 0.0 as float, Broken: 0 as byte}}); +val MagicalFeather = ; +val Netherstar = ; +val IridiumRing = ; +val BigPearl = ; +val PrimalCharm = ; +val DragonEgg = ; +val DragonStone = ; +val RoseGoldFoil = ; +val FeatherFletching = ; +val TFCicada = ; +val TFFireFly = ; +val EngravedGC = ; +val InfinityCatalyst = ; +val SalisMundus = ; // --- Removing Recipes --- - +// --- Angel Rings +recipes.remove(ARInvisableWings); +recipes.remove(ARFeatheryWings); +recipes.remove(ARFairyWings); +recipes.remove(ARDragonWings); +recipes.remove(ARGoldenWings); // --- QED Recipes remove ALL mods.extraUtils.QED.removeRecipe(<*>); @@ -1306,3 +1334,56 @@ Extractor.addRecipe( * 9, * 9, ); + +// --- Angel Wing over Thaumcraft --- +// --- ARInvisableWings +Infusion.addRecipe("EXURINGS_CRAFTING", TravelWings, [EngravedGC, IridiumRing, AngelBlock, PrimalCharm, MagicalFeather, Netherstar, BigPearl, Netherstar, MagicalFeather, PrimalCharm, AngelBlock, IridiumRing], "praecantatio 200, volatus 200, tempestas 200, nebrisum 200, motus 200, terminus 200", ARInvisableWings, 100); + +// --- ARFeatheryWings +Infusion.addRecipe("EXURINGS_CRAFTING", ARInvisableWings, [SalisMundus, FeatherFletching, FeatherFletching], "permutatio 50, volatus 50, aer 50", ARFeatheryWings, 4); + +// --- ARFairyWings +Infusion.addRecipe("EXURINGS_CRAFTING", ARInvisableWings, [SalisMundus, TFCicada, TFFireFly], "permutatio 50, volatus 50, auram 50", ARFairyWings, 4); + +// --- ARDragonWings +Infusion.addRecipe("EXURINGS_CRAFTING", ARInvisableWings, [SalisMundus, DragonEgg, DragonStone], "permutatio 50, bestia 50, infernus 50", ARDragonWings, 4); + +// --- ARGoldenWings +Infusion.addRecipe("EXURINGS_CRAFTING", ARInvisableWings, [SalisMundus, RoseGoldFoil, RoseGoldFoil], "permutatio 50, metallum 50, lucrum 50", ARGoldenWings, 4); + +// --- Research I: Flavor Text +Research.addResearch("EXURINGS", "ARTIFICE", "praecantatio 10, volatus 10, tempestas 100, nebrisum 10, motus 10, terminus 10", 1, -5 as int, 16, TravelWingsImage); +game.setLocalization("en_US", "tc.research_name.EXURINGS", "Be free like a bird ... (Theorie)"); +game.setLocalization("en_US", "tc.research_text.EXURINGS", "[ExU] The way to the sky! - Part I"); +Research.setRound("EXURINGS", true); +Research.setConcealed("EXURINGS", true); +Research.addPrereq("EXURINGS", "INFUSION", true); +Research.addPage("EXURINGS", "tc.research_page.EXURINGS.1"); +game.setLocalization("en_US", "tc.research_page.EXURINGS.1", "Happy to have crafted or looted your first Copter Pack or in general having access to Jetpacks?
Annoyed about the fact that you need some type of fuel or energy for your Jetpack to work?
What would a Thaumaturge give to achieve the ability to fly without these restrictions?
Maybe some §oWarp§r? Not at this point yet, maybe later?
But what should you do now to achieve §oFreedom like a bird§r? Maybe you remember Icarus and what happened to him?"); +Research.addPage("EXURINGS", "tc.research_page.EXURINGS.2"); +game.setLocalization("en_US", "tc.research_page.EXURINGS.2", "If you remeber (well, let us say §othat§r you remember) then why not taking a look the §oTraveller's Wings§r§r? For me they could be the key for what you want to achieve but even if you own them, what should you do with them?
I would like to ... try to infuse them with ... what items would you need you may ask and the final result will be ...?
Pretty out of ideas I see so let us make some theoretical studies first:
You want to fly like a bird? Try to get §oVolatus§r because it is referenced to Flight. Another ingredient could be §oTempestas§r to withstand the harsh weather out there."); +Research.addPage("EXURINGS", "tc.research_page.EXURINGS.3"); +game.setLocalization("en_US", "tc.research_page.EXURINGS.3", "The next as obvious would be §oPraecantatio§r as we are going to use magic after all to achieve your goal otherwise it wouldn't make sense, wouldn't it? Also §oMotus§r will be required.
Well done, we got the §oMain Aspects§r but how can we get rid of requiring energy or fuel? I would suggest to get §oNebrisum§r the source of §oCheatines§r. Yes, you are right, we are going to cheat a little bit for your goal but don't blame me for that §oTerminus§r I couldn't withstand to use it.
You should have a few Jars filled with §oVolatus, Tempestas, Praecantatio, Nebrisum, Motus§r and §oTerminus§r to be prepared."); +Research.addPage("EXURINGS", "tc.research_page.EXURINGS.4"); +game.setLocalization("en_US", "tc.research_page.EXURINGS.4", "Now it is time to find out which items you would need for the infusion as well as the item to be infused with. From the secound page we have the §oTraveller's Wings§r which I would suggest to be used as the key item and infuse them with all other items at the §oInfusion Altar§r.
At last you would need §oNether Stars§r and §oAngel Blocks§r the first part of ingredients."); +Research.addPage("EXURINGS", "tc.research_page.EXURINGS.5"); +game.setLocalization("en_US", "tc.research_page.EXURINGS.5", "Now we are getting to the downside of this list ... gregified items are also used for ... reasons. The first downside will be from GT++:
§oMagical Feather§r at last two of them which requiring you to be in §oEV Age§r before you can continue at this point. Last ones which I throw to you will be an §oEngraved Gold Chip§r and §oIridium Rings§r.
Congrats, you gathered all the materials you'll need ... theoretically. So now go out and get them and come back to me when you have acquired them."); +Research.addPage("EXURINGS", "tc.research_page.EXURINGS.6"); +game.setLocalization("en_US", "tc.research_page.EXURINGS.6", "The next research will show you the recipes for your beloved item: §oExU's Angel Ring§r and they come in different styles too."); + +// --- Research II: Angel Rings (crafting) +Research.addResearch("EXURINGS_CRAFTING", "ARTIFICE", "praecantatio 10, volatus 10, tempestas 10, nebrisum 10, motus 10, terminus 10", -1 as int, -5 as int, 16, ARInvisableWings); +game.setLocalization("en_US", "tc.research_name.EXURINGS_CRAFTING", "Be free like a bird ... (Crafting)"); +game.setLocalization("en_US", "tc.research_text.EXURINGS_CRAFTING", "[ExU] The way to the sky! - Part II"); +Research.addPrereq("EXURINGS_CRAFTING", "EXURINGS", false); +Research.setConcealed("EXURINGS_CRAFTING", true); +Warp.addToResearch("EXURINGS_CRAFTING", 16); +Research.addPage("EXURINGS_CRAFTING", "tc.research_page.EXURINGS_CRAFTING.1"); +game.setLocalization("en_US", "tc.research_page.EXURINGS_CRAFTING.1", "Ok, you got all the items and jarred essentia? Oh and thanks for taking some warp because warp is fun, isn't it? Well at last it is the paymentFine here are all the recipes you wanted. Have fun with them but don't blame me for there own difficulty to aquire them before you can use them finally in these recipes.First recipe: Angel Ring (Invisible Wings)
Oh, totally forgotten to tell you about some §oPearl§r and §oCharms§r, sorry."); +Research.addInfusionPage("EXURINGS_CRAFTING", ARInvisableWings); +Research.addPage("EXURINGS_CRAFTING", "tc.research_page.EXURINGS_CRAFTING.2"); +game.setLocalization("en_US", "tc.research_page.EXURINGS_CRAFTING.2", "So you assumed to get an Arcane Recipe here for all these different variants? Nope, it will be Infusion too as the Arcane Table can't handle the power which is hidden within this powerful item. For this time take a look on the following recipes to get all the items and the essentia together.Second and following ones are Angel Rings with the following options: Golden Wings, Dragon Wings, Feathery Wings, Fairy Wings.
Note that when you have transmogrified your wings that this step is final. This means, that you need at last five rings to own the compleate collection ... whyever you would do this."); +Research.addInfusionPage("EXURINGS_CRAFTING", ARFeatheryWings); +Research.addInfusionPage("EXURINGS_CRAFTING", ARFairyWings); +Research.addInfusionPage("EXURINGS_CRAFTING", ARDragonWings); +Research.addInfusionPage("EXURINGS_CRAFTING", ARGoldenWings); From 0f5020d00d8c54f4e94ec6838a79da00627c37c6 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Mon, 2 May 2022 20:01:53 +0200 Subject: [PATCH 3/4] Update Extra-Utilities.zs --- scripts/Extra-Utilities.zs | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/Extra-Utilities.zs b/scripts/Extra-Utilities.zs index 1b0e28585c..9393eaac80 100644 --- a/scripts/Extra-Utilities.zs +++ b/scripts/Extra-Utilities.zs @@ -177,7 +177,6 @@ val ARFeatheryWings = ; val ARFairyWings = ; val ARDragonWings = ; val ARGoldenWings = ; -val AngelBlock = ; val TravelWingsImage = ; val TravelWings = .withTag({TinkerArmor: {BaseDurability: 1035, BaseDefense: 2.0, Built: 1 as byte, MaxDefense: 8.0, Damage: 0, BonusDurability: 0, Modifiers: 3, DamageReduction: 0.0, TotalDurability: 1035, ModDurability: 0.0 as float, Broken: 0 as byte}}); val MagicalFeather = ; From 1bc1a2ad8c17b0de5b05eb2ff9ebacba216c61fe Mon Sep 17 00:00:00 2001 From: Chaoschaot234 Date: Mon, 2 May 2022 22:31:23 +0200 Subject: [PATCH 4/4] removed doublicated val AngelBlock changed instablitiy from 100 (to high) to 30 --- scripts/Extra-Utilities.zs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/Extra-Utilities.zs b/scripts/Extra-Utilities.zs index 1b0e28585c..1a8cb73bec 100644 --- a/scripts/Extra-Utilities.zs +++ b/scripts/Extra-Utilities.zs @@ -177,7 +177,6 @@ val ARFeatheryWings = ; val ARFairyWings = ; val ARDragonWings = ; val ARGoldenWings = ; -val AngelBlock = ; val TravelWingsImage = ; val TravelWings = .withTag({TinkerArmor: {BaseDurability: 1035, BaseDefense: 2.0, Built: 1 as byte, MaxDefense: 8.0, Damage: 0, BonusDurability: 0, Modifiers: 3, DamageReduction: 0.0, TotalDurability: 1035, ModDurability: 0.0 as float, Broken: 0 as byte}}); val MagicalFeather = ; @@ -1337,7 +1336,7 @@ Extractor.addRecipe( * 9,