Skip to content

Commit

Permalink
Reenable angel wings (GTNewHorizons#10250)
Browse files Browse the repository at this point in the history 
* reenabled angel wings

* adding recipes and researches for Angel Wings
disabling vanilla recipes for them

* Update Extra-Utilities.zs

* removed doublicated val AngelBlock
changed instablitiy from 100 (to high) to 30

Co-authored-by: Martin Robertz <[email protected]>
  • Loading branch information
@Dream-Master
Marcel Petzold and Dream-Master authored Jun 24, 2022
1 parent dc063dd commit bb6b4fa
Show file tree
Hide file tree
Showing 2 changed files with 85 additions and 5 deletions.
2 changes: 1 addition & 1 deletion config/ExtraUtilities.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ client_options {


items {
B:AngelRingEnabled=false
B:AngelRingEnabled=true
B:BedrockiumIngotEnabled=true
B:BuildersWandEnabled=true
B:CreativeBuildersWandEnabled=true
Expand Down
88 changes: 84 additions & 4 deletions scripts/Extra-Utilities.zs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = <ExtraUtilities:enderThermicPump>;
val EnderObsidian = <ExtraUtilities:decorativeBlock1:1>;
val EnderCore = <ExtraUtilities:decorativeBlock1:11>;
Expand Down Expand Up @@ -170,11 +172,36 @@ val Screwdriver = <ore:craftingToolScrewdriver>;
val Saw = <ore:craftingToolSaw>;
val Shears = <minecraft:shears>;


val ARInvisableWings = <ExtraUtilities:angelRing>;
val ARFeatheryWings = <ExtraUtilities:angelRing:1>;
val ARFairyWings = <ExtraUtilities:angelRing:2>;
val ARDragonWings = <ExtraUtilities:angelRing:3>;
val ARGoldenWings = <ExtraUtilities:angelRing:4>;
val TravelWingsImage = <TConstruct:travelWings>;
val TravelWings = <TConstruct: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 = <miscutils:magicfeather>;
val Netherstar = <minecraft:nether_star>;
val IridiumRing = <gregtech:gt.metaitem.01:28084>;
val BigPearl = <Avaritia:big_pearl>;
val PrimalCharm = <Thaumcraft:ItemResource:15>;
val DragonEgg = <minecraft:dragon_egg>;
val DragonStone = <Botania:manaResource:9>;
val RoseGoldFoil = <gregtech:gt.metaitem.01:29351>;
val FeatherFletching = <TConstruct:fletching>;
val TFCicada = <TwilightForest:tile.TFCicada>;
val TFFireFly = <TwilightForest:tile.TFFirefly>;
val EngravedGC = <dreamcraft:item.EngravedGoldChip>;
val InfinityCatalyst = <Avaritia:Resource:5>;
val SalisMundus = <Thaumcraft:ItemResource:14>;

// --- 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(<*>);
Expand Down Expand Up @@ -1306,3 +1333,56 @@ Extractor.addRecipe(<minecraft:sand> * 9, <ExtraUtilities:cobblestone_compressed

// --- Double Compressed Sand
Extractor.addRecipe(<ExtraUtilities:cobblestone_compressed:14> * 9, <ExtraUtilities:cobblestone_compressed:15>);

// --- 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, 30);

// --- 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?<BR>Annoyed about the fact that you need some type of fuel or energy for your Jetpack to work?<BR>What would a Thaumaturge give to achieve the ability to fly without these restrictions?<BR>Maybe some §oWarp§r? Not at this point yet, maybe later?<BR>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?<BR> I would like to ... try to infuse them with ... what items would you need you may ask and the final result will be ...?<BR>Pretty out of ideas I see so let us make some theoretical studies first:<BR>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.<BR>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.<BR>You should have a few Jars filled with §oVolatus, Tempestas, Praecantatio, Nebrisum, Motus§r and §oTerminus§r to be prepared.<LINE>");
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.<LINE> 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.<BR> At last you would need §oNether Stars§r and §oAngel Blocks§r the first part of ingredients.<LINE>");
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.<LINE> The first downside will be from GT++:<BR>§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.<BR>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.<LINE>");
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.<LINE>");

// --- 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 payment<LINE>Fine 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.<LINE>First recipe: Angel Ring (Invisible Wings)<BR>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.<LINE>Second and following ones are Angel Rings with the following options: Golden Wings, Dragon Wings, Feathery Wings, Fairy Wings.<BR>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);

0 comments on commit bb6b4fa

Please sign in to comment.