Skip to content

Commit

Permalink
fix: 🦯Misc Thaumcraft fixes
Browse files Browse the repository at this point in the history
* Fix [Mithrillium Scythe] augmenting (+ lore validation)
* Changed quest rewards for thaumcraft focus tiers
* Update pills textures
* Added some mithminite scythe effects as exception to bosses
  • Loading branch information
TabakaSIM authored Jan 23, 2024
1 parent ea23f09 commit d4cc44c
Show file tree
Hide file tree
Showing 18 changed files with 279 additions and 145 deletions.
33 changes: 3 additions & 30 deletions config/ftbquests/normal/chapters/6bbc9f95/5ace7aee.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -17,35 +17,8 @@
ignore_nbt: 1b
}],
rewards: [{
uid: "8a5473f9",
type: "item",
item: {
id: "thaumcraft:focus_2",
tag: {
display: {
Name: "Riftmaker"
},
package: {
index: 0,
power: 1.0f,
complexity: 18,
nodes: [{
type: "MEDIUM",
key: "ROOT"
},
{
type: "MEDIUM",
key: "thaumcraft.TOUCH"
},
{
type: "EFFECT",
key: "thaumcraft.RIFT",
setting.duration: 10,
setting.depth: 32
}]
},
color: -13692571
}
}
uid: "72b5d6d4",
type: "choice",
table: 149
}]
}
40 changes: 3 additions & 37 deletions config/ftbquests/normal/chapters/6bbc9f95/a0d7c6a4.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -18,42 +18,8 @@
ignore_nbt: 1b
}],
rewards: [{
uid: "6b72fe30",
type: "item",
item: {
id: "thaumicaugmentation:focus_ancient",
tag: {
display: {
Name: "Cursed Bats"
},
package: {
index: 0,
power: 1.0f,
complexity: 34,
nodes: [{
type: "MEDIUM",
key: "ROOT"
},
{
type: "MOD",
key: "thaumcraft.SCATTER",
setting.forks: 10,
setting.cone: 360
},
{
type: "MEDIUM",
key: "thaumcraft.SPELLBAT",
setting.target: 0
},
{
type: "EFFECT",
key: "thaumcraft.CURSE",
setting.duration: 10,
setting.power: 4
}]
},
color: -9830395
}
}
uid: "6cdce789",
type: "choice",
table: 150
}]
}
34 changes: 3 additions & 31 deletions config/ftbquests/normal/chapters/6bbc9f95/a2857370.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -16,36 +16,8 @@
ignore_nbt: 1b
}],
rewards: [{
uid: "ced81c89",
type: "item",
item: {
id: "thaumcraft:focus_1",
tag: {
display: {
Name: "Block Exchange"
},
package: {
index: 0,
power: 1.0f,
complexity: 7,
nodes: [{
type: "MEDIUM",
key: "ROOT"
},
{
type: "MEDIUM",
key: "thaumcraft.PLAN",
setting.method: 1
},
{
type: "EFFECT",
key: "thaumcraft.EXCHANGE",
setting.silk: 1,
setting.fortune: 0
}]
},
color: -11041961
}
}
uid: "4d2cee0d",
type: "choice",
table: 148
}]
}
38 changes: 3 additions & 35 deletions config/ftbquests/normal/chapters/6bbc9f95/bb955ac0.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -17,40 +17,8 @@
ignore_nbt: 1b
}],
rewards: [{
uid: "0562d4d3",
type: "item",
item: {
id: "thaumcraft:focus_3",
tag: {
display: {
Name: "Fountain of Artemis"
},
package: {
index: 0,
power: 1.0f,
complexity: 41,
nodes: [{
type: "MEDIUM",
key: "ROOT"
},
{
type: "MEDIUM",
key: "thaumcraft.BOLT"
},
{
type: "MEDIUM",
key: "thaumcraft.CLOUD",
setting.duration: 30,
setting.radius: 3
},
{
type: "EFFECT",
key: "thaumcraft.HEAL",
setting.power: 5
}]
},
color: -2228219
}
}
uid: "bc4292a0",
type: "choice",
table: 151
}]
}
2 changes: 1 addition & 1 deletion config/ftbquests/normal/chapters/87b91368/a5033afa.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
uid: "c678ca62",
type: "item",
items: [{
item: "rats:rat_nugget_ore 1 49"
item: "rats:rat_nugget_ore 1 51"
}],
ignore_damage: true,
ignore_nbt: 1b
Expand Down
6 changes: 6 additions & 0 deletions config/ftbquests/normal/reward_tables/15309327.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,12 @@
bullets: 6
},
bullets: []
},
ForgeCaps: {
Parent: {
Items: [],
Size: 21
}
}
}
},
Expand Down
50 changes: 50 additions & 0 deletions config/ftbquests/normal/reward_tables/315e942a.snbt
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{
title: "Focus tier 3",
loot_size: 1,
rewards: [{
item: {
id: "thaumcraft:focus_3",
tag: {
display: {
Name: "Fountain of Artemis"
},
package: {
index: 0,
power: 1.0f,
complexity: 41,
nodes: [{
type: "MEDIUM",
key: "ROOT"
},
{
type: "MEDIUM",
key: "thaumcraft.BOLT"
},
{
type: "MEDIUM",
key: "thaumcraft.CLOUD",
setting.duration: 30,
setting.radius: 3
},
{
type: "EFFECT",
key: "thaumcraft.HEAL",
setting.power: 5
}]
},
color: -2228219
}
}
},
{
item: "thaumcraft:focus_3"
},
{
item: {
id: "ftbquests:lootcrate",
tag: {
type: "uncommon"
}
}
}]
}
46 changes: 46 additions & 0 deletions config/ftbquests/normal/reward_tables/3e27363f.snbt
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
title: "Focus tier 1",
loot_size: 1,
rewards: [{
item: {
id: "thaumcraft:focus_1",
tag: {
display: {
Name: "Block Exchange"
},
package: {
index: 0,
power: 1.0f,
complexity: 7,
nodes: [{
type: "MEDIUM",
key: "ROOT"
},
{
type: "MEDIUM",
key: "thaumcraft.PLAN",
setting.method: 1
},
{
type: "EFFECT",
key: "thaumcraft.EXCHANGE",
setting.silk: 1,
setting.fortune: 0
}]
},
color: -11041961
}
}
},
{
item: "thaumcraft:focus_1"
},
{
item: {
id: "ftbquests:lootcrate",
tag: {
type: "common"
}
}
}]
}
52 changes: 52 additions & 0 deletions config/ftbquests/normal/reward_tables/98b4b988.snbt
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
title: "Focus tier 2.5",
loot_size: 1,
rewards: [{
item: {
id: "thaumicaugmentation:focus_ancient",
tag: {
display: {
Name: "Cursed Bats"
},
package: {
index: 0,
power: 1.0f,
complexity: 34,
nodes: [{
type: "MEDIUM",
key: "ROOT"
},
{
type: "MOD",
key: "thaumcraft.SCATTER",
setting.forks: 10,
setting.cone: 360
},
{
type: "MEDIUM",
key: "thaumcraft.SPELLBAT",
setting.target: 0
},
{
type: "EFFECT",
key: "thaumcraft.CURSE",
setting.duration: 10,
setting.power: 4
}]
},
color: -9830395
}
}
},
{
item: "thaumicaugmentation:focus_ancient"
},
{
item: {
id: "ftbquests:lootcrate",
tag: {
type: "uncommon"
}
}
}]
}
45 changes: 45 additions & 0 deletions config/ftbquests/normal/reward_tables/c5015ec6.snbt
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
title: "Focus tier 2",
loot_size: 1,
rewards: [{
item: {
id: "thaumcraft:focus_2",
tag: {
display: {
Name: "Riftmaker"
},
package: {
index: 0,
power: 1.0f,
complexity: 18,
nodes: [{
type: "MEDIUM",
key: "ROOT"
},
{
type: "MEDIUM",
key: "thaumcraft.TOUCH"
},
{
type: "EFFECT",
key: "thaumcraft.RIFT",
setting.duration: 10,
setting.depth: 32
}]
},
color: -13692571
}
}
},
{
item: "thaumcraft:focus_2"
},
{
item: {
id: "ftbquests:lootcrate",
tag: {
type: "common"
}
}
}]
}
6 changes: 5 additions & 1 deletion config/ftbquests/normal/reward_tables/index.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,10 @@
"6dcc7951",
"d80ba6df",
"064cd9a3",
"2c161331"
"2c161331",
"3e27363f",
"c5015ec6",
"98b4b988",
"315e942a"
]
}
Binary file modified resources/contenttweaker/textures/items/dairy_pill.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/contenttweaker/textures/items/fruit_pill.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/contenttweaker/textures/items/grain_pill.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/contenttweaker/textures/items/protein_pill.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/contenttweaker/textures/items/vegetable_pill.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit d4cc44c

Please sign in to comment.