Merge pull request #874 from TheBedrockMaster/Quests

Quest Work
AllTheMods · Oct 23, 2024 · 0a57e0b · 0a57e0b
2 parents bb405f3 + 6632e31
commit 0a57e0b
Show file tree

Hide file tree

Showing 7 changed files with 166 additions and 102 deletions.
diff --git a/config/ftbquests/quests/chapters/chapter_2_the_star.snbt b/config/ftbquests/quests/chapters/chapter_2_the_star.snbt
@@ -3682,5 +3682,23 @@
  x: 0.0d
  y: 8.5d
  }
+ {
+ id: "31B0267C47DB9D98"
+ invisible: true
+ optional: true
+ shape: "circle"
+ tasks: [
+ {
+ id: "662F6B4EF078E3A2"
+ type: "checkmark"
+ }
+ {
+ id: "644EBD9EBC93EB3C"
+ type: "checkmark"
+ }
+ ]
+ x: 0.0d
+ y: 10.5d
+ }
  ]
 }
diff --git a/config/ftbquests/quests/chapters/eternal_starlight.snbt b/config/ftbquests/quests/chapters/eternal_starlight.snbt
@@ -3293,5 +3293,23 @@
  x: 0.0d
  y: 11.0d
  }
+ {
+ id: "0342248394E40B6A"
+ invisible: true
+ optional: true
+ shape: "circle"
+ tasks: [
+ {
+ id: "0AD8AC7ECCD8002A"
+ type: "checkmark"
+ }
+ {
+ id: "2510A7EE5D886B63"
+ type: "checkmark"
+ }
+ ]
+ x: 0.0d
+ y: -15.0d
+ }
  ]
 }
diff --git a/config/ftbquests/quests/chapters/food_and_farming.snbt b/config/ftbquests/quests/chapters/food_and_farming.snbt
@@ -111,9 +111,9 @@
  quests: [
  {
  icon: {
- id: "productivetrees:sparkling_cherry"
+ id: "pamhc2trees:starfruititem"
  }
- icon_scale: 1.2d
+ icon_scale: 1.5d
  id: "1827DEEA2DF1B144"
  rewards: [
  {
@@ -200,15 +200,18 @@
  }
  {
  dependencies: ["2E9C035EEE7E5C34"]
+ icon: {
+ id: "minecraft:shears"
+ }
  id: "18EADBAFC932F864"
  rewards: [{
  id: "68AA10BF3AA0408A"
  type: "xp"
  xp: 10
  }]
  tasks: [{
- id: "3A9869856B3E9D54"
- item: { count: 1, id: "minecraft:shears" }
+ id: "2725700B5EA1CD75"
+ item: { components: { "ftbfiltersystem:filter": "ftbfiltersystem:item_tag(c:tools/shear)" }, count: 1, id: "ftbfiltersystem:smart_filter" }
  type: "item"
  }]
  x: 4.0d

diff --git a/config/ftbquests/quests/chapters/pneumaticcraft.snbt b/config/ftbquests/quests/chapters/pneumaticcraft.snbt
@@ -196,19 +196,11 @@
  dependencies: ["371A34B297C8A8EF"]
  id: "65E2AF881709C896"
  min_required_dependencies: 1
- rewards: [
- {
- exclude_from_claim_all: true
- id: "4AFB0B4320237194"
- table_id: 6269051860797387566L
- type: "random"
- }
- {
- id: "0D8976051123BE39"
- type: "xp"
- xp: 50
- }
- ]
+ rewards: [{
+ id: "0D8976051123BE39"
+ type: "xp"
+ xp: 50
+ }]
  tasks: [{
  count: 32L
  id: "052A7C7918C3A0D5"
@@ -225,11 +217,23 @@
  }
  id: "5D64250B940BC8FD"
  optional: true
- rewards: [{
- id: "47450D97FBA340DA"
- type: "xp"
- xp: 50
- }]
+ rewards: [
+ {
+ count: 3
+ id: "0C9FFA992177A00E"
+ item: {
+ count: 1
+ id: "pneumaticcraft:ingot_iron_compressed"
+ }
+ random_bonus: 2
+ type: "item"
+ }
+ {
+ id: "4B5CA74ED7C38627"
+ type: "xp"
+ xp: 50
+ }
+ ]
  tasks: [
  {
  id: "304A15731EA889F5"
@@ -265,12 +269,13 @@
  optional: true
  rewards: [
  {
- count: 16
+ count: 5
  id: "6318CBE3EBAB4501"
  item: {
  count: 1
  id: "pneumaticcraft:ingot_iron_compressed"
  }
+ random_bonus: 5
  type: "item"
  }
  {
@@ -290,19 +295,11 @@
  {
  dependencies: ["371A34B297C8A8EF"]
  id: "40F634AC38F42B88"
- rewards: [
- {
- exclude_from_claim_all: true
- id: "08291771A0655284"
- table_id: 6269051860797387566L
- type: "random"
- }
- {
- id: "740A676015A9235B"
- type: "xp"
- xp: 50
- }
- ]
+ rewards: [{
+ id: "740A676015A9235B"
+ type: "xp"
+ xp: 50
+ }]
  tasks: [{
  count: 16L
  id: "78082DDA22FC7B9B"
@@ -345,12 +342,6 @@
  table_id: 6269051860797387566L
  type: "random"
  }
- {
- exclude_from_claim_all: true
- id: "1158AC7F5A9A2966"
- table_id: 487623848494439020L
- type: "random"
- }
  {
  id: "3747DBACF5E6FB76"
  type: "xp"
@@ -1550,7 +1541,7 @@
  id: "618C5C25773A6B26"
  item: {
  count: 1
- id: "croptopia:potato_chips"
+ id: "pamhc2foodcore:potatochipsitem"
  }
  type: "item"
  }

diff --git a/config/ftbquests/quests/chapters/productive_bees.snbt b/config/ftbquests/quests/chapters/productive_bees.snbt
@@ -506,7 +506,7 @@
  dependencies: ["131EC039435B8878"]
  hide_dependency_lines: true
  icon: {
- id: "minecraft:stone_pickaxe"
+ id: "regions_unexplored:ash"
  }
  id: "37367101B3DAA70F"
  rewards: [{
@@ -1194,7 +1194,7 @@
  dependencies: ["131EC039435B8878"]
  hide_dependency_lines: true
  icon: {
- id: "croptopia:chocolate"
+ id: "pamhc2foodcore:chocolatebaritem"
  }
  id: "486060882E507CF1"
  rewards: [{
@@ -1719,7 +1719,7 @@
  dependencies: ["131EC039435B8878"]
  hide_dependency_lines: true
  icon: {
- id: "croptopia:tea_leaves"
+ id: "regions_unexplored:maple_leaf_pile"
  }
  id: "6BEE3578BD2C713C"
  rewards: [{
@@ -1737,6 +1737,9 @@
  {
  dependencies: ["131EC039435B8878"]
  hide_dependency_lines: true
+ icon: {
+ id: "antiblocksrechiseled:bright_red"
+ }
  id: "683B58B699D4D381"
  rewards: [{
  id: "713068FC6AD69883"
@@ -1944,6 +1947,40 @@
  dependencies: ["17419401147B5C02"]
  hide_dependency_lines: true
  icon: {
+ components: {
+ "relics:data": {
+ abilities: {
+ abilities: {
+ heart: {
+ extender: {
+ cooldown: 0
+ cooldownCap: 0
+ ticking: 0b
+ }
+ lock: {
+ breaks: 5
+ }
+ points: 0
+ research: {
+ links: { }
+ researched: 0b
+ }
+ stats: {
+ amount: {
+ initialValue: 3.62555d
+ }
+ }
+ }
+ }
+ }
+ leveling: {
+ experience: 0
+ level: 0
+ luck: 0
+ points: 0
+ }
+ }
+ }
  id: "artifacts:crystal_heart"
  }
  id: "2E51F09F6D9E5EF8"