Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Botania expansion #420

Draft
wants to merge 39 commits into
base: master
Choose a base branch
from
Draft

Botania expansion #420

Show file tree
Hide file tree
Changes from 31 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
2487a8c
Campanima - mana from thaumcraft essentia
TabakaSIM Aug 27, 2024
d4590a2
Rokku Eryngium - Cuts rock crystals
TabakaSIM Aug 31, 2024
df8ce2a
Refactor of language file
TabakaSIM Aug 31, 2024
19666d2
Fix campanimia description
TabakaSIM Aug 31, 2024
8a2f05a
Added recipes, lexicon page remove, fixed lang descriptions
TabakaSIM Aug 31, 2024
760d58a
Nuclianthus - mana from nuclear fuel
TabakaSIM Sep 13, 2024
8a3ab36
Lexicon refactor
TabakaSIM Sep 13, 2024
0fd246e
Added missing nuclianthus recipe
TabakaSIM Sep 13, 2024
2a32525
Make working second lexicon page in added entries
TabakaSIM Sep 13, 2024
23fb593
Added ore dictionary to ic2 fuels for Nuclianthus mechanic
TabakaSIM Sep 13, 2024
c7a1ad7
Fixed wrong pickup range in Rokku Eryngium flower
TabakaSIM Sep 14, 2024
c0e82fd
Jikanacea - extends durration of time in a bottle effect
TabakaSIM Sep 14, 2024
e3537f7
Added color support to existing flowers
TabakaSIM Sep 14, 2024
4121d7a
Code configuration and refactor
TabakaSIM Sep 14, 2024
4191f34
Fix item duplication on pick up
TabakaSIM Sep 15, 2024
8a0ef36
Echinacenko - provides nutritions to player
TabakaSIM Sep 15, 2024
10fed37
Fixed ehinacenko texture
TabakaSIM Sep 15, 2024
12e2365
Antirrhift - flower that speed's up mana transportation
TabakaSIM Sep 17, 2024
a57a208
Amuileria kaerunea - crafting with lightning
TabakaSIM Sep 22, 2024
5a86a1e
Add mapping to lexicon to custom flowers
TabakaSIM Sep 24, 2024
38f0b7d
Lexica botania - entries recipes fix
TabakaSIM Sep 24, 2024
bfe8534
Botania questbook
TabakaSIM Sep 25, 2024
1e95737
Rokku eryngium require breaking flower to drop crystal
TabakaSIM Sep 27, 2024
9cd9e91
Temporary fix for nuclianthus sound
TabakaSIM Sep 27, 2024
825f3d7
Fixed Nuclianthus crash when it's picking up fuel
TabakaSIM Sep 27, 2024
984009c
Added color to flowers gui
TabakaSIM Sep 27, 2024
6fd6234
Fixed Nuclianthus crash when it's picking up fuel (this time correctly)
TabakaSIM Sep 27, 2024
e946359
Added effect to amuileria kaerunea when it's charged
TabakaSIM Sep 27, 2024
eb7c547
Support translation for lexicon
TabakaSIM Sep 27, 2024
44d4eee
Nuclianthus - prevent console spam of particle
TabakaSIM Sep 28, 2024
47b8eb7
Revert "Nuclianthus - prevent console spam of particle"
TabakaSIM Sep 28, 2024
ca419ef
Make safeguard
TabakaSIM Sep 29, 2024
d37fa2f
Merge branch 'Krutoy242:master' into botania-expansion
TabakaSIM Sep 29, 2024
a37c95a
Cheaper echinacenko and jikanacea
TabakaSIM Sep 30, 2024
444607c
Fixed format error in quest description
TabakaSIM Sep 30, 2024
5541f96
Changed color to hex
TabakaSIM Sep 30, 2024
058892d
Move playSound function to lib
TabakaSIM Sep 30, 2024
15eb162
Removed unnecessary imports
TabakaSIM Oct 1, 2024
3845543
Make nuclianthus particles client side
TabakaSIM Oct 1, 2024
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
19 changes: 5 additions & 14 deletions config/ftbquests/normal/chapters/6c29cdf5/0736b79a.snbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
title: "{q.botania.jaded_amaranthus.name}",
x: 18.166666666666668d,
y: 2.8333333333333335d,
x: 9.132233d,
y: 8.198062d,
text: [
"{q.botania.jaded_amaranthus.desc}"
],
Expand All @@ -20,17 +20,8 @@
}]
}],
rewards: [{
uid: "cb100aee",
type: "custom",
title: "{e2ee.quest.uncommon}",
icon: {
id: "ftbquests:lootcrate",
tag: {
type: "uncommon"
}
},
tags: [
"loot"
]
uid: "a6462425",
type: "loot",
table: 0
}]
}
5 changes: 3 additions & 2 deletions config/ftbquests/normal/chapters/6c29cdf5/0db73424.snbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
icon: "botania:elementiumchest",
x: 6.166666666666667d,
y: 9.166666666666666d,
x: 6.0d,
y: 0.0d,
text: [
"{q.botania.elementium_helmet.desc}"
],
dependencies: [
"7fa70a93",
"4aa39f8e"
],
tasks: [{
Expand Down
4 changes: 2 additions & 2 deletions config/ftbquests/normal/chapters/6c29cdf5/13a7e117.snbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
title: "{q.botania.entropinnyum.name}",
x: 13.166666666666666d,
y: 2.6666666666666665d,
x: -1.0945641d,
y: 9.127114d,
text: [
"{q.botania.entropinnyum.desc}"
],
Expand Down
25 changes: 25 additions & 0 deletions config/ftbquests/normal/chapters/6c29cdf5/1bb0a209.snbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
title: "{q.botania.the_spectator.name}",
TabakaSIM marked this conversation as resolved.
Show resolved Hide resolved
x: -1.520811931200062d,
y: 5.298896096660367d,
text: [
"{q.botania.the_spectator.desc}"
],
dependencies: [
"b4e2c4b1"
],
tasks: [{
uid: "6933a475",
type: "item",
items: [{
item: "botania:itemfinder"
}],
ignore_damage: true,
ignore_nbt: 1b
}],
rewards: [{
uid: "bf6d452f",
type: "loot",
table: 0
}]
}
6 changes: 3 additions & 3 deletions config/ftbquests/normal/chapters/6c29cdf5/1c7263f8.snbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
x: 6.166666666666667d,
y: 3.8333333333333335d,
x: -2.316616962889756d,
y: 2.819624700677178d,
text: [
"{q.botania.soujourner_s_sash.desc}"
],
dependencies: [
"5672d99b",
"e8b306b0"
"b4e2c4b1"
],
tasks: [{
uid: "7361821b",
Expand Down
4 changes: 2 additions & 2 deletions config/ftbquests/normal/chapters/6c29cdf5/269414a5.snbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
x: 0.5d,
y: 7.833333333333333d,
x: 1.25d,
y: 4.25d,
text: [
"{q.botania.conjuration_catalyst.desc}"
],
Expand Down
26 changes: 26 additions & 0 deletions config/ftbquests/normal/chapters/6c29cdf5/292e7e4e.snbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
title: "{q.botania.marimorphosis.name}",
x: 10.867767d,
y: 8.198062d,
text: [
"{q.botania.marimorphosis.desc}"
],
dependencies: [
"5fe4c911"
],
tasks: [{
uid: "fae34b87",
type: "item",
items: [{
id: "botania:specialflower",
tag: {
type: "marimorphosis"
}
}]
}],
rewards: [{
uid: "823db45c",
type: "loot",
table: 0
}]
}
4 changes: 2 additions & 2 deletions config/ftbquests/normal/chapters/6c29cdf5/2a14b52e.snbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
x: 1.75d,
y: 2.5d,
x: 6.0d,
y: 7.5d,
text: [
"{q.botania.livingwood.desc}"
],
Expand Down
4 changes: 2 additions & 2 deletions config/ftbquests/normal/chapters/6c29cdf5/2af28ccb.snbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
x: 3.5d,
y: 1.1666666666666665d,
x: 10.0d,
y: 4.0d,
text: [
"{q.botania.wand_of_the_forest.desc}"
],
Expand Down
4 changes: 2 additions & 2 deletions config/ftbquests/normal/chapters/6c29cdf5/2bc0a8f1.snbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
x: 3.5416666666666665d,
y: 5.166666666666667d,
x: 2.0d,
y: 5.0d,
text: [
"{q.botania.mana_pool.desc}"
],
Expand Down
26 changes: 26 additions & 0 deletions config/ftbquests/normal/chapters/6c29cdf5/2def0e0e.snbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
title: "{q.botania.agricarnation.name}",
x: 8.905436d,
y: 9.127114d,
text: [
"{q.botania.agricarnation.desc}"
],
dependencies: [
"5fe4c911"
],
tasks: [{
uid: "6f419052",
type: "item",
items: [{
id: "botania:specialflower",
tag: {
type: "agricarnation"
}
}]
}],
rewards: [{
uid: "bae8f01b",
type: "loot",
table: 0
}]
}
27 changes: 27 additions & 0 deletions config/ftbquests/normal/chapters/6c29cdf5/2fd13fd0.snbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
title: "{q.botania.jikanacea.name}",
x: 10.0d,
y: 12.0d,
shape: "gear",
text: [
"{q.botania.jikanacea.desc}"
],
dependencies: [
"5fe4c911"
],
tasks: [{
uid: "874e30da",
type: "item",
items: [{
id: "botania:specialflower",
tag: {
type: "jikanacea"
}
}]
}],
rewards: [{
uid: "07f3d2d3",
type: "loot",
table: 2
}]
}
19 changes: 5 additions & 14 deletions config/ftbquests/normal/chapters/6c29cdf5/3338b7e6.snbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
x: 10.5d,
y: 6.5d,
x: 7.0d,
y: -2.0d,
text: [
"{q.botania.shard_of_laputa.desc}"
],
Expand All @@ -18,17 +18,8 @@
ignore_nbt: 1b
}],
rewards: [{
uid: "64e7431b",
type: "custom",
title: "{e2ee.quest.common}",
icon: {
id: "ftbquests:lootcrate",
tag: {
type: "common"
}
},
tags: [
"loot"
]
uid: "d2bddba1",
type: "loot",
table: 1
}]
}
19 changes: 5 additions & 14 deletions config/ftbquests/normal/chapters/6c29cdf5/33f630e1.snbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
title: "{q.botania.terrasteel.name}",
x: 4.833333333333333d,
y: 7.166666666666667d,
x: 4.0d,
y: 2.5d,
text: [
"{q.botania.terrasteel.desc}"
],
Expand All @@ -17,17 +17,8 @@
}]
}],
rewards: [{
uid: "a85302ce",
type: "custom",
title: "{e2ee.quest.common}",
icon: {
id: "ftbquests:lootcrate",
tag: {
type: "common"
}
},
tags: [
"loot"
]
uid: "be379c4e",
type: "loot",
table: 1
}]
}
26 changes: 26 additions & 0 deletions config/ftbquests/normal/chapters/6c29cdf5/34e85779.snbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
title: "{q.botania.spectrolus.name}",
x: -0.60743725d,
y: 11.261356d,
text: [
"{q.botania.spectrolus.desc}"
],
dependencies: [
"95ce8a09"
],
tasks: [{
uid: "ed8867f6",
type: "item",
items: [{
id: "botania:specialflower",
tag: {
type: "spectrolus"
}
}]
}],
rewards: [{
uid: "77cdf3c5",
type: "loot",
table: 1
}]
}
27 changes: 27 additions & 0 deletions config/ftbquests/normal/chapters/6c29cdf5/363eeb4d.snbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
title: "{q.botania.echinacenko.name}",
x: 8.050144d,
y: 9.554958d,
shape: "gear",
text: [
"{q.botania.echinacenko.desc}"
],
dependencies: [
"5fe4c911"
],
tasks: [{
uid: "2518bfbe",
type: "item",
items: [{
id: "botania:specialflower",
tag: {
type: "echinacenko"
}
}]
}],
rewards: [{
uid: "517edea1",
type: "loot",
table: 1
}]
}
22 changes: 7 additions & 15 deletions config/ftbquests/normal/chapters/6c29cdf5/38e08b65.snbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{
x: 9.166666666666666d,
y: 9.166666666666666d,
x: 8.0d,
y: 0.0d,
text: [
"{q.botania.gaia_mana_spreader.desc}"
],
dependencies: [
"f94ec042",
"5672d99b",
"8fd96e22"
"88d4b657"
],
tasks: [{
uid: "8af85118",
Expand All @@ -16,17 +17,8 @@
}]
}],
rewards: [{
uid: "4ffa311b",
type: "custom",
title: "{e2ee.quest.uncommon}",
icon: {
id: "ftbquests:lootcrate",
tag: {
type: "uncommon"
}
},
tags: [
"loot"
]
uid: "4e9329f8",
type: "loot",
table: 1
}]
}
Loading