Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions Client/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
"required": true
},
{
"projectID": 292785,
"fileID": 2915154,
"projectID": 817119,
"fileID": 6141551,
"required": true
},
{
Expand Down Expand Up @@ -1026,7 +1026,7 @@
},
{
"projectID": 419286,
"fileID": 3886235,
"fileID": 6156863,
"required": true
},
{
Expand Down Expand Up @@ -1059,11 +1059,6 @@
"fileID": 2691084,
"required": true
},
{
"projectID": 318255,
"fileID": 2747710,
"required": true
},
{
"projectID": 281791,
"fileID": 2534481,
Expand Down Expand Up @@ -1733,6 +1728,16 @@
"projectID": 336569,
"fileID": 3226142,
"required": true
},
{
"projectID": 1208593,
"fileID": 6238237,
"required": true
},
{
"projectID": 310029,
"fileID": 3408149,
"required": true
}
],
"overrides": "overrides"
Expand Down
29 changes: 29 additions & 0 deletions Client/overrides/config/bloodbag.cfg
Original file line number Diff line number Diff line change
@@ -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
}


Original file line number Diff line number Diff line change
@@ -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
}]
}
Original file line number Diff line number Diff line change
@@ -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
}]
}
Original file line number Diff line number Diff line change
@@ -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
}]
}
Original file line number Diff line number Diff line change
@@ -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
}
}
}
}]
}
26 changes: 26 additions & 0 deletions Client/overrides/config/vanillaicecreamfix.cfg
Original file line number Diff line number Diff line change
@@ -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
}


17 changes: 15 additions & 2 deletions Client/overrides/resources/mce/lang/en_us.lang
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ mce.taiga.tip.where_to_find_ores=Where to find? Hold SHIFT!<BR>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.<BR>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

Expand Down Expand Up @@ -310,6 +310,19 @@ item.contenttweaker.revival_gem.name=Revival Gem
item.contenttweaker.revival_gem.desc=A strange Gem with resurrective powers.<BR>Used to enchant Grave Keys to let them return you to your grave.<BR>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.<BR>Used to summon Vampire Barons at a Summoning Altar.<BR>Not consumed!

fluid.industrial_dye_blend=Industrial Dye
fluid.soul_dye_blend=Soul Dye
fluid.enhanced_dye_blend=Enhanced Dye
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!
11 changes: 10 additions & 1 deletion Client/overrides/scripts/MiscCrafting.zs
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ recipes.addShaped("mce_erebus_staff_for_flying", <erebus:portal_activator>, [

//Scarab
recipes.addShaped("mce_atum_scarab_for_flying", <atum:scarab>, [
[null, skyScarabCrest],
[null, <contenttweaker:sky_scarab_crest>],
[<atum:idol_of_labor>.reuse(), <atum:crunchy_golden_scarab>, <atum:heart_of_ra>.reuse()],
[null, <minecraft:elytra>]
]);
Expand All @@ -211,4 +211,13 @@ recipes.addShaped("mce_aurorian_spirit_for_flying", <theaurorian:crystallinespri
]);



//ZenSummoning altar
recipes.addShaped("mce_zensummoning_altar", <zensummoning:altar>, [
[null, <randomthings:ingredient:2>],
[<randomthings:runedust:14>, null, <randomthings:runedust:14>],
[blockMarble.runedSooty, <ancientspellcraft:blank_rune>, blockMarble.runedSooty]
]);


print("--- MiscCrafting.zs initialized ---");
5 changes: 4 additions & 1 deletion Client/overrides/scripts/Tooltip.zs
Original file line number Diff line number Diff line change
Expand Up @@ -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("<BR>");
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 {<xreliquary:angelheart_vial> : 5, <xreliquary:phoenix_down>: 25} as string[IItemStack] {
Expand Down
3 changes: 2 additions & 1 deletion Client/overrides/scripts/contenttweaker/contenttweaker.zs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ val simpleItems as string[] = [
"die_fragment",
"living_alloy",
"amalgameat",
"revival_gem"
"revival_gem",
"vampiric_catalyst"
//"hive_mind"
];

Expand Down
3 changes: 2 additions & 1 deletion Client/overrides/scripts/contenttweaker/management.zs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ val tooltipedItems as string[IItemStack] = {
<contenttweaker:die_fragment>: "item.contenttweaker.die_fragment.desc",
<contenttweaker:living_alloy>: "item.contenttweaker.living_alloy.desc",
<contenttweaker:amalgameat>: "item.contenttweaker.amalgameat.desc",
<contenttweaker:revival_gem>: "item.contenttweaker.revival_gem.desc"
<contenttweaker:revival_gem>: "item.contenttweaker.revival_gem.desc",
<contenttweaker:vampiric_catalyst>: "item.contenttweaker.vampiric_catalyst.desc"
};

if(!isServer){
Expand Down
Loading