From 951be4e1604134f79b3100dd291a541bc569c442 Mon Sep 17 00:00:00 2001 From: iron431 <34083081+iron431@users.noreply.github.com> Date: Sat, 28 Oct 2023 17:56:45 -0500 Subject: [PATCH] reduce earthquake and black hole effects at ridiculous power --- LATEST_CHANGES.MD | 23 ++++--------------- .../entity/spells/EarthquakeAoe.java | 2 +- .../spells/void_school/BlackHoleSpell.java | 2 +- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/LATEST_CHANGES.MD b/LATEST_CHANGES.MD index 6d11de5d2..e9d6f8449 100644 --- a/LATEST_CHANGES.MD +++ b/LATEST_CHANGES.MD @@ -1,24 +1,11 @@ ### Additions -- Added Mana Regen attribute -- Added the Amethyst Resonance Charm, a craftable necklace that gives +15% mana regeneration +- ### Changes -- Buff Magic Arrow's base damage by 5 -- Add CastSource to SpellCastEvent for developers -- Rework Priest Armor Texture, courtesy of Crydigo -- Tweak most jewelry textures -- Any armor can now be upgraded instead of only mage armor (can_be_upgraded tag has been removed) -- Spectral Hammer debris reduced - +- Black Hole radius scales less significantly with spell power +- ### Fixes -- Fixed inconsistent Magic Arrow block penetration -- Fixed the two-handed sword models when using left hand mode -- Mobs can no longer detect your armor when affected by True Invisibility -- Fixed geckolib armor anchor points causing misaligned armor models when the player is animating -- Fixed JEI recipe autocomplete exploit -- Fixed Raise Dead spell not being able to find suitable ground locations at y < 0 +- ### API -- Added InscribeSpellEvent, courtesy of Silvertide7 -- Added ChangeManaEvent -- Added SpellDamageEvent \ No newline at end of file +- \ No newline at end of file diff --git a/src/main/java/io/redspace/ironsspellbooks/entity/spells/EarthquakeAoe.java b/src/main/java/io/redspace/ironsspellbooks/entity/spells/EarthquakeAoe.java index 51d04e19d..81f540442 100644 --- a/src/main/java/io/redspace/ironsspellbooks/entity/spells/EarthquakeAoe.java +++ b/src/main/java/io/redspace/ironsspellbooks/entity/spells/EarthquakeAoe.java @@ -98,7 +98,7 @@ public void tick() { if (!level.isClientSide) { var radius = this.getRadius(); var level = this.level; - int intensity = (int) (radius * radius * .09f); + int intensity = Math.min((int) (radius * radius * .09f), 15); for (int i = 0; i < intensity; i++) { Vec3 vec3 = this.position().add(uniformlyDistributedPointInRadius(radius)); BlockPos blockPos = new BlockPos(Utils.moveToRelativeGroundLevel(level, vec3, 4)).below(); diff --git a/src/main/java/io/redspace/ironsspellbooks/spells/void_school/BlackHoleSpell.java b/src/main/java/io/redspace/ironsspellbooks/spells/void_school/BlackHoleSpell.java index ad3a85de3..6298ba869 100644 --- a/src/main/java/io/redspace/ironsspellbooks/spells/void_school/BlackHoleSpell.java +++ b/src/main/java/io/redspace/ironsspellbooks/spells/void_school/BlackHoleSpell.java @@ -104,7 +104,7 @@ private float getDamage(int spellLevel, LivingEntity entity) { } private float getRadius(int spellLevel, LivingEntity entity) { - return (2 * getLevel(spellLevel, entity) + 4) * getSpellPower(spellLevel, entity); + return (2 * getLevel(spellLevel, entity) + 4) * (1 + .125f * getSpellPower(spellLevel, entity)); } @Override