fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add evoker's ring

Browse Source
This commit is contained in:
Electroblob77
2020-08-09 23:23:12 +01:00
parent b08e5e1d96
commit a5dd5ce9df
6 changed files with 49 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/registry/WizardryItems.java
+2
View File
@@ -235,6 +235,7 @@ public final class WizardryItems {
public static final Item ring_earth_melee = placeholder();
public static final Item ring_earth_biome = placeholder();
public static final Item ring_full_moon = placeholder();
public static final Item ring_evoker = placeholder();
public static final Item ring_extraction = placeholder();
public static final Item ring_mana_return = placeholder();
public static final Item ring_blockwrangler = placeholder();
@@ -600,6 +601,7 @@ public final class WizardryItems {
registerItem(registry, "ring_earth_melee", new ItemArtefact(EnumRarity.UNCOMMON, ItemArtefact.Type.RING));
registerItem(registry, "ring_earth_biome", new ItemArtefact(EnumRarity.UNCOMMON, ItemArtefact.Type.RING));
registerItem(registry, "ring_full_moon", new ItemArtefact(EnumRarity.RARE, ItemArtefact.Type.RING));
registerItem(registry, "ring_evoker", new ItemArtefact(EnumRarity.RARE, ItemArtefact.Type.RING));
registerItem(registry, "ring_extraction", new ItemArtefact(EnumRarity.UNCOMMON, ItemArtefact.Type.RING));
registerItem(registry, "ring_mana_return", new ItemArtefact(EnumRarity.EPIC, ItemArtefact.Type.RING));
registerItem(registry, "ring_blockwrangler", new ItemArtefact(EnumRarity.RARE, ItemArtefact.Type.RING));
src/main/java/electroblob/wizardry/spell/Fangs.java
+37 -12
View File
@@ -1,5 +1,6 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.ItemArtefact;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.*;
@@ -63,7 +64,10 @@ public class Fangs extends Spell {
protected boolean spawnFangs(World world, Vec3d origin, Vec3d direction, @Nullable EntityLivingBase caster, SpellModifiers modifiers){
if(direction.lengthSquared() == 0) return false; // Prevent casting directly down/up
boolean defensiveCircle = caster instanceof EntityPlayer && caster.isSneaking()
&& ItemArtefact.isArtefactActive((EntityPlayer)caster, WizardryItems.ring_evoker);
if(!defensiveCircle && direction.lengthSquared() == 0) return false; // Prevent casting directly down/up
boolean flag = false;
@@ -80,20 +84,26 @@ public class Fangs extends Spell {
}else{
int count = (int)(getProperty(RANGE).doubleValue() * modifiers.get(WizardryItems.range_upgrade));
float yaw = (float)MathHelper.atan2(direction.z, direction.x); // Yes, this is the right way round!
if(defensiveCircle){
for(int i = 0; i < count; i++){
for(int i = 0; i < 5; i++){
float yaw = i * (float)Math.PI * 0.4f;
flag |= this.spawnFangsAt(world, caster, modifiers, yaw, 0, origin.add(MathHelper.cos(yaw) * 1.5, 0, MathHelper.sin(yaw) * 1.5));
}
Vec3d vec = origin.add(direction.scale((i + 1) * FANG_SPACING));
// Not exactly the same as evokers but it's how constructs work so it kinda fits
Integer y = BlockUtils.getNearestFloor(world, new BlockPos(vec), 5);
for(int k = 0; k < 8; k++){
float yaw = k * (float)Math.PI * 2f / 8f + ((float)Math.PI * 2f / 5f);
flag |= this.spawnFangsAt(world, caster, modifiers, yaw, 3, origin.add(MathHelper.cos(yaw) * 2.5, 0, MathHelper.sin(yaw) * 2.5));
}
if(y != null){
EntityEvokerFangs fangs = new EntityEvokerFangs(world, vec.x, y, vec.z, yaw, i, caster); // null is fine here
fangs.getEntityData().setFloat(SpellThrowable.DAMAGE_MODIFIER_NBT_KEY, modifiers.get(SpellModifiers.POTENCY));
world.spawnEntity(fangs);
flag = true;
}else{
int count = (int)(getProperty(RANGE).doubleValue() * modifiers.get(WizardryItems.range_upgrade));
float yaw = (float)MathHelper.atan2(direction.z, direction.x); // Yes, this is the right way round!
for(int i = 0; i < count; i++){
Vec3d vec = origin.add(direction.scale((i + 1) * FANG_SPACING));
flag |= spawnFangsAt(world, caster, modifiers, yaw, i, vec);
}
}
}
@@ -101,6 +111,21 @@ public class Fangs extends Spell {
return flag;
}
private boolean spawnFangsAt(World world, @Nullable EntityLivingBase caster, SpellModifiers modifiers, float yaw, int delay, Vec3d vec){
// Not exactly the same as evokers but it's how constructs work so it kinda fits
Integer y = BlockUtils.getNearestFloor(world, new BlockPos(vec), 5);
if(y != null){
EntityEvokerFangs fangs = new EntityEvokerFangs(world, vec.x, y, vec.z, yaw, delay, caster); // null is fine here
fangs.getEntityData().setFloat(SpellThrowable.DAMAGE_MODIFIER_NBT_KEY, modifiers.get(SpellModifiers.POTENCY));
world.spawnEntity(fangs);
return true;
}
return false;
}
@SubscribeEvent(priority = EventPriority.HIGH)
public static void onLivingAttackEvent(LivingAttackEvent event){
if(event.getSource().getImmediateSource() instanceof EntityEvokerFangs){