Skip to content

Commit b871547

Browse files
Merge pull request #595 from DivineFinal/quest-experiment
Various Quest Changes...again
2 parents d8c8903 + 3d630f1 commit b871547

30 files changed

+562
-436
lines changed

config/ftbquests/quests/chapters/apotheosis_gear.snbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1127,4 +1127,4 @@
11271127
y: 0.0d
11281128
}
11291129
]
1130-
}
1130+
}

config/ftbquests/quests/chapters/apothic_enchanting.snbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@
410410
tasks: [{
411411
count: 8L
412412
id: "129FC7396A82D377"
413-
item: { count: 5, id: "apothic_enchanting:infused_hellshelf" }
413+
item: { count: 1, id: "apothic_enchanting:infused_hellshelf" }
414414
type: "item"
415415
}]
416416
x: 3.5d
@@ -809,13 +809,13 @@
809809
{
810810
count: 5L
811811
id: "1F985EE897C559DA"
812-
item: { count: 4, id: "apothic_enchanting:soul_touched_sculkshelf" }
812+
item: { count: 1, id: "apothic_enchanting:soul_touched_sculkshelf" }
813813
type: "item"
814814
}
815815
{
816816
count: 5L
817817
id: "7E52C8FAC7C1773C"
818-
item: { count: 4, id: "apothic_enchanting:echoing_sculkshelf" }
818+
item: { count: 1, id: "apothic_enchanting:echoing_sculkshelf" }
819819
type: "item"
820820
}
821821
{
@@ -1503,4 +1503,4 @@
15031503
y: 5.0d
15041504
}
15051505
]
1506-
}
1506+
}

config/ftbquests/quests/chapters/applied_energistics_2.snbt

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1387,30 +1387,6 @@
13871387
x: 20.5d
13881388
y: 6.5d
13891389
}
1390-
{
1391-
dependencies: ["18DFB25DC48D8BF7"]
1392-
id: "2897FA291E5A38D8"
1393-
optional: true
1394-
rewards: [
1395-
{
1396-
id: "1560015D5E8AFFEA"
1397-
table_id: 5871764666515020368L
1398-
type: "random"
1399-
}
1400-
{
1401-
id: "0EFC422D024D31D7"
1402-
type: "xp"
1403-
xp: 100
1404-
}
1405-
]
1406-
tasks: [{
1407-
id: "68A36AB341CC016D"
1408-
item: { count: 1, id: "ae2:spatial_anchor" }
1409-
type: "item"
1410-
}]
1411-
x: 21.5d
1412-
y: 5.5d
1413-
}
14141390
{
14151391
dependencies: ["18DFB25DC48D8BF7"]
14161392
id: "6F3D0A248B5A9CA2"
@@ -1970,4 +1946,4 @@
19701946
y: 0.5d
19711947
}
19721948
]
1973-
}
1949+
}

config/ftbquests/quests/chapters/ars_nouveau.snbt

Lines changed: 8 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -3063,7 +3063,7 @@
30633063
item: { count: 1, id: "ars_additions:glyph_retaliate" }
30643064
type: "item"
30653065
}]
3066-
x: 2.0d
3066+
x: 3.0d
30673067
y: -12.5d
30683068
}
30693069
{
@@ -3081,7 +3081,7 @@
30813081
type: "item"
30823082
}]
30833083
x: 4.0d
3084-
y: -11.5d
3084+
y: -10.5d
30853085
}
30863086
{
30873087
dependencies: ["6F3602F5600A6221"]
@@ -3097,8 +3097,8 @@
30973097
item: { count: 1, id: "ars_elemental:glyph_homing_projectile" }
30983098
type: "item"
30993099
}]
3100-
x: 3.0d
3101-
y: -12.5d
3100+
x: 4.0d
3101+
y: -11.5d
31023102
}
31033103
{
31043104
dependencies: ["63DD7F5A4441ACE7"]
@@ -3321,23 +3321,6 @@
33213321
x: 3.0d
33223322
y: -10.5d
33233323
}
3324-
{
3325-
dependencies: ["6F3602F5600A6221"]
3326-
id: "6C1107CD93FA34A5"
3327-
rewards: [{
3328-
id: "7DA5C5CB53E1817F"
3329-
type: "xp"
3330-
xp: 200
3331-
}]
3332-
shape: "rsquare"
3333-
tasks: [{
3334-
id: "20A0CFD03D4C059E"
3335-
item: { count: 1, id: "ars_elemental:glyph_nullify_defense" }
3336-
type: "item"
3337-
}]
3338-
x: 4.0d
3339-
y: -10.5d
3340-
}
33413324
{
33423325
dependencies: ["441C0659ED28D935"]
33433326
id: "3CAB80B2BB5C2C37"
@@ -3612,31 +3595,6 @@
36123595
x: 2.0d
36133596
y: -11.5d
36143597
}
3615-
{
3616-
dependencies: ["457DE8C154641437"]
3617-
id: "3DFD95B278C78101"
3618-
rewards: [
3619-
{
3620-
exclude_from_claim_all: true
3621-
id: "415282F92B9FEF25"
3622-
table_id: 6355363837720688303L
3623-
type: "random"
3624-
}
3625-
{
3626-
id: "22294DCB7E84E352"
3627-
type: "xp"
3628-
xp: 100
3629-
}
3630-
]
3631-
shape: "diamond"
3632-
tasks: [{
3633-
id: "1F4584B02645C2ED"
3634-
item: { count: 1, id: "ars_additions:ritual_chunk_loading" }
3635-
type: "item"
3636-
}]
3637-
x: 5.5d
3638-
y: 6.0d
3639-
}
36403598
{
36413599
dependencies: ["457DE8C154641437"]
36423600
id: "6675A49D305E3C90"
@@ -3887,31 +3845,6 @@
38873845
x: 6.0d
38883846
y: 7.5d
38893847
}
3890-
{
3891-
dependencies: ["457DE8C154641437"]
3892-
id: "1703352A88C4E60E"
3893-
rewards: [
3894-
{
3895-
exclude_from_claim_all: true
3896-
id: "707554D3A2AB6CA7"
3897-
table_id: 6355363837720688303L
3898-
type: "random"
3899-
}
3900-
{
3901-
id: "577A6905EA61E96B"
3902-
type: "xp"
3903-
xp: 100
3904-
}
3905-
]
3906-
shape: "diamond"
3907-
tasks: [{
3908-
id: "72B5A4A85AD1EC89"
3909-
item: { count: 1, id: "ars_caelum:ritual_conjure_island_starter" }
3910-
type: "item"
3911-
}]
3912-
x: 6.5d
3913-
y: 8.0d
3914-
}
39153848
{
39163849
dependencies: ["457DE8C154641437"]
39173850
id: "03A09F5C4C7F3C79"
@@ -4134,8 +4067,8 @@
41344067
item: { count: 1, id: "ars_nouveau:ritual_forestation" }
41354068
type: "item"
41364069
}]
4137-
x: 8.5d
4138-
y: 9.0d
4070+
x: 5.5d
4071+
y: 6.0d
41394072
}
41404073
{
41414074
dependencies: ["457DE8C154641437"]
@@ -4361,7 +4294,7 @@
43614294
type: "item"
43624295
}]
43634296
x: 6.5d
4364-
y: 9.0d
4297+
y: 8.0d
43654298
}
43664299
{
43674300
dependencies: ["227DBA8836021B0B"]
@@ -5901,4 +5834,4 @@
59015834
y: -10.5d
59025835
}
59035836
]
5904-
}
5837+
}

config/ftbquests/quests/chapters/basic_armor.snbt

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2180,6 +2180,7 @@
21802180
}
21812181
{
21822182
id: "0CE23DBBBFBCC372"
2183+
invisible: true
21832184
optional: true
21842185
rewards: [{
21852186
id: "04DE9ED5CD870524"
@@ -2584,5 +2585,38 @@
25842585
x: -5.5d
25852586
y: 0.5d
25862587
}
2588+
{
2589+
id: "49E13245EE169048"
2590+
optional: true
2591+
rewards: [{
2592+
id: "0A5CDEAAC8A37228"
2593+
type: "xp"
2594+
xp: 1
2595+
}]
2596+
tasks: [
2597+
{
2598+
id: "2B0217E1C8AE1C47"
2599+
item: { count: 1, id: "mekanism:hazmat_mask" }
2600+
type: "item"
2601+
}
2602+
{
2603+
id: "22E31648B10B4AD6"
2604+
item: { count: 1, id: "mekanism:hazmat_gown" }
2605+
type: "item"
2606+
}
2607+
{
2608+
id: "531D1C9D952A37D2"
2609+
item: { count: 1, id: "mekanism:hazmat_pants" }
2610+
type: "item"
2611+
}
2612+
{
2613+
id: "424945CF79B5BFBF"
2614+
item: { count: 1, id: "mekanism:hazmat_boots" }
2615+
type: "item"
2616+
}
2617+
]
2618+
x: -12.0d
2619+
y: -6.0d
2620+
}
25872621
]
2588-
}
2622+
}

config/ftbquests/quests/chapters/building_tips.snbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@
601601
id: "09688F9C10379A20"
602602
item: {
603603
count: 1
604-
id: "productivetrees:upgrade_pollen_sieve"
604+
id: "productivelib:upgrade_pollen_sieve"
605605
}
606606
type: "item"
607607
}
@@ -1869,4 +1869,4 @@
18691869
y: -7.5d
18701870
}
18711871
]
1872-
}
1872+
}

config/ftbquests/quests/chapters/elmystical_agriculturerr.snbt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -783,7 +783,7 @@
783783
{
784784
count: 4L
785785
id: "1E8B2243116BF6DA"
786-
item: { count: 4, id: "mysticalagriculture:soul_jar" }
786+
item: { count: 1, id: "mysticalagriculture:soul_jar" }
787787
type: "item"
788788
}
789789
{
@@ -1812,7 +1812,7 @@
18121812
{
18131813
count: 4L
18141814
id: "08B7E48447228764"
1815-
item: { count: 4, id: "mysticalagriculture:experience_capsule" }
1815+
item: { count: 1, id: "mysticalagriculture:experience_capsule" }
18161816
type: "item"
18171817
}
18181818
]
@@ -2546,8 +2546,8 @@
25462546
}
25472547
]
25482548
tasks: [{
2549-
id: "250A0320FF2BC775"
2550-
item: { count: 1, id: "mysticalagriculture:watering_can" }
2549+
id: "4C906A47EBC15BC1"
2550+
item: { components: { "ftbfiltersystem:filter": "or(item(mysticalagriculture:watering_can)item(pickletweaks:watering_can))" }, count: 1, id: "ftbfiltersystem:smart_filter" }
25512551
type: "item"
25522552
}]
25532553
x: 5.0d
@@ -3117,4 +3117,4 @@
31173117
y: -4.0d
31183118
}
31193119
]
3120-
}
3120+
}

config/ftbquests/quests/chapters/extreme_reactors.snbt

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,6 @@
5151
x: -0.5d
5252
y: 9.5d
5353
}
54-
{
55-
height: 0.3d
56-
image: "allthetweaks:item/atm_star"
57-
rotation: 0.0d
58-
width: 0.3d
59-
x: -2.0d
60-
y: 16.5d
61-
}
6254
]
6355
order_index: 0
6456
progression_mode: "flexible"
@@ -355,7 +347,7 @@
355347
tasks: [{
356348
count: 4L
357349
id: "57D3013D5136E202"
358-
item: { count: 4, id: "alltheores:uranium_ingot" }
350+
item: { count: 1, id: "alltheores:uranium_ingot" }
359351
type: "item"
360352
}]
361353
x: -7.0d
@@ -1095,4 +1087,4 @@
10951087
y: 2.5d
10961088
}
10971089
]
1098-
}
1090+
}

0 commit comments

Comments
 (0)