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.

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

Ars quest work #101

Merged
merged 38 commits into from
Sep 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
90ed02b
ars quests
MuteTiefling Aug 29, 2024
a2c21b7
tags and quests
MuteTiefling Aug 29, 2024
5730cc0
Update imbuement.js
MuteTiefling Aug 29, 2024
418c186
Update ars_nouveau.snbt
MuteTiefling Aug 29, 2024
843d637
batch
MuteTiefling Aug 29, 2024
7f6ab6f
ars
MuteTiefling Aug 29, 2024
5f090ff
quests
MuteTiefling Aug 29, 2024
7dc5d1a
quest
MuteTiefling Aug 29, 2024
d2eaa8a
quest
MuteTiefling Aug 29, 2024
8ca833d
quests
MuteTiefling Aug 29, 2024
0ca7eaf
glyph cleanup
MuteTiefling Aug 29, 2024
2acdb7b
more glyph configs
MuteTiefling Aug 29, 2024
138b66d
quest
MuteTiefling Aug 29, 2024
dc19cbe
quest
MuteTiefling Aug 29, 2024
533a6fc
quests
MuteTiefling Aug 29, 2024
678f826
This is breaking Ars Nouveau book updates
MuteTiefling Aug 30, 2024
9511e06
quests and tags and structures
MuteTiefling Aug 30, 2024
c5ec191
revert world interactions move. it wasn't working
MuteTiefling Aug 30, 2024
2d6ece3
Update world_interactions.js
MuteTiefling Aug 30, 2024
48f50d0
quests
MuteTiefling Aug 30, 2024
5f6f32d
trades
MuteTiefling Aug 30, 2024
c0fc550
quests
MuteTiefling Aug 30, 2024
a4711ad
quests!
MuteTiefling Aug 30, 2024
2f9594a
loot
MuteTiefling Aug 30, 2024
97ad777
interactions
MuteTiefling Aug 30, 2024
2641947
Update world_interactions.js
MuteTiefling Aug 30, 2024
781ac05
evilcraft quest outline
MuteTiefling Aug 31, 2024
d2949ec
quests, enchants
MuteTiefling Aug 31, 2024
c992ae8
dark ore miner, more quests
MuteTiefling Aug 31, 2024
c0c9183
config updates, quests, and documentation
MuteTiefling Aug 31, 2024
f57c120
loot start
MuteTiefling Aug 31, 2024
4978b05
Update evilcraft-common.toml
MuteTiefling Aug 31, 2024
0b25af9
loots
MuteTiefling Aug 31, 2024
bec1905
loot, spawner blacklist
MuteTiefling Aug 31, 2024
758f5fb
Update evilcraft-common.toml
MuteTiefling Aug 31, 2024
b801fbe
unhide evilcraft quests
MuteTiefling Sep 1, 2024
ae272bc
Update evilcraft.snbt
MuteTiefling Sep 1, 2024
8153275
Merge remote-tracking branch 'upstream/develop' into ars-quests
MuteTiefling Sep 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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
- Queen Bee loves music and will share her treasures for sick beats! [\#97](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/97)
- More Wandering Trader trades! [\#97](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/97)
- More Amadron trades! [\#97](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/97)
- New batch craft recipes for essences [\#101](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/101)

#### 🦟 Bugs Fixed

Expand Down
88 changes: 44 additions & 44 deletions config/ars_additions-server.toml
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
#Ritual of Arcane Permanence
[chunkloading]
#Should the ritual cost source?
has_cost = true
#Should the ritual cost be continuous?
repeat_cost = true
#How much source should it cost to run the ritual?
#Range: 1 ~ 10000
cost = 10000
#How often should the ritual cost source? (in ticks, defaults to 1 in-game day)
#Range: > 1
interval = 24000
#How far should the ritual chunk-load? (in chunks, 0 = 1x1, 1 = 3x3, 2 = 5x5, 3 = 7x7, 4 = 9x9)
#Range: > 0
initial_radius = 0
#Should the radius be able to be increased with an item?
radius_incremental = false
#What item is required to increase the chunk-loading radius?
radius_increment_item = "ars_nouveau:source_gem_block"
#What's the maximum amount of augmented increases the ritual should accept?
#Range: > 1
radius_increment_max = 1
#Should the ritual require the player who started it to be online?
require_online = true
#How many rituals should players be able to run?
#Range: > 1
max_rituals = 2147483647
#Should the server log when a chunk is loaded/unloaded?
log_chunkloading = false
#Reliquary
[mark_and_recall]
#How much durability should targeting a player with Recall cost?
#Range: 0 ~ 1000
cost_player = 1000
#How much durability should targeting an entity with Recall cost?
#Range: 0 ~ 1000
cost_entity = 250
#How much durability should targeting a location with Recall cost?
#Range: 0 ~ 1000
cost_location = 50
#How long should the Marked effect last (in seconds) when Mark is cast on a player?
#Range: 0 ~ 900
effect_duration = 300
#Ritual of Arcane Permanence
[chunkloading]
#Should the ritual cost source?
has_cost = true
#Should the ritual cost be continuous?
repeat_cost = true
#How much source should it cost to run the ritual?
#Range: 1 ~ 10000
cost = 10000
#How often should the ritual cost source? (in ticks, defaults to 1 in-game day)
#Range: > 1
interval = 24000
#How far should the ritual chunk-load? (in chunks, 0 = 1x1, 1 = 3x3, 2 = 5x5, 3 = 7x7, 4 = 9x9)
#Range: > 0
initial_radius = 0
#Should the radius be able to be increased with an item?
radius_incremental = false
#What item is required to increase the chunk-loading radius?
radius_increment_item = "ars_nouveau:source_gem_block"
#What's the maximum amount of augmented increases the ritual should accept?
#Range: > 1
radius_increment_max = 1
#Should the ritual require the player who started it to be online?
require_online = true
#How many rituals should players be able to run?
#Range: > 1
max_rituals = 2147483647
#Should the server log when a chunk is loaded/unloaded?
log_chunkloading = false

#Reliquary
[mark_and_recall]
#How much durability should targeting a player with Recall cost?
#Range: 0 ~ 1000
cost_player = 1000
#How much durability should targeting an entity with Recall cost?
#Range: 0 ~ 1000
cost_entity = 250
#How much durability should targeting a location with Recall cost?
#Range: 0 ~ 1000
cost_location = 50
#How long should the Marked effect last (in seconds) when Mark is cast on a player?
#Range: 0 ~ 900
effect_duration = 300
48 changes: 24 additions & 24 deletions config/ars_additions/glyph_mark.toml
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
#General settings
[general]
#Is Enabled?
enabled = true
#Cost
#Range: > -2147483648
cost = 25
#Is Starter Glyph?
starter = false
#The maximum number of times this glyph may appear in a single spell
#Range: 1 ~ 1
per_spell_limit = 1
#The tier of the glyph
#Range: 1 ~ 99
glyph_tier = 3
#Limits the number of times a given augment may be applied to a given effect
#Example entry: "glyph_amplify=5"
augment_limits = []
#How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config.
#Example entry: "glyph_amplify=50"
augment_cost_overrides = []
#Prevents the given glyph from being used in the same spell as the given glyph
#Example entry: "glyph_burst"
invalid_combos = []
#General settings
[general]
#Is Enabled?
enabled = true
#Cost
#Range: > -2147483648
cost = 25
#Is Starter Glyph?
starter = false
#The maximum number of times this glyph may appear in a single spell
#Range: 1 ~ 1
per_spell_limit = 1
#The tier of the glyph
#Range: 1 ~ 99
glyph_tier = 3
#Limits the number of times a given augment may be applied to a given effect
#Example entry: "glyph_amplify=5"
augment_limits = []
#How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config.
#Example entry: "glyph_amplify=50"
augment_cost_overrides = []
#Prevents the given glyph from being used in the same spell as the given glyph
#Example entry: "glyph_burst"
invalid_combos = []
42 changes: 21 additions & 21 deletions config/ars_additions/glyph_recall.toml
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
#General settings
[general]
#Is Enabled?
enabled = true
#Cost
#Range: > -2147483648
cost = 50
#Is Starter Glyph?
starter = false
#The maximum number of times this glyph may appear in a single spell
#Range: > 1
per_spell_limit = 2147483647
#The tier of the glyph
#Range: 1 ~ 99
glyph_tier = 3
#Limits the number of times a given augment may be applied to a given effect
#Example entry: "glyph_amplify=5"
augment_limits = []
#How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config.
#Example entry: "glyph_amplify=50"
augment_cost_overrides = []
#General settings
[general]
#Is Enabled?
enabled = true
#Cost
#Range: > -2147483648
cost = 50
#Is Starter Glyph?
starter = false
#The maximum number of times this glyph may appear in a single spell
#Range: > 1
per_spell_limit = 2147483647
#The tier of the glyph
#Range: 1 ~ 99
glyph_tier = 3
#Limits the number of times a given augment may be applied to a given effect
#Example entry: "glyph_amplify=5"
augment_limits = []
#How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config.
#Example entry: "glyph_amplify=50"
augment_cost_overrides = []
42 changes: 21 additions & 21 deletions config/ars_additions/glyph_retaliate.toml
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
#General settings
[general]
#Is Enabled?
enabled = true
#Cost
#Range: > -2147483648
cost = 25
#Is Starter Glyph?
starter = false
#The maximum number of times this glyph may appear in a single spell
#Range: > 1
per_spell_limit = 2147483647
#The tier of the glyph
#Range: 1 ~ 99
glyph_tier = 3
#Limits the number of times a given augment may be applied to a given effect
#Example entry: "glyph_amplify=5"
augment_limits = []
#How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config.
#Example entry: "glyph_amplify=50"
augment_cost_overrides = []
#General settings
[general]
#Is Enabled?
enabled = true
#Cost
#Range: > -2147483648
cost = 25
#Is Starter Glyph?
starter = false
#The maximum number of times this glyph may appear in a single spell
#Range: > 1
per_spell_limit = 2147483647
#The tier of the glyph
#Range: 1 ~ 99
glyph_tier = 3
#Limits the number of times a given augment may be applied to a given effect
#Example entry: "glyph_amplify=5"
augment_limits = []
#How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config.
#Example entry: "glyph_amplify=50"
augment_cost_overrides = []
48 changes: 24 additions & 24 deletions config/ars_elemental/glyph_nullify_defense.toml
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
#General settings
[general]
#Is Enabled?
enabled = false
#Cost
#Range: > -2147483648
cost = 1000
#Is Starter Glyph?
starter = false
#The maximum number of times this glyph may appear in a single spell
#Range: > 1
per_spell_limit = 2147483647
#The tier of the glyph
#Range: 1 ~ 99
glyph_tier = 3
#Limits the number of times a given augment may be applied to a given effect
#Example entry: "glyph_amplify=5"
augment_limits = []
#How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config.
#Example entry: "glyph_amplify=50"
augment_cost_overrides = []
#Prevents the given glyph from being used in the same spell as the given glyph
#Example entry: "glyph_burst"
invalid_combos = []
#General settings
[general]
#Is Enabled?
enabled = false
#Cost
#Range: > -2147483648
cost = 1000
#Is Starter Glyph?
starter = false
#The maximum number of times this glyph may appear in a single spell
#Range: > 1
per_spell_limit = 2147483647
#The tier of the glyph
#Range: 1 ~ 99
glyph_tier = 3
#Limits the number of times a given augment may be applied to a given effect
#Example entry: "glyph_amplify=5"
augment_limits = []
#How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config.
#Example entry: "glyph_amplify=50"
augment_cost_overrides = []
#Prevents the given glyph from being used in the same spell as the given glyph
#Example entry: "glyph_burst"
invalid_combos = []
15 changes: 0 additions & 15 deletions config/ars_nouveau/glyph_accelerate

This file was deleted.

15 changes: 0 additions & 15 deletions config/ars_nouveau/glyph_amplify

This file was deleted.

30 changes: 0 additions & 30 deletions config/ars_nouveau/glyph_animate_block

This file was deleted.

15 changes: 0 additions & 15 deletions config/ars_nouveau/glyph_aoe

This file was deleted.

29 changes: 0 additions & 29 deletions config/ars_nouveau/glyph_blink

This file was deleted.

Loading