fix 0 spell cost bug (mana attunement)

Author: dphaldes

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 
-## [0.3.0] - Unreleased
+## [0.3.1] - 2023-10-30
+
+### Changed
+
+- Removed the experience reduction of Heretic's Armor which caused upgrade tomes to be buggy
+- Changed Mana Attunement discount calculation to fix 0 spell cost due to integer conversion
+
+## [0.3.0] - 2023-10-28
 
 Configs have changed. It is recommended to delete the old `tomeofblood` config and let it regenerate.
 

README.md

@@ -24,4 +24,8 @@ For a full overview, check the `Tome of Blood` section of the Worn Notebook (Ars
 
 ### License
 
-- All the code in this repository is under **LGPLv3 License**.
+- All the code in this repository is under **LGPLv3 License**.
+
+#### Notes:
+
+A part of the assets are made by Gronglegrowth and are under CC BY 4.0 License.

src/main/java/com/mystchonky/tomeofblood/common/events/EventHandler.java

@@ -6,18 +6,14 @@
 import com.hollingsworth.arsnouveau.api.spell.SpellContext;
 import com.mystchonky.tomeofblood.TomeOfBlood;
 import com.mystchonky.tomeofblood.client.ClientInfo;
-import com.mystchonky.tomeofblood.common.config.BaseConfig;
-import com.mystchonky.tomeofblood.common.items.LivingMageArmorItem;
 import com.mystchonky.tomeofblood.common.registry.LivingUpgradeRegistry;
 import com.mystchonky.tomeofblood.common.registry.MobEffectRegistry;
-import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.player.Player;
 import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 import wayoftime.bloodmagic.core.living.LivingStats;
 import wayoftime.bloodmagic.core.living.LivingUtil;
-import wayoftime.bloodmagic.event.LivingEquipmentEvent;
 import wayoftime.bloodmagic.event.SacrificeKnifeUsedEvent;
 
 import static com.hollingsworth.arsnouveau.api.util.ManaUtil.getPlayerDiscounts;
@@ -45,20 +41,12 @@ public static void spellDiscount(SpellCostCalcEvent event) {
                 LivingStats stats = LivingStats.fromPlayer(player);
                 int level = stats.getLevel(LivingUpgradeRegistry.MANA_UPGRADE.getKey());
                 double discount = level * 0.05;
-                event.currentCost *= (int) (1 - discount);
+                event.currentCost = (int) ((1 - discount) * event.currentCost);
             }
         }
 
     }
 
-    // LivingMageArmor trains slower than Normal living armor
-    @SubscribeEvent
-    public static void reduceExpGain(LivingEquipmentEvent.GainExperience event) {
-        if (event.getPlayer().getItemBySlot(EquipmentSlot.CHEST).getItem() instanceof LivingMageArmorItem) {
-            event.setExperience(event.getExperience() * BaseConfig.COMMON.LIVING_MAGE_SCALE.get());
-        }
-    }
-
     @SubscribeEvent
     public static void awardXPForSpellCast(SpellCastEvent event) {
         if (event.context.getUnwrappedCaster() instanceof Player player) {