diff --git a/src/main/resources/assets/ebwizardry/sounds.json b/src/main/resources/assets/ebwizardry/sounds.json index 9ed093b0..ce50a30b 100644 --- a/src/main/resources/assets/ebwizardry/sounds.json +++ b/src/main/resources/assets/ebwizardry/sounds.json @@ -7,7 +7,7 @@ "item.wand.levelup": {"category": "player", "sounds": ["random/levelup"]}, "item.wand.melee": {"category": "player", "sounds": ["ebwizardry:effect1", "ebwizardry:effect2"]}, "item.armour.equip_silk": {"category": "player", "sounds": ["item/armor/equip_leather1", "item/armor/equip_leather2", "item/armor/equip_leather3", "item/armor/equip_leather4", "item/armor/equip_leather5", "item/armor/equip_leather6"]}, - "item.purifying_elixir.drink": {"category": "player", "sounds": ["ebwizardry:spellbind"]}, + "item.purifying_elixir.drink": {"category": "player", "sounds": ["ebwizardry:buff_large"]}, "entity.black_hole.ambient": {"category": "spells", "sounds": ["portal/portal"]}, "entity.black_hole.vanish": {"category": "spells", "sounds": ["portal/trigger"]}, @@ -158,8 +158,8 @@ "spell.flaming_axe": {"category": "spells", "sounds": ["ebwizardry:buff"]}, "spell.flaming_weapon": {"category": "spells", "sounds": ["ebwizardry:buff"]}, "spell.flight": {"category": "spells", "sounds": ["mob/enderdragon/wings1", "mob/enderdragon/wings2", "mob/enderdragon/wings3", "mob/enderdragon/wings4", "mob/enderdragon/wings5", "mob/enderdragon/wings6"]}, - "spell.font_of_mana": {"category": "spells", "sounds": ["ebwizardry:spellbind"]}, - "spell.font_of_vitality": {"category": "spells", "sounds": ["ebwizardry:spellbind"]}, + "spell.font_of_mana": {"category": "spells", "sounds": ["ebwizardry:buff_large"]}, + "spell.font_of_vitality": {"category": "spells", "sounds": ["ebwizardry:buff_large"]}, "spell.force_arrow": {"category": "spells", "sounds": ["ebwizardry:force"]}, "spell.forcefield": {"category": "spells", "sounds": ["ebwizardry:conjure_large"]}, "spell.force_orb": {"category": "spells", "sounds": ["random/bow"]}, @@ -179,11 +179,11 @@ "spell.grapple.pull": {"category": "spells", "sounds": ["ebwizardry:pull1", "ebwizardry:pull2"]}, "spell.grapple.release": {"category": "spells", "sounds": ["random/bowhit1", "random/bowhit2", "random/bowhit3"]}, "spell.greater_fireball": {"category": "spells", "sounds": ["mob/ghast/fireball4"]}, - "spell.greater_heal": {"category": "spells", "sounds": ["ebwizardry:spellbind"]}, + "spell.greater_heal": {"category": "spells", "sounds": ["ebwizardry:buff_large"]}, "spell.greater_telekinesis.start": {"category": "spells", "sounds": ["ebwizardry:aura_start"]}, "spell.greater_telekinesis.loop": {"category": "spells", "sounds": ["ebwizardry:aura_loop"]}, "spell.greater_telekinesis.end": {"category": "spells", "sounds": ["ebwizardry:aura_end"]}, - "spell.greater_ward": {"category": "spells", "sounds": ["ebwizardry:spellbind"]}, + "spell.greater_ward": {"category": "spells", "sounds": ["ebwizardry:buff_large"]}, "spell.group_heal": {"category": "spells", "sounds": ["ebwizardry:heal"]}, "spell.growth_aura": {"category": "spells", "sounds": ["ebwizardry:conjure_large"]}, "spell.hailstorm": {"category": "spells", "sounds": ["mob/illusion_illager/prepare_blind"]}, @@ -250,12 +250,12 @@ "spell.ray_of_purification.start": {"category": "spells", "sounds": ["ebwizardry:aura_start"]}, "spell.ray_of_purification.loop": {"category": "spells", "sounds": ["ebwizardry:aura_loop"]}, "spell.ray_of_purification.end": {"category": "spells", "sounds": ["ebwizardry:aura_end"]}, - "spell.remove_curse": {"category": "spells", "sounds": ["ebwizardry:spellbind"]}, + "spell.remove_curse": {"category": "spells", "sounds": ["ebwizardry:buff_large"]}, "spell.replenish_hunger": {"category": "spells", "sounds": ["ebwizardry:heal"]}, - "spell.resurrection": {"category": "spells", "sounds": ["ebwizardry:spellbind"]}, + "spell.resurrection": {"category": "spells", "sounds": ["ebwizardry:buff_large"]}, "spell.reversal": {"category": "spells", "sounds": ["mob/wither/hurt1", "mob/wither/hurt2", "mob/wither/hurt3", "mob/wither/hurt4"]}, "spell.ring_of_fire": {"category": "spells", "sounds": ["mob/ghast/fireball4"]}, - "spell.satiety": {"category": "spells", "sounds": ["ebwizardry:spellbind"]}, + "spell.satiety": {"category": "spells", "sounds": ["ebwizardry:buff_large"]}, "spell.shadow_ward.start": {"category": "spells", "sounds": ["ebwizardry:dark_aura_start"]}, "spell.shadow_ward.loop": {"category": "spells", "sounds": ["ebwizardry:dark_aura_loop"]}, "spell.shadow_ward.end": {"category": "spells", "sounds": ["ebwizardry:dark_aura_end"]}, diff --git a/src/main/resources/assets/ebwizardry/sounds/arc1.ogg b/src/main/resources/assets/ebwizardry/sounds/arc1.ogg index f5d3c72f..83f70350 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/arc1.ogg and b/src/main/resources/assets/ebwizardry/sounds/arc1.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/arc2.ogg b/src/main/resources/assets/ebwizardry/sounds/arc2.ogg index 53a04e5d..380bf733 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/arc2.ogg and b/src/main/resources/assets/ebwizardry/sounds/arc2.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/arc3.ogg b/src/main/resources/assets/ebwizardry/sounds/arc3.ogg index b2ee55d9..4ff58041 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/arc3.ogg and b/src/main/resources/assets/ebwizardry/sounds/arc3.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/aura_end.ogg b/src/main/resources/assets/ebwizardry/sounds/aura_end.ogg index 89170073..c8c25c91 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/aura_end.ogg and b/src/main/resources/assets/ebwizardry/sounds/aura_end.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/aura_loop.ogg b/src/main/resources/assets/ebwizardry/sounds/aura_loop.ogg index 616ed77c..5d6d3b3e 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/aura_loop.ogg and b/src/main/resources/assets/ebwizardry/sounds/aura_loop.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/aura_start.ogg b/src/main/resources/assets/ebwizardry/sounds/aura_start.ogg index 1736c3bb..385d9b72 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/aura_start.ogg and b/src/main/resources/assets/ebwizardry/sounds/aura_start.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/buff.ogg b/src/main/resources/assets/ebwizardry/sounds/buff.ogg index 4ac23bd7..d65e74c8 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/buff.ogg and b/src/main/resources/assets/ebwizardry/sounds/buff.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/buff_large.ogg b/src/main/resources/assets/ebwizardry/sounds/buff_large.ogg new file mode 100644 index 00000000..5fd15705 Binary files /dev/null and b/src/main/resources/assets/ebwizardry/sounds/buff_large.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/conjure.ogg b/src/main/resources/assets/ebwizardry/sounds/conjure.ogg index d48bdffc..14bae7a8 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/conjure.ogg and b/src/main/resources/assets/ebwizardry/sounds/conjure.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/conjure_large.ogg b/src/main/resources/assets/ebwizardry/sounds/conjure_large.ogg index c9caa43f..7a2e02da 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/conjure_large.ogg and b/src/main/resources/assets/ebwizardry/sounds/conjure_large.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/crackle.ogg b/src/main/resources/assets/ebwizardry/sounds/crackle.ogg index cc81620e..44a499bf 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/crackle.ogg and b/src/main/resources/assets/ebwizardry/sounds/crackle.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/dark_aura_end.ogg b/src/main/resources/assets/ebwizardry/sounds/dark_aura_end.ogg index 3e3093c1..5f0a204e 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/dark_aura_end.ogg and b/src/main/resources/assets/ebwizardry/sounds/dark_aura_end.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/dark_aura_loop.ogg b/src/main/resources/assets/ebwizardry/sounds/dark_aura_loop.ogg index 2268fe1d..9b9e5ed8 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/dark_aura_loop.ogg and b/src/main/resources/assets/ebwizardry/sounds/dark_aura_loop.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/dark_aura_start.ogg b/src/main/resources/assets/ebwizardry/sounds/dark_aura_start.ogg index 04fd8be5..dd134c6e 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/dark_aura_start.ogg and b/src/main/resources/assets/ebwizardry/sounds/dark_aura_start.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/effect1.ogg b/src/main/resources/assets/ebwizardry/sounds/effect1.ogg index dc9a4760..8dab3fcf 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/effect1.ogg and b/src/main/resources/assets/ebwizardry/sounds/effect1.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/effect2.ogg b/src/main/resources/assets/ebwizardry/sounds/effect2.ogg index c2c9a62d..f428ae96 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/effect2.ogg and b/src/main/resources/assets/ebwizardry/sounds/effect2.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/firebolt.ogg b/src/main/resources/assets/ebwizardry/sounds/firebolt.ogg index 84babd4e..2fb6c994 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/firebolt.ogg and b/src/main/resources/assets/ebwizardry/sounds/firebolt.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/flames_end.ogg b/src/main/resources/assets/ebwizardry/sounds/flames_end.ogg index b3488b59..1b50d105 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/flames_end.ogg and b/src/main/resources/assets/ebwizardry/sounds/flames_end.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/flames_loop.ogg b/src/main/resources/assets/ebwizardry/sounds/flames_loop.ogg index 634727f6..acf52a10 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/flames_loop.ogg and b/src/main/resources/assets/ebwizardry/sounds/flames_loop.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/flames_start.ogg b/src/main/resources/assets/ebwizardry/sounds/flames_start.ogg index 40108d2c..326400f4 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/flames_start.ogg and b/src/main/resources/assets/ebwizardry/sounds/flames_start.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/force.ogg b/src/main/resources/assets/ebwizardry/sounds/force.ogg index 0da336b2..e62e7deb 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/force.ogg and b/src/main/resources/assets/ebwizardry/sounds/force.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/freeze.ogg b/src/main/resources/assets/ebwizardry/sounds/freeze.ogg index 014dc1e4..bfe80996 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/freeze.ogg and b/src/main/resources/assets/ebwizardry/sounds/freeze.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/frostray.ogg b/src/main/resources/assets/ebwizardry/sounds/frostray.ogg index 0567212e..4117e4e6 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/frostray.ogg and b/src/main/resources/assets/ebwizardry/sounds/frostray.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/grow.ogg b/src/main/resources/assets/ebwizardry/sounds/grow.ogg index bf48758b..5fd63112 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/grow.ogg and b/src/main/resources/assets/ebwizardry/sounds/grow.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/heal.ogg b/src/main/resources/assets/ebwizardry/sounds/heal.ogg index a58b11f6..bb6a6705 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/heal.ogg and b/src/main/resources/assets/ebwizardry/sounds/heal.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/ice.ogg b/src/main/resources/assets/ebwizardry/sounds/ice.ogg index 9879c888..0f0a8f4c 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/ice.ogg and b/src/main/resources/assets/ebwizardry/sounds/ice.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/lightning_ray_end.ogg b/src/main/resources/assets/ebwizardry/sounds/lightning_ray_end.ogg index b8eb148c..6b98488b 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/lightning_ray_end.ogg and b/src/main/resources/assets/ebwizardry/sounds/lightning_ray_end.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/lightning_ray_loop.ogg b/src/main/resources/assets/ebwizardry/sounds/lightning_ray_loop.ogg index 041658ec..732d522d 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/lightning_ray_loop.ogg and b/src/main/resources/assets/ebwizardry/sounds/lightning_ray_loop.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/lightning_ray_start.ogg b/src/main/resources/assets/ebwizardry/sounds/lightning_ray_start.ogg index 898bb0b3..3edda40e 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/lightning_ray_start.ogg and b/src/main/resources/assets/ebwizardry/sounds/lightning_ray_start.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/magic1.ogg b/src/main/resources/assets/ebwizardry/sounds/magic1.ogg index 94b13b16..65f745cc 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/magic1.ogg and b/src/main/resources/assets/ebwizardry/sounds/magic1.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/magic2.ogg b/src/main/resources/assets/ebwizardry/sounds/magic2.ogg index cf4f5a79..8f51fb1b 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/magic2.ogg and b/src/main/resources/assets/ebwizardry/sounds/magic2.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/magic3.ogg b/src/main/resources/assets/ebwizardry/sounds/magic3.ogg index f65f2ad4..a8048bae 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/magic3.ogg and b/src/main/resources/assets/ebwizardry/sounds/magic3.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/magic4.ogg b/src/main/resources/assets/ebwizardry/sounds/magic4.ogg index 1793567a..ff88573a 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/magic4.ogg and b/src/main/resources/assets/ebwizardry/sounds/magic4.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/pull1.ogg b/src/main/resources/assets/ebwizardry/sounds/pull1.ogg index 4ce3730c..a6c453b9 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/pull1.ogg and b/src/main/resources/assets/ebwizardry/sounds/pull1.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/pull2.ogg b/src/main/resources/assets/ebwizardry/sounds/pull2.ogg index 737809f4..3e87e9ca 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/pull2.ogg and b/src/main/resources/assets/ebwizardry/sounds/pull2.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/rumble.ogg b/src/main/resources/assets/ebwizardry/sounds/rumble.ogg index b9d208b1..a8318bb6 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/rumble.ogg and b/src/main/resources/assets/ebwizardry/sounds/rumble.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/shockwave.ogg b/src/main/resources/assets/ebwizardry/sounds/shockwave.ogg index 3af866c0..059f8f30 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/shockwave.ogg and b/src/main/resources/assets/ebwizardry/sounds/shockwave.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/small_aura_end.ogg b/src/main/resources/assets/ebwizardry/sounds/small_aura_end.ogg index 9010c3d5..f94d6ed5 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/small_aura_end.ogg and b/src/main/resources/assets/ebwizardry/sounds/small_aura_end.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/small_aura_loop.ogg b/src/main/resources/assets/ebwizardry/sounds/small_aura_loop.ogg index 77c76ac2..a81f8dd9 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/small_aura_loop.ogg and b/src/main/resources/assets/ebwizardry/sounds/small_aura_loop.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/small_aura_start.ogg b/src/main/resources/assets/ebwizardry/sounds/small_aura_start.ogg index 9004f213..5421bdff 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/small_aura_start.ogg and b/src/main/resources/assets/ebwizardry/sounds/small_aura_start.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/sparkle.ogg b/src/main/resources/assets/ebwizardry/sounds/sparkle.ogg index e6899fee..f7e169d1 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/sparkle.ogg and b/src/main/resources/assets/ebwizardry/sounds/sparkle.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/summon1.ogg b/src/main/resources/assets/ebwizardry/sounds/summon1.ogg index 81b556fd..34b51215 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/summon1.ogg and b/src/main/resources/assets/ebwizardry/sounds/summon1.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/summon2.ogg b/src/main/resources/assets/ebwizardry/sounds/summon2.ogg index df471a0d..f9624fbe 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/summon2.ogg and b/src/main/resources/assets/ebwizardry/sounds/summon2.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/wind.ogg b/src/main/resources/assets/ebwizardry/sounds/wind.ogg index 1b824691..50170537 100644 Binary files a/src/main/resources/assets/ebwizardry/sounds/wind.ogg and b/src/main/resources/assets/ebwizardry/sounds/wind.ogg differ