lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ritual reimplementation

Browse source 
Reimplemented the following rituals:
	- Resonance of the Faceted Crystal
	- Crack of the Fractured Crystal
	- Reap of the Harvest Moon
This commit is contained in:
WayofTime 2020-11-26 13:32:56 -05:00
parent 907a0f27e7
commit e312e3d854
13 changed files with 955 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java
View file

@ -159,6 +159,9 @@ public class GeneratorLanguage extends LanguageProvider
add("ritual.bloodmagic.upgradeRemoveRitual", "Sound of the Cleansing Soul");
add("ritual.bloodmagic.armourEvolveRitual", "Ritual of Living Evolution");
add("ritual.bloodmagic.animalGrowthRitual", "Ritual of the Shepherd");
add("ritual.bloodmagic.crystalHarvestRitual", "Crack of the Fractured Crystal");
add("ritual.bloodmagic.forsakenSoulRitual", "Gathering of the Forsaken Souls");
add("ritual.bloodmagic.crystalSplitRitual", "Resonance of the Faceted Crystal");
add("ritual.bloodmagic.cobblestoneRitual", "Le Vulcanos Frigius");
add("ritual.bloodmagic.placerRitual", "The Filler");

8
src/main/java/wayoftime/bloodmagic/common/item/ItemSentientScythe.java
View file

@ -62,7 +62,7 @@ public class ItemSentientScythe extends HoeItem implements IDemonWillWeapon, IMu
{
public static int[] soulBracket = new int[] { 16, 60, 200, 400, 1000 };
public static double[] defaultDamageAdded = new double[] { 0.5, 1, 1.5, 2, 2.5 };
public static double[] destructiveDamageAdded = new double[] { 2, 3, 4, 5, 6 };
public static double[] destructiveDamageAdded = new double[] { 1, 1.5, 2, 2.5, 3 };
public static double[] vengefulDamageAdded = new double[] { 0, 0.5, 1, 1.5, 2 };
public static double[] steadfastDamageAdded = new double[] { 0, 0.5, 1, 1.5, 2 };
public static double[] defaultDigSpeedAdded = new double[] { 1, 1.5, 2, 3, 4 };
@ -296,8 +296,6 @@ public class ItemSentientScythe extends HoeItem implements IDemonWillWeapon, IMu
continue;
}
if (!net.minecraftforge.common.ForgeHooks.onPlayerAttackTarget(attacker, targetEntity))
continue;
if (targetEntity.canBeAttackedWithItem())
{
if (!targetEntity.hitByEntity(attacker))
@ -447,6 +445,8 @@ public class ItemSentientScythe extends HoeItem implements IDemonWillWeapon, IMu
int k = (int) ((double) f5 * 0.5D);
((ServerWorld) attacker.world).spawnParticle(ParticleTypes.DAMAGE_INDICATOR, targetEntity.getPosX(), targetEntity.getPosYHeight(0.5D), targetEntity.getPosZ(), k, 0.1D, 0.0D, 0.1D, 0.2D);
}
applyEffectToEntity(type, willBracket, (LivingEntity) targetEntity, attacker);
}
} else
@ -506,7 +506,7 @@ public class ItemSentientScythe extends HoeItem implements IDemonWillWeapon, IMu
if (!target.isAlive())
{
float absorption = attacker.getAbsorptionAmount();
attacker.addPotionEffect(new EffectInstance(Effects.ABSORPTION, absorptionTime[willBracket], 127));
attacker.addPotionEffect(new EffectInstance(Effects.ABSORPTION, absorptionTime[willBracket], 127, true, false));
attacker.setAbsorptionAmount((float) Math.min(absorption + target.getMaxHealth() * 0.05f, maxAbsorptionHearts));
}
break;