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.

Sign up for GitHub

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

Rewriting magic resist #297

Open
wants to merge 1 commit into
base: 1.10.2
Choose a base branch
from
Open

Rewriting magic resist #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 25 additions & 8 deletions src/main/java/am2/enchantments/EnchantMagicResist.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@
import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.enchantment.EnumEnchantmentType;
import net.minecraft.entity.EntityCreature;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.passive.EntityCow;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.EntityEquipmentSlot;
import net.minecraft.util.math.MathHelper;
import net.minecraft.item.ItemStack;

public class EnchantMagicResist extends Enchantment{

Expand All @@ -19,14 +22,28 @@ public int getMaxLevel(){
return 5;
}

public static int ApplyEnchantment(EntityLivingBase inventory, int damage){
int maxEnchantLevel = EnchantmentHelper.getMaxEnchantmentLevel(AMEnchantments.magicResist, inventory);

if (maxEnchantLevel > 0){
damage -= MathHelper.floor_float((float)damage * (float)maxEnchantLevel * 0.15F);
public static float ApplyEnchantment(EntityLivingBase entity, float damage){
ItemStack[] armorList = null;
float newDamage = damage;
int totalMRLevel = 0;
if (!(entity instanceof EntityPlayer)) {
return damage;
}else{
armorList = ((EntityPlayer)entity).inventory.armorInventory;
}

return damage;
if (armorList.length > 0){
for (ItemStack armor : armorList){
totalMRLevel += EnchantmentHelper.getEnchantmentLevel(AMEnchantments.magicResist, armor);
}
}

if (totalMRLevel > 0){
//ewDamage -= damage * totalMRLevel * 0.05f;
//log scale, it is kind of ridiculous, as 1/4 of the resources reaps more than half the max benefit
newDamage = (float) (damage - damage * 0.32845873875f * Math.log1p(totalMRLevel));
}

return newDamage;
}

}
15 changes: 14 additions & 1 deletion src/main/java/am2/handler/EntityHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import am2.armor.ArmorHelper;
import am2.armor.infusions.GenericImbuement;
import am2.defs.ItemDefs;
import am2.enchantments.EnchantMagicResist;
import am2.extensions.AffinityData;
import am2.extensions.EntityExtension;
import am2.extensions.RiftStorage;
Expand Down Expand Up @@ -57,6 +58,7 @@
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.EntityEquipmentSlot;
import net.minecraft.item.ItemStack;
import net.minecraft.util.DamageSource;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.math.Vec3d;
Expand All @@ -73,6 +75,7 @@
import net.minecraftforge.event.entity.living.LivingAttackEvent;
import net.minecraftforge.event.entity.living.LivingDeathEvent;
import net.minecraftforge.event.entity.living.LivingDropsEvent;
import net.minecraftforge.event.entity.living.LivingHurtEvent;
import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent;
import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
import net.minecraftforge.event.entity.player.PlayerEvent;
Expand Down Expand Up @@ -235,7 +238,7 @@ public void entityTick (LivingUpdateEvent event) {
double newVel = Math.sqrt(projectile.motionX * projectile.motionX + projectile.motionY * projectile.motionY + projectile.motionZ * projectile.motionZ);

projectile.motionX = newVel * rX;
//projectile.motionY = newVel * rY;
projectile.motionY = newVel * rY;
projectile.motionZ = newVel * rZ;
}
}
Expand Down Expand Up @@ -520,4 +523,14 @@ public void entityJoinWorldEvent(EntityJoinWorldEvent event) {
EntityItemWatcher.instance.addWatchedItem((EntityItem) event.getEntity());
}
}

// @SubscribeEvent(priority = EventPriority.LOWEST)
// public void entityDamageEvent(LivingHurtEvent event) {
// EntityLivingBase entity = (EntityLivingBase) event.getEntity();
// if (event.getSource() == DamageSource.magic || event.getSource() == DamageSource.dragonBreath){
// float newDamage = EnchantMagicResist.ApplyEnchantment(entity, event.getAmount());
// event.setAmount(newDamage);
// }
// }

}
9 changes: 9 additions & 0 deletions src/main/java/am2/handler/PotionEffectHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@
import am2.buffs.BuffStatModifiers;
import am2.defs.ItemDefs;
import am2.defs.PotionEffectsDefs;
import am2.enchantments.EnchantMagicResist;
import am2.extensions.EntityExtension;
import am2.utils.DimensionUtilities;
import am2.utils.KeystoneUtilities;
import am2.utils.SelectionUtils;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityBoat;
import net.minecraft.entity.item.EntityMinecart;
import net.minecraft.item.ItemStack;
Expand Down Expand Up @@ -79,6 +81,13 @@ public void entityDamageEvent(LivingHurtEvent event) {
event.setAmount(event.getAmount() * 0.25f);

float damage = EntityExtension.For(event.getEntityLiving()).protect(event.getAmount());

EntityLivingBase entity = (EntityLivingBase) event.getEntity();

if (event.getSource().damageType.equals(DamageSource.magic.damageType) || event.getSource().damageType.equals(DamageSource.dragonBreath.damageType)){
damage = EnchantMagicResist.ApplyEnchantment(entity, damage);
}

event.setAmount(damage);
}

Expand Down
13 changes: 0 additions & 13 deletions src/main/java/am2/spell/component/MagicDamage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import java.util.Random;
import java.util.Set;

import am2.enchantments.AMEnchantments;
import com.google.common.collect.Sets;

import am2.ArsMagica2;
Expand All @@ -15,10 +14,8 @@
import am2.defs.ItemDefs;
import am2.particles.AMParticle;
import am2.utils.SpellUtils;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.item.EnumDyeColor;
import net.minecraft.item.ItemStack;
Expand All @@ -39,16 +36,6 @@ public boolean applyEffectEntity(ItemStack stack, World world, EntityLivingBase
if (!(target instanceof EntityLivingBase)) return false;
float baseDamage = 6;
double damage = SpellUtils.getModifiedDouble_Add(baseDamage, stack, caster, target, world, SpellModifiers.DAMAGE);
float mod = 0.0f;
if (target instanceof EntityPlayer){
for (ItemStack item : ((EntityPlayer)target).inventory.armorInventory){
if (item == null)
continue;
if (EnchantmentHelper.getEnchantmentLevel(AMEnchantments.magicResist, item) > 0)
mod = mod + (0.04f * EnchantmentHelper.getEnchantmentLevel(AMEnchantments.magicResist, item));
}
}
damage = damage - (damage * mod);
return SpellUtils.attackTargetSpecial(stack, target, DamageSources.causeMagicDamage(caster), SpellUtils.modifyDamage(caster, (float)damage));
}

Expand Down