diff --git a/Client/manifest.json b/Client/manifest.json index c6f91239..dddd65a3 100644 --- a/Client/manifest.json +++ b/Client/manifest.json @@ -30,8 +30,8 @@ "required": true }, { - "projectID": 292785, - "fileID": 2915154, + "projectID": 817119, + "fileID": 6141551, "required": true }, { @@ -1026,7 +1026,7 @@ }, { "projectID": 419286, - "fileID": 3886235, + "fileID": 6156863, "required": true }, { @@ -1059,11 +1059,6 @@ "fileID": 2691084, "required": true }, - { - "projectID": 318255, - "fileID": 2747710, - "required": true - }, { "projectID": 281791, "fileID": 2534481, @@ -1733,6 +1728,16 @@ "projectID": 336569, "fileID": 3226142, "required": true + }, + { + "projectID": 1208593, + "fileID": 6238237, + "required": true + }, + { + "projectID": 310029, + "fileID": 3408149, + "required": true } ], "overrides": "overrides" diff --git a/Client/overrides/config/bloodbag.cfg b/Client/overrides/config/bloodbag.cfg new file mode 100644 index 00000000..73fddbf3 --- /dev/null +++ b/Client/overrides/config/bloodbag.cfg @@ -0,0 +1,29 @@ +# Configuration file + +general { + # Bauble slot the Blood Bag goes into. + # Use 'trinket' for any. Case does not matter. + # accepted: [amulet, ring, belt, head, body, charm, trinket] + # default: [trinket] + S:bloodBagSlot=trinket + + # If the Blood Bag can autofeed from your Inventory, instead of just Bauble slots. + # Ignored when Baubles is not present. Configure 'doesAutofeed' in those cases. + # default: [false] + B:canAutofeedFromInventory=true + + # If the Blood Bag can even Autofeed in the first place. + # A Drinking behavior is enabled if this is false. + # default: [true] + B:doesAutofeed=true + + # Maximum Blood the Blood Bag can hold. + # default: [80] + I:maxBlood=80 + + # Maximum Blood that can be consumed at once from the Blood Bag. + # default: [5] + I:maxBloodPerDrink=5 +} + + diff --git a/Client/overrides/config/ftbquests/classic/chapters/189d88b6/877d5ba5.snbt b/Client/overrides/config/ftbquests/classic/chapters/189d88b6/877d5ba5.snbt new file mode 100644 index 00000000..573cc42c --- /dev/null +++ b/Client/overrides/config/ftbquests/classic/chapters/189d88b6/877d5ba5.snbt @@ -0,0 +1,35 @@ +{ + x: -7.0d, + y: -4.0d, + description: "&oI summon Exodia, the Forbidden One!", + text: [ + "Used to summon Rare Creatures or Challenging foes.", + "", + "Instructions:", + "- &bAdd Items&r by &dInteracting with the altar while holding them&r.", + "- &bRemove Items&r by &dCrouching and Interacting without holding anything&r", + "- &bSummon Something&r by &dSneaking and Interacting while Holding the &6Catalyst Item&r.", + "", + "&6Note&r: the &dCatalyst Item&r is the item &6immediately above the Altar in JEI&r." + ], + dependencies: [ + "d22a6b71" + ], + tasks: [{ + uid: "26dbff72", + type: "item", + items: [{ + item: "zensummoning:altar" + }] + }], + rewards: [{ + uid: "ce8f818b", + type: "ftbmoney:money", + ftb_money: 75L + }, + { + uid: "ad0a7e03", + type: "loot", + table: 1 + }] +} diff --git a/Client/overrides/config/ftbquests/classic/chapters/bec752d7/61a1c071.snbt b/Client/overrides/config/ftbquests/classic/chapters/bec752d7/61a1c071.snbt new file mode 100644 index 00000000..5f2eacfd --- /dev/null +++ b/Client/overrides/config/ftbquests/classic/chapters/bec752d7/61a1c071.snbt @@ -0,0 +1,36 @@ +{ + x: 13.5d, + y: 9.5d, + shape: "octagon", + description: "&oPondering my Blood Orb&7 *Read Description*", + text: [ + "One of the ancient &6Vampire Books you found&r talks of something called the &4\"Sanguinum Imperium\"&r, supposedly a Mystical Orb of twisted power.", + "", + "The book tells of its &cpower to influence the will of Vampires&r, though it describes little more, except a &d&oHypothetical&d Spell to replicate it&r, albeit much weaker.", + "", + "If you could make it, it'd likely be far weaker than the original. But &6could it still influence Vampires &6&oenough&6 for you to reap benefits?" + ], + dependencies: [ + "71dbef5d" + ], + hide: true, + size: 1.25d, + tasks: [{ + uid: "18c814d7", + type: "item", + items: [{ + item: "contenttweaker:vampiric_catalyst" + }] + }], + rewards: [{ + uid: "fdc7b3d0", + type: "ftbmoney:money", + ftb_money: 200L + }, + { + uid: "5875f2e4", + type: "item", + item: "vampirism:human_heart", + count: 3 + }] +} diff --git a/Client/overrides/config/ftbquests/classic/chapters/bec752d7/71dbef5d.snbt b/Client/overrides/config/ftbquests/classic/chapters/bec752d7/71dbef5d.snbt new file mode 100644 index 00000000..3e6b0f16 --- /dev/null +++ b/Client/overrides/config/ftbquests/classic/chapters/bec752d7/71dbef5d.snbt @@ -0,0 +1,26 @@ +{ + x: 17.0d, + y: 10.0d, + text: [ + "Books written by ancient Vampires, containing knowledge accumulated by them.", + "", + "Both &5Vampires&r and &1Vampire Hunters&r can use this knowledge to &6further their Skills and Power." + ], + tasks: [{ + uid: "251f0897", + type: "item", + items: [{ + ForgeCaps: { + "astralsorcery:cap_item_amulet_holder": {} + }, + id: "vampirism:vampire_book" + }], + ignore_damage: true, + ignore_nbt: 1b + }], + rewards: [{ + uid: "35148a1e", + type: "ftbmoney:money", + ftb_money: 50L + }] +} diff --git a/Client/overrides/config/ftbquests/classic/chapters/bec752d7/995d2e73.snbt b/Client/overrides/config/ftbquests/classic/chapters/bec752d7/995d2e73.snbt new file mode 100644 index 00000000..0a6baf38 --- /dev/null +++ b/Client/overrides/config/ftbquests/classic/chapters/bec752d7/995d2e73.snbt @@ -0,0 +1,56 @@ +{ + x: 10.5d, + y: 8.5d, + shape: "gear", + description: "&oIn the bag!", + text: [ + "&oHate having to eat Human Hearts all day to get your fill of Blood? Bottles too clunky? Introducing...", + "", + "&c&oBlood Bag!&r&o", + "", + "This clever invention is for all the Vampires out there that find it so unfair that Humans have made gadgets and gizmos to feed themselves.", + "&c&oStuff it with Blood&r&o, connect it to yourself, and it'll keep you filled up like magic! No hands fidgeting around with Bottles or holding Hearts full of Blood!", + "", + "It'll even &c&ofill itself up with any Blood you have no room for!", + "", + "&6&oAnd of course, it can be filled up by all the latest Machines and fancy Gadgets!&r&o", + "Including, but not limited to:", + "- CoFH Co. &b&oThermal Expansion &d&oFluid Transposer&r&o", + "- &b&oEnder I&r&ondustrial &b&oO&r&organzation's &d&oFluid Tanks&r&o.", + "", + "Order Now, and we'll throw in &c&oa Tank of Blood for Free!&r&o That's right, &c&oa Tank of Blood, for Free!", + "", + "&7&oLegal Information:", + "Adam Co. is not responsible for any damages to Vampiric organs caused by Blood Bag (TM).", + "Blood is sold Separately." + ], + dependencies: [ + "6759cf41" + ], + optional: true, + tasks: [{ + uid: "127e5a57", + type: "item", + items: [{ + ForgeCaps: { + "astralsorcery:cap_item_amulet_holder": {} + }, + id: "bloodbag:blood_bag" + }], + ignore_damage: true, + ignore_nbt: 1b + }], + rewards: [{ + uid: "0b6aeed7", + type: "item", + item: { + id: "bloodmagic:blood_tank", + tag: { + Fluid: { + FluidName: "vampirismblood", + Amount: 4000 + } + } + } + }] +} diff --git a/Client/overrides/config/vanillaicecreamfix.cfg b/Client/overrides/config/vanillaicecreamfix.cfg new file mode 100644 index 00000000..55caebde --- /dev/null +++ b/Client/overrides/config/vanillaicecreamfix.cfg @@ -0,0 +1,26 @@ +# Configuration file + +crashes { + B:disableReturnToMainMenu=false + I:errorNotificationDuration=30000 + S:hasteURL=https://api.mclo.gs + B:replaceErrorNotifications=false + + # Valid values: + # LOG + # NOTIFICATION + # WARNING_SCREEN + # CRASH + S:scheduledTaskproblemAction=NOTIFICATION +} + + +fixes { + B:bugFixes=true + B:crashFixes=true + B:modSupport=true + B:profiler=true + B:textureFixes=true +} + + diff --git a/Client/overrides/resources/mce/lang/en_us.lang b/Client/overrides/resources/mce/lang/en_us.lang index b9ac26e1..b32c88ed 100644 --- a/Client/overrides/resources/mce/lang/en_us.lang +++ b/Client/overrides/resources/mce/lang/en_us.lang @@ -244,7 +244,7 @@ mce.taiga.tip.where_to_find_ores=Where to find? Hold SHIFT!
Refer to the TAIG mce.tombstone.message.remove_resplendent_prism=The Resplendent Prism you wear around your neck shakes violently, disturbing your attempt to disenchant the item. -mce.vampirism.tip.pure_blood_obtain=Dropped by Level %s Vampire Barons, or crafted, for a price. +mce.vampirism.tip.pure_blood_obtain=Dropped by Level %s Vampire Barons found in Vampire Forests.
You can also summon them using a Summoning Altar! mce.wings.tip.fairy_dust=Can be used to transmute certain metals. This dust radiates primal magic energy @@ -310,6 +310,19 @@ item.contenttweaker.revival_gem.name=Revival Gem item.contenttweaker.revival_gem.desc=A strange Gem with resurrective powers.
Used to enchant Grave Keys to let them return you to your grave.
This isn't without temporary drawbacks, however. item.contenttweaker.revival_gem.desc2=Found as Loot (Only from Chocolate Quest structures currently) +item.contenttweaker.vampiric_catalyst.name=Vampiric Catalyst +item.contenttweaker.vampiric_catalyst.desc=A Catalyst filled with Vampiric power.
Used to summon Vampire Barons at a Summoning Altar.
Not consumed! + fluid.industrial_dye_blend=Industrial Dye fluid.soul_dye_blend=Soul Dye -fluid.enhanced_dye_blend=Enhanced Dye \ No newline at end of file +fluid.enhanced_dye_blend=Enhanced Dye + + +#Zen Summoning +mce.zensummoning.vampire_baron.wrong_biome=§cVampire Barons only reside in §6Vampire Forests +mce.zensummoning.vampire_baron.success=§6A Baron accepts your challenge... + +mce.zensummoning.vampiric_catalyst.wrong_biome=§cSurely a Vampiric spell works best in a §6Vampire Forest... +mce.zensummoning.vampiric_catalyst.not_night=§cThe instructions say to perform this at Night. +mce.zensummoning.vampiric_catalyst.not_full_moon=§cOh, the instructions specify §6a Full Moon§c... +mce.zensummoning.vampiric_catalyst.success=§6The Spell works! \ No newline at end of file diff --git a/Client/overrides/scripts/MiscCrafting.zs b/Client/overrides/scripts/MiscCrafting.zs index 78a6e86c..c207c005 100644 --- a/Client/overrides/scripts/MiscCrafting.zs +++ b/Client/overrides/scripts/MiscCrafting.zs @@ -198,7 +198,7 @@ recipes.addShaped("mce_erebus_staff_for_flying", , [ //Scarab recipes.addShaped("mce_atum_scarab_for_flying", , [ - [null, skyScarabCrest], + [null, ], [.reuse(), , .reuse()], [null, ] ]); @@ -211,4 +211,13 @@ recipes.addShaped("mce_aurorian_spirit_for_flying", , [ + [null, ], + [, null, ], + [blockMarble.runedSooty, , blockMarble.runedSooty] +]); + + print("--- MiscCrafting.zs initialized ---"); diff --git a/Client/overrides/scripts/Tooltip.zs b/Client/overrides/scripts/Tooltip.zs index bbe92ce8..863cdfac 100644 --- a/Client/overrides/scripts/Tooltip.zs +++ b/Client/overrides/scripts/Tooltip.zs @@ -168,7 +168,10 @@ for geneSet in NBeeT { } for num in 0 to 5 { - itemUtils.getItem("vampirism:pure_blood", num).addTooltip(format.aqua(game.localize("mce.vampirism.tip.pure_blood_obtain").replace("%s", (num+1) as string))); + val lines = game.localize("mce.vampirism.tip.pure_blood_obtain").split("
"); + val pureBlood = itemUtils.getItem("vampirism:pure_blood", num); + pureBlood.addTooltip(format.aqua(lines[0].replace("%s", (num+1) as string))); + pureBlood.addTooltip(format.aqua(lines[1])); } for resItem,amount in { : 5, : 25} as string[IItemStack] { diff --git a/Client/overrides/scripts/contenttweaker/contenttweaker.zs b/Client/overrides/scripts/contenttweaker/contenttweaker.zs index 8e8e82d3..09eb1f84 100644 --- a/Client/overrides/scripts/contenttweaker/contenttweaker.zs +++ b/Client/overrides/scripts/contenttweaker/contenttweaker.zs @@ -16,7 +16,8 @@ val simpleItems as string[] = [ "die_fragment", "living_alloy", "amalgameat", - "revival_gem" + "revival_gem", + "vampiric_catalyst" //"hive_mind" ]; diff --git a/Client/overrides/scripts/contenttweaker/management.zs b/Client/overrides/scripts/contenttweaker/management.zs index 28dd08ac..d9be7ad6 100644 --- a/Client/overrides/scripts/contenttweaker/management.zs +++ b/Client/overrides/scripts/contenttweaker/management.zs @@ -40,7 +40,8 @@ val tooltipedItems as string[IItemStack] = { : "item.contenttweaker.die_fragment.desc", : "item.contenttweaker.living_alloy.desc", : "item.contenttweaker.amalgameat.desc", - : "item.contenttweaker.revival_gem.desc" + : "item.contenttweaker.revival_gem.desc", + : "item.contenttweaker.vampiric_catalyst.desc" }; if(!isServer){ diff --git a/Client/overrides/scripts/vampirism.zs b/Client/overrides/scripts/vampirism.zs index 1437c8f9..a8fe187f 100644 --- a/Client/overrides/scripts/vampirism.zs +++ b/Client/overrides/scripts/vampirism.zs @@ -1,26 +1,85 @@ +import crafttweaker.item.IIngredient; +import crafttweaker.item.IItemStack; +import crafttweaker.data.IData; +import mods.zensummoning.SummoningDirector; +import mods.zensummoning.SummoningAttempt; +import mods.zensummoning.SummoningInfo; +import mods.zensummoning.MobInfo; #MC Eternal Scripts print("--- loading vampirism.zs ---"); -//Crafting Pure Blood with Magic mods -// because i can't be bothered to try and fix vampire baron spawnrates, it will suck i am sure. +//ZenSummoning Vampire Barons +// the spawnrates are bad because of reasons, so summoning! +// replacement for the old Pure Blood crafting. +BaronSummoning(1, [ *1, , , EXU2Item.redstoneEye]); +BaronSummoning(2, [ *2, , , ]); +BaronSummoning(3, [ *3, , , ]); +BaronSummoning(4, [ *4, , , ]); +BaronSummoning(5, [ *5, , , ]); -// tier 1 -mods.thaumcraft.Crucible.registerRecipe("mce_pure_blood_1", "", , , [ *30, *20, *11]); -// tier 2 -mods.naturesaura.Altar.addRecipe("mce_pure_blood_2", , , , 52000, 600); +//Function to make this really simple to do. +function BaronSummoning(level as int, reagents as IIngredient[]) { + SummoningDirector.addSummonInfo(SummoningInfo.create() + .setCatalyst() + .setConsumeCatalyst(false) + .setReagents(reagents) + .addMob(MobInfo.create() + .setMob("vampirism:vampire_baron") + .setData({level: level - 1, ActiveEffects: []}) //{Amplifier: 255, duration: 10, Id: .id, ShowParticles: false} //.makePotionEffect(5, 255) + .setSpread(5,0,5) + ) + .setMutator(function (attempt as SummoningAttempt) { + //print(attempt.world.getBiome(attempt.pos).id); + if(attempt.world.getBiome(attempt.pos).id != "vampirism:vampireforest") { + setFail(attempt, "vampire_baron.wrong_biome"); + } else { + attempt.message = "mce.zensummoning.vampire_baron.success"; + } + }) + ); +} -// tier 3 -mods.roots.Pyre.addRecipe("mce_pure_blood_3", , [, , , , ], 3); +//Vampiric Catalyst +SummoningDirector.addSummonInfo( + ItemSummoning(, , [, , getBloodOrb(bloodOrbTiers[1]), ]) + .setConsumeCatalyst(true) + .setMutator(function(attempt as SummoningAttempt) { + if(attempt.world.getBiome(attempt.pos).id != "vampirism:vampireforest") { + setFail(attempt, "vampiric_catalyst.wrong_biome"); + } else if(attempt.world.dayTime) { + setFail(attempt, "vampiric_catalyst.not_night"); + } else if(attempt.world.moonPhase != 0) { + setFail(attempt, "vampiric_catalyst.not_full_moon"); + } else { + attempt.message = "mce.zensummoning.vampiric_catalyst.success"; + } + }) +); -// tier 4 -mods.bloodmagic.TartaricForge.addRecipe(, [, , , ], 880, 440); +//Shorthand helper for setting summoning failure +function setFail(attempt as SummoningAttempt, reason as string) { + attempt.success = false; + attempt.message = "mce.zensummoning."+ reason; +} -// tier 5 -mods.botania.ElvenTrade.addRecipe([], [, , , , ]); + +//Helper for recipes that summon an Item +function ItemSummoning(output as IItemStack, catalyst as IIngredient, reagents as IIngredient[]) as SummoningInfo { + var itemData as IData = {id: output.definition.id, Count: output.amount}; + if(output.hasTag) + itemData.update({tag: output.tag}); + return SummoningInfo.create() + .setCatalyst(catalyst) + .setReagents(reagents) + .addMob(MobInfo.create() + .setMob("minecraft:item") + .setData({Item: itemData}) + ); +} print("--- vampirism.zs initialized ---");