Updated the books, worked more on the new self-sacrifice mechanics, allowed the teleposer to telepose entities across dimensions, changed the Focus of the Ellipsoid so that it now places blocks from a chest underneath the MRS.

This commit is contained in:
WayofTime 2015-05-04 14:16:58 -04:00
parent c71edfb937
commit f74e4993cf
15 changed files with 371 additions and 61 deletions

View file

@ -17,4 +17,5 @@ public interface IIncense
public float getRedColour(ItemStack stack);
public float getGreenColour(ItemStack stack);
public float getBlueColour(ItemStack stack);
float getTickRate(ItemStack stack);
}

View file

@ -12,19 +12,19 @@ public class PlayerSacrificeHandler
{
public static float scalingOfSacrifice = 0.0025f;
public static int soulFrayDuration = 400;
public static int getPlayerIncense(EntityPlayer player)
public static float getPlayerIncense(EntityPlayer player)
{
return APISpellHelper.getCurrentIncense(player);
}
public static void setPlayerIncense(EntityPlayer player, int amount)
public static void setPlayerIncense(EntityPlayer player, float amount)
{
APISpellHelper.setCurrentIncense(player, amount);
}
public static boolean incrementIncense(EntityPlayer player, int min, int max)
public static boolean incrementIncense(EntityPlayer player, float min, float max)
{
int amount = getPlayerIncense(player);
float amount = getPlayerIncense(player);
if(amount < min || amount >= max)
{
return false;
@ -43,7 +43,7 @@ public class PlayerSacrificeHandler
return false;
}
int amount = getPlayerIncense(player);
float amount = getPlayerIncense(player);
if(amount >= 0)
{
@ -68,9 +68,9 @@ public class PlayerSacrificeHandler
return false;
}
public static float getModifier(int incense)
public static float getModifier(float amount)
{
return 1 + incense*scalingOfSacrifice;
return 1 + amount*scalingOfSacrifice;
}
public static boolean findAndFillAltar(World world, EntityPlayer player, int amount)

View file

@ -157,7 +157,7 @@ public class SoulNetworkHandler
*
* @param ist Owned itemStack
* @param player Player using the item
* @param damageToBeDone
* @param drain
* @return True if the action should be executed and false if it should not. Always returns false if client-sided.
*/
public static boolean syphonAndDamageFromNetwork(ItemStack ist, EntityPlayer player, int drain)

View file

@ -42,21 +42,21 @@ public class APISpellHelper
return beaconData;
}
public static int getCurrentIncense(EntityPlayer player)
public static float getCurrentIncense(EntityPlayer player)
{
NBTTagCompound data = player.getEntityData();
if(data.hasKey("BM:CurrentIncense"))
{
return data.getInteger("BM:CurrentIncense");
return data.getFloat("BM:CurrentIncense");
}
return 0;
}
public static void setCurrentIncense(EntityPlayer player, int amount)
public static void setCurrentIncense(EntityPlayer player, float amount)
{
NBTTagCompound data = player.getEntityData();
data.setInteger("BM:CurrentIncense", amount);
data.setFloat("BM:CurrentIncense", amount);
}
public static int getPlayerLPTag(EntityPlayer player)