Added Ritual: Song of the Cleansing Soul to remove Living Armour upgrades from the armour.
This commit is contained in:
WayofTime
parent
b5c8c2242a
commit
7610329d0a
12 changed files with 256 additions and 65 deletions
|
|
@ -1,13 +1,9 @@
|
|||
package WayofTime.bloodmagic.ritual;
|
||||
|
||||
import WayofTime.bloodmagic.api.Constants;
|
||||
import WayofTime.bloodmagic.api.iface.IBindable;
|
||||
import WayofTime.bloodmagic.api.network.SoulNetwork;
|
||||
import WayofTime.bloodmagic.api.ritual.*;
|
||||
import WayofTime.bloodmagic.api.util.helper.BindableHelper;
|
||||
import WayofTime.bloodmagic.api.util.helper.NetworkHelper;
|
||||
import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
|
||||
import com.google.common.base.Strings;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
|
|
@ -20,10 +16,18 @@ import net.minecraft.util.MathHelper;
|
|||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.entity.living.EnderTeleportEvent;
|
||||
import WayofTime.bloodmagic.api.Constants;
|
||||
import WayofTime.bloodmagic.api.iface.IBindable;
|
||||
import WayofTime.bloodmagic.api.network.SoulNetwork;
|
||||
import WayofTime.bloodmagic.api.ritual.AreaDescriptor;
|
||||
import WayofTime.bloodmagic.api.ritual.EnumRuneType;
|
||||
import WayofTime.bloodmagic.api.ritual.IMasterRitualStone;
|
||||
import WayofTime.bloodmagic.api.ritual.Ritual;
|
||||
import WayofTime.bloodmagic.api.ritual.RitualComponent;
|
||||
import WayofTime.bloodmagic.api.util.helper.NetworkHelper;
|
||||
import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
import com.google.common.base.Strings;
|
||||
|
||||
public class RitualExpulsion extends Ritual
|
||||
{
|
||||
|
|
@ -140,8 +144,7 @@ public class RitualExpulsion extends Ritual
|
|||
if (block != null && block.getMaterial().blocksMovement())
|
||||
{
|
||||
flag1 = true;
|
||||
}
|
||||
else
|
||||
} else
|
||||
{
|
||||
--entityLiving.posY;
|
||||
--j;
|
||||
|
|
@ -163,8 +166,7 @@ public class RitualExpulsion extends Ritual
|
|||
{
|
||||
moveEntityViaTeleport(entityLiving, lastX, lastY, lastZ);
|
||||
return false;
|
||||
}
|
||||
else
|
||||
} else
|
||||
{
|
||||
for (l = 0; l < 128; ++l)
|
||||
{
|
||||
|
|
@ -204,8 +206,7 @@ public class RitualExpulsion extends Ritual
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (entityLiving != null)
|
||||
} else if (entityLiving != null)
|
||||
{
|
||||
entityLiving.setPosition(x, y, z);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,15 +1,19 @@
|
|||
package WayofTime.bloodmagic.ritual;
|
||||
|
||||
import WayofTime.bloodmagic.api.Constants;
|
||||
import WayofTime.bloodmagic.api.network.SoulNetwork;
|
||||
import WayofTime.bloodmagic.api.ritual.*;
|
||||
import WayofTime.bloodmagic.api.util.helper.NetworkHelper;
|
||||
import java.util.ArrayList;
|
||||
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.util.BlockPos;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import WayofTime.bloodmagic.api.Constants;
|
||||
import WayofTime.bloodmagic.api.network.SoulNetwork;
|
||||
import WayofTime.bloodmagic.api.ritual.AreaDescriptor;
|
||||
import WayofTime.bloodmagic.api.ritual.EnumRuneType;
|
||||
import WayofTime.bloodmagic.api.ritual.IMasterRitualStone;
|
||||
import WayofTime.bloodmagic.api.ritual.Ritual;
|
||||
import WayofTime.bloodmagic.api.ritual.RitualComponent;
|
||||
import WayofTime.bloodmagic.api.util.helper.NetworkHelper;
|
||||
|
||||
public class RitualSpeed extends Ritual
|
||||
{
|
||||
|
|
@ -38,7 +42,8 @@ public class RitualSpeed extends Ritual
|
|||
|
||||
for (EntityLivingBase entity : world.getEntitiesWithinAABB(EntityLivingBase.class, speedRange.getAABB(masterRitualStone.getBlockPos())))
|
||||
{
|
||||
if (entity.isSneaking()) continue;
|
||||
if (entity.isSneaking())
|
||||
continue;
|
||||
|
||||
double motionY = 1.2;
|
||||
double speed = 3;
|
||||
|
|
@ -49,21 +54,23 @@ public class RitualSpeed extends Ritual
|
|||
|
||||
switch (direction)
|
||||
{
|
||||
case NORTH:
|
||||
entity.setVelocity(0, motionY, -speed);
|
||||
break;
|
||||
case NORTH:
|
||||
entity.setVelocity(0, motionY, -speed);
|
||||
break;
|
||||
|
||||
case SOUTH:
|
||||
entity.setVelocity(0, motionY, speed);
|
||||
break;
|
||||
case SOUTH:
|
||||
entity.setVelocity(0, motionY, speed);
|
||||
break;
|
||||
|
||||
case WEST:
|
||||
entity.setVelocity(-speed, motionY, 0);
|
||||
break;
|
||||
case WEST:
|
||||
entity.setVelocity(-speed, motionY, 0);
|
||||
break;
|
||||
|
||||
case EAST:
|
||||
entity.setVelocity(speed, motionY, 0);
|
||||
break;
|
||||
case EAST:
|
||||
entity.setVelocity(speed, motionY, 0);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,147 @@
|
|||
package WayofTime.bloodmagic.ritual;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map.Entry;
|
||||
|
||||
import net.minecraft.entity.effect.EntityLightningBolt;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import WayofTime.bloodmagic.api.Constants;
|
||||
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
|
||||
import WayofTime.bloodmagic.api.livingArmour.StatTracker;
|
||||
import WayofTime.bloodmagic.api.ritual.AreaDescriptor;
|
||||
import WayofTime.bloodmagic.api.ritual.EnumRuneType;
|
||||
import WayofTime.bloodmagic.api.ritual.IMasterRitualStone;
|
||||
import WayofTime.bloodmagic.api.ritual.Ritual;
|
||||
import WayofTime.bloodmagic.api.ritual.RitualComponent;
|
||||
import WayofTime.bloodmagic.item.ItemUpgradeTome;
|
||||
import WayofTime.bloodmagic.item.armour.ItemLivingArmour;
|
||||
import WayofTime.bloodmagic.livingArmour.LivingArmour;
|
||||
import WayofTime.bloodmagic.registry.ModItems;
|
||||
|
||||
public class RitualUpgradeRemove extends Ritual
|
||||
{
|
||||
public static final String CHECK_RANGE = "fillRange";
|
||||
|
||||
public RitualUpgradeRemove()
|
||||
{
|
||||
super("ritualUpgradeRemove", 0, 25000, "ritual." + Constants.Mod.MODID + ".fullUpgradeRemove");
|
||||
addBlockRange(CHECK_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1, 2, 1));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void performRitual(IMasterRitualStone masterRitualStone)
|
||||
{
|
||||
World world = masterRitualStone.getWorldObj();
|
||||
|
||||
if (world.isRemote)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
BlockPos pos = masterRitualStone.getBlockPos();
|
||||
|
||||
AreaDescriptor checkRange = getBlockRange(CHECK_RANGE);
|
||||
|
||||
List<EntityPlayer> playerList = world.getEntitiesWithinAABB(EntityPlayer.class, checkRange.getAABB(pos));
|
||||
|
||||
for (EntityPlayer player : playerList)
|
||||
{
|
||||
if (LivingArmour.hasFullSet(player))
|
||||
{
|
||||
boolean removedUpgrade = false;
|
||||
|
||||
ItemStack chestStack = player.getCurrentArmor(2);
|
||||
LivingArmour armour = ItemLivingArmour.armourMap.get(chestStack);
|
||||
if (armour != null)
|
||||
{
|
||||
@SuppressWarnings("unchecked")
|
||||
HashMap<String, LivingArmourUpgrade> upgradeMap = (HashMap<String, LivingArmourUpgrade>) armour.upgradeMap.clone();
|
||||
|
||||
for (Entry<String, LivingArmourUpgrade> entry : upgradeMap.entrySet())
|
||||
{
|
||||
LivingArmourUpgrade upgrade = entry.getValue();
|
||||
String upgradeKey = entry.getKey();
|
||||
|
||||
ItemStack upgradeStack = new ItemStack(ModItems.upgradeTome);
|
||||
ItemUpgradeTome.setKey(upgradeStack, upgradeKey);
|
||||
ItemUpgradeTome.setLevel(upgradeStack, upgrade.getUpgradeLevel());
|
||||
|
||||
boolean successful = armour.removeUpgrade(player, upgrade);
|
||||
|
||||
if (successful)
|
||||
{
|
||||
removedUpgrade = true;
|
||||
world.spawnEntityInWorld(new EntityItem(world, player.posX, player.posY, player.posZ, upgradeStack));
|
||||
for (Entry<String, StatTracker> trackerEntry : armour.trackerMap.entrySet())
|
||||
{
|
||||
StatTracker tracker = trackerEntry.getValue();
|
||||
if (tracker != null)
|
||||
{
|
||||
if (tracker.providesUpgrade(upgradeKey))
|
||||
{
|
||||
tracker.resetTracker(); //Resets the tracker if the upgrade corresponding to it was removed.
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (removedUpgrade)
|
||||
{
|
||||
((ItemLivingArmour) chestStack.getItem()).setLivingArmour(chestStack, armour, true);
|
||||
|
||||
masterRitualStone.setActive(false);
|
||||
|
||||
world.spawnEntityInWorld(new EntityLightningBolt(world, pos.getX(), pos.getY() - 1, pos.getZ()));
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getRefreshTime()
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getRefreshCost()
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ArrayList<RitualComponent> getComponents()
|
||||
{
|
||||
ArrayList<RitualComponent> components = new ArrayList<RitualComponent>();
|
||||
|
||||
this.addCornerRunes(components, 1, 0, EnumRuneType.DUSK);
|
||||
this.addCornerRunes(components, 2, 0, EnumRuneType.FIRE);
|
||||
this.addOffsetRunes(components, 1, 2, 0, EnumRuneType.FIRE);
|
||||
this.addCornerRunes(components, 1, 1, EnumRuneType.WATER);
|
||||
this.addParallelRunes(components, 4, 0, EnumRuneType.EARTH);
|
||||
this.addCornerRunes(components, 1, 3, EnumRuneType.WATER);
|
||||
this.addParallelRunes(components, 1, 4, EnumRuneType.AIR);
|
||||
|
||||
for (int i = 0; i < 4; i++)
|
||||
{
|
||||
this.addCornerRunes(components, 3, i, EnumRuneType.EARTH);
|
||||
}
|
||||
|
||||
return components;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Ritual getNewCopy()
|
||||
{
|
||||
return new RitualUpgradeRemove();
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue