Skip to content

Commit

Permalink
Merge pull request #470 from MuteTiefling/e9e-tweaking
Browse files Browse the repository at this point in the history 
E9E Feedback tweaks
  • Loading branch information
@MuteTiefling
MuteTiefling authored Jul 8, 2023
2 parents ba0b8bb + 25e8288 commit d04c737
Show file tree
Hide file tree
Showing 4 changed files with 121 additions and 11 deletions.
8 changes: 7 additions & 1 deletion kubejs/assets/kubejs/lang/en_us.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -618,5 +618,11 @@
"ritual.enigmatica.occultism/ritual/wild_hunt_gate.started": "Started Summoning the Wild Hunt",
"ritual.enigmatica.occultism/ritual/wild_hunt_gate.finished": "The Wild Hunt gateway has opened",
"ritual.enigmatica.occultism/ritual/wild_hunt_gate.interrupted": "The Wild Hunt gateway has been interrupted",
"ritual.enigmatica.occultism/ritual/wild_hunt_gate.conditions": "Not all requirements for this ritual are met."
"ritual.enigmatica.occultism/ritual/wild_hunt_gate.conditions": "Not all requirements for this ritual are met.",

"gateways.possessed_skeleton_gate": "Possessed Skeleton Gate",
"ritual.enigmatica.occultism/ritual/possessed_skeleton_gate.started": "Started Summoning Possessed Skeletons",
"ritual.enigmatica.occultism/ritual/possessed_skeleton_gate.finished": "The Possessed Skeleton gateway has opened",
"ritual.enigmatica.occultism/ritual/possessed_skeleton_gate.interrupted": "The Possessed Skeleton gateway has been interrupted",
"ritual.enigmatica.occultism/ritual/possessed_skeleton_gate.conditions": "Not all requirements for this ritual are met."
}
2 changes: 1 addition & 1 deletion kubejs/server_scripts/base/recipes/apotheosis/minibosses/occultism.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ ServerEvents.highPriorityData((event) => {
weight: 100,
quality: 0,
entities: ['occultism:possessed_skeleton'],
valid_gear_sets: ['#miniboss/skeleton_bow'],
valid_gear_sets: ['#miniboss/skeleton_bow', '#miniboss/skeleton_forsaken_knight'],
dimensions: [],
affixed: false,
nbt: {},
Expand Down
110 changes: 107 additions & 3 deletions kubejs/server_scripts/base/recipes/gateways/gateways.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ ServerEvents.highPriorityData((event) => {
{
size: 'large',
color: '#b30f04',
leash_range: 32,
leash_range: 256,
allow_discarding: true,
rewards: [
{
Expand Down Expand Up @@ -346,7 +346,7 @@ ServerEvents.highPriorityData((event) => {
{
size: 'large',
color: '#554a57',
leash_range: 32,
leash_range: 256,
rewards: [
{
type: 'stack',
Expand Down Expand Up @@ -446,6 +446,110 @@ ServerEvents.highPriorityData((event) => {
}
],
id: 'wild_hunt_gate'
},
{
size: 'large',
color: '#D3D3D3',
leash_range: 256,
rewards: [
{
type: 'stack',
stack: Item.of('kubejs:aura_leaf', '{aura_amount:20000.0d,aura_max:1500000.0d}')
},
{
type: 'apotheosis:affix',
rarity: 'rare'
},
{
type: 'loot_table',
loot_table: 'enigmatica:apotheosis_gem_cache',
rolls: 5,
desc: 'Apotheosis Gems'
}
],
completion_xp: 5000,
spawn_range: 3,
waves: [
{
entities: [
{ entity: 'occultism:possessed_skeleton' },
{ entity: 'occultism:possessed_skeleton' },
{ entity: 'occultism:possessed_skeleton' }
],
rewards: [
{
type: 'stack',
stack: Item.of('kubejs:aura_leaf', '{aura_amount:20000.0d,aura_max:1500000.0d}')
}
],
max_wave_time: 2400,
setup_time: 50
},
{
entities: [
{ entity: 'occultism:possessed_skeleton' },
{ entity: 'occultism:possessed_skeleton' },
{ entity: 'occultism:possessed_skeleton' },
{ entity: 'occultism:possessed_skeleton' },
{ entity: 'occultism:possessed_skeleton' },
{ entity: 'occultism:possessed_skeleton' }
],
rewards: [
{
type: 'stack',
stack: Item.of('kubejs:aura_leaf', '{aura_amount:20000.0d,aura_max:1500000.0d}')
}
],
max_wave_time: 2400,
setup_time: 50
},
{
entities: [
{ entity: 'occultism:possessed_skeleton' },
{ entity: 'occultism:possessed_skeleton' },
{ entity: 'occultism:possessed_skeleton' },
{ entity: 'occultism:possessed_skeleton' },
{ entity: 'occultism:possessed_skeleton' },
{ entity: 'occultism:possessed_skeleton' },
{ entity: 'occultism:possessed_skeleton' },
{ entity: 'occultism:possessed_skeleton' },
{ entity: 'occultism:possessed_skeleton' }
],
rewards: [
{
type: 'stack',
stack: Item.of('kubejs:aura_leaf', '{aura_amount:20000.0d,aura_max:1500000.0d}')
}
],
max_wave_time: 2400,
setup_time: 50
},
{
entities: [
{ entity: 'occultism:possessed_skeleton' },
{ entity: 'occultism:possessed_skeleton' },
{ entity: 'occultism:possessed_skeleton' },
{ entity: 'occultism:possessed_skeleton' },
{ entity: 'occultism:possessed_skeleton' },
{ entity: 'occultism:possessed_skeleton' },
{ entity: 'occultism:possessed_skeleton' },
{ entity: 'occultism:possessed_skeleton' },
{ entity: 'occultism:possessed_skeleton' },
{ entity: 'occultism:possessed_skeleton' },
{ entity: 'occultism:possessed_skeleton' },
{ entity: 'occultism:possessed_skeleton' }
],
rewards: [
{
type: 'stack',
stack: Item.of('kubejs:aura_leaf', '{aura_amount:20000.0d,aura_max:1500000.0d}')
}
],
max_wave_time: 2400,
setup_time: 50
}
],
id: 'possessed_skeleton_gate'
}
];

Expand Down Expand Up @@ -646,7 +750,7 @@ ServerEvents.highPriorityData((event) => {
let recipe = {
size: size,
color: gateway.color,
leash_range: 64,
leash_range: 256,
waves: [],
completion_xp: completion_xp,
rewards: [primary_reward],
Expand Down
12 changes: 6 additions & 6 deletions kubejs/server_scripts/expert/recipes/occultism/ritual.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1203,17 +1203,17 @@ ServerEvents.recipes((event) => {
id: `occultism:ritual/possess_enderman`
},
{
output: Item.of('minecraft:skeleton_skull', {
output: Item.of('gateways:gate_pearl', `{gateway:"gateways:possessed_skeleton_gate", radius:5}`),
activation_item: 'byg:hanging_bones',
inputs: ['#forge:essences/anima', 'minecraft:bone_meal', 'minecraft:bone_meal', 'minecraft:bone_meal'],
entity_to_summon: 'occultism:possessed_skeleton',
entity_to_sacrifice: { tag: 'enigmatica:deer', display_name: 'ritual.occultism.sacrifice.deer' },
ritual_dummy: Item.of('minecraft:skeleton_skull', {
display: {
Name: '{"translate":"item.occultism.ritual_dummy.possess_skeleton"}',
Lore: ['{"translate":"item.occultism.ritual_dummy.possess_skeleton.tooltip"}']
}
}),
activation_item: 'byg:hanging_bones',
inputs: ['#forge:essences/anima', 'minecraft:bone_meal', 'minecraft:bone_meal', 'minecraft:bone_meal'],
entity_to_summon: 'occultism:possessed_skeleton',
entity_to_sacrifice: { tag: 'enigmatica:deer', display_name: 'ritual.occultism.sacrifice.deer' },
ritual_dummy: 'occultism:ritual_dummy/possess_skeleton',
ritual_type: 'occultism:summon',
pentacle_id: 'occultism:summon_lesser_evil',
duration: 10,
Expand Down

0 comments on commit d04c737

Please sign in to comment.