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

Removed the stat trackers for the downgrades and prevented downgrades from combining with each other in an anvil.

Browse source
This commit is contained in:
WayofTime 2016-10-09 10:44:50 -04:00
parent ed8427c04e
commit f74f46ab4a
25 changed files with 122 additions and 742 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java
View file

@ -252,12 +252,6 @@ public class LivingArmour implements ILivingArmour
}
}
if ((allowOnlyDowngrades != tracker.isTrackerDowngrade()))
{
tracker.onDeactivatedTick(world, player, this);
continue;
}
if (tracker.onTick(world, player, this))
{
List<LivingArmourUpgrade> upgradeList = tracker.getUpgrades();

6
src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java
View file

@ -75,4 +75,10 @@ public class LivingArmourUpgradeBattleHungry extends LivingArmourUpgrade
{
return tooltipBase + "battleHunger";
}
@Override
public boolean isDowngrade()
{
return true;
}
}

6
src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java
View file

@ -55,4 +55,10 @@ public class LivingArmourUpgradeCrippledArm extends LivingArmourUpgrade
{
return tooltipBase + "crippledArm";
}
@Override
public boolean isDowngrade()
{
return true;
}
}

6
src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java
View file

@ -75,4 +75,10 @@ public class LivingArmourUpgradeDigSlowdown extends LivingArmourUpgrade
{
return tooltipBase + "digSlowdown";
}
@Override
public boolean isDowngrade()
{
return true;
}
}

6
src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java
View file

@ -66,4 +66,10 @@ public class LivingArmourUpgradeDisoriented extends LivingArmourUpgrade
{
return tooltipBase + "disoriented";
}
@Override
public boolean isDowngrade()
{
return true;
}
}

8
src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java
View file

@ -3,8 +3,10 @@ package WayofTime.bloodmagic.livingArmour.downgrade;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.attributes.AttributeModifier;
import net.minecraft.entity.player.EntityPlayer;
@ -74,4 +76,10 @@ public class LivingArmourUpgradeMeleeDecrease extends LivingArmourUpgrade
{
return tooltipBase + "meleeDecrease";
}
@Override
public boolean isDowngrade()
{
return true;
}
}

6
src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java
View file

@ -55,4 +55,10 @@ public class LivingArmourUpgradeQuenched extends LivingArmourUpgrade
{
return tooltipBase + "quenched";
}
@Override
public boolean isDowngrade()
{
return true;
}
}

6
src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java
View file

@ -97,4 +97,10 @@ public class LivingArmourUpgradeSlippery extends LivingArmourUpgrade
{
return tooltipBase + "slippery";
}
@Override
public boolean isDowngrade()
{
return true;
}
}

6
src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java
View file

@ -73,4 +73,10 @@ public class LivingArmourUpgradeSlowness extends LivingArmourUpgrade
{
return tooltipBase + "slowness";
}
@Override
public boolean isDowngrade()
{
return true;
}
}

10
src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java
View file

@ -9,7 +9,7 @@ import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
public class LivingArmourUpgradeStormTrooper extends LivingArmourUpgrade
{
public static final int[] costs = new int[] { -150 };
public static final int[] costs = new int[] { -10, -25, -40, 65, -90 };
public static final float[] inaccuracy = new float[] { 0.04f, 0.08f, 0.12f, 0.16f, 0.2f };
public LivingArmourUpgradeStormTrooper(int level)
@ -37,7 +37,7 @@ public class LivingArmourUpgradeStormTrooper extends LivingArmourUpgrade
@Override
public int getMaxTier()
{
return 1;
return 5;
}
@Override
@ -61,4 +61,10 @@ public class LivingArmourUpgradeStormTrooper extends LivingArmourUpgrade
{
return tooltipBase + "stormTrooper";
}
@Override
public boolean isDowngrade()
{
return true;
}
}

130
src/main/java/WayofTime/bloodmagic/livingArmour/tracker/downgrade/StatTrackerBattleHungry.java
View file

@ -1,130 +0,0 @@
package WayofTime.bloodmagic.livingArmour.tracker.downgrade;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
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.livingArmour.LivingArmour;
import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeBattleHungry;
import WayofTime.bloodmagic.util.Utils;
public class StatTrackerBattleHungry extends StatTracker
{
public double totalDamageDealt = 0;
public static HashMap<LivingArmour, Double> changeMap = new HashMap<LivingArmour, Double>();
public static int[] damageRequired = new int[] { 200, 800, 1300, 2500, 3800, 5000 };
public static void incrementCounter(LivingArmour armour, double damage)
{
changeMap.put(armour, changeMap.containsKey(armour) ? changeMap.get(armour) + damage : damage);
}
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".tracker.battleHunger";
}
@Override
public void resetTracker()
{
this.totalDamageDealt = 0;
}
@Override
public void readFromNBT(NBTTagCompound tag)
{
totalDamageDealt = tag.getDouble(Constants.Mod.MODID + ".tracker.battleHunger");
}
@Override
public void writeToNBT(NBTTagCompound tag)
{
tag.setDouble(Constants.Mod.MODID + ".tracker.battleHunger", totalDamageDealt);
}
@Override
public boolean onTick(World world, EntityPlayer player, LivingArmour livingArmour)
{
if (changeMap.containsKey(livingArmour))
{
double change = Math.abs(changeMap.get(livingArmour));
if (change > 0)
{
totalDamageDealt += Math.abs(changeMap.get(livingArmour));
System.out.println(totalDamageDealt);
changeMap.put(livingArmour, 0d);
this.markDirty();
return true;
}
}
return false;
}
@Override
public void onDeactivatedTick(World world, EntityPlayer player, LivingArmour livingArmour)
{
if (changeMap.containsKey(livingArmour))
{
changeMap.remove(livingArmour);
}
}
@Override
public List<LivingArmourUpgrade> getUpgrades()
{
List<LivingArmourUpgrade> upgradeList = new ArrayList<LivingArmourUpgrade>();
for (int i = 0; i < 5; i++)
{
if (totalDamageDealt >= damageRequired[i])
{
upgradeList.add(new LivingArmourUpgradeBattleHungry(i));
}
}
return upgradeList;
}
@Override
public double getProgress(LivingArmour livingArmour, int currentLevel)
{
return Utils.calculateStandardProgress(totalDamageDealt, damageRequired, currentLevel);
}
@Override
public boolean providesUpgrade(String key)
{
return key.equals(Constants.Mod.MODID + ".upgrade.battleHunger");
}
@Override
public void onArmourUpgradeAdded(LivingArmourUpgrade upgrade)
{
if (upgrade instanceof LivingArmourUpgradeBattleHungry)
{
int level = upgrade.getUpgradeLevel();
if (level < damageRequired.length)
{
totalDamageDealt = Math.max(totalDamageDealt, damageRequired[level]);
this.markDirty();
}
}
}
@Override
public boolean isTrackerDowngrade()
{
return true;
}
}

130
src/main/java/WayofTime/bloodmagic/livingArmour/tracker/downgrade/StatTrackerDigSlowdown.java
View file

@ -1,130 +0,0 @@
package WayofTime.bloodmagic.livingArmour.tracker.downgrade;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
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.livingArmour.LivingArmour;
import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeDigSlowdown;
import WayofTime.bloodmagic.util.Utils;
public class StatTrackerDigSlowdown extends StatTracker
{
public int totalBlocksDug = 0;
public static HashMap<LivingArmour, Integer> changeMap = new HashMap<LivingArmour, Integer>();
public static int[] blocksRequired = new int[] { 64, 128, 250, 400, 700, 1200, 2000, 3500, 6000, 10000 };
public static void incrementCounter(LivingArmour armour)
{
changeMap.put(armour, changeMap.containsKey(armour) ? changeMap.get(armour) + 1 : 1);
}
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".tracker.digSlowdown";
}
@Override
public void resetTracker()
{
this.totalBlocksDug = 0;
}
@Override
public void readFromNBT(NBTTagCompound tag)
{
totalBlocksDug = tag.getInteger(Constants.Mod.MODID + ".tracker.digSlowdown");
}
@Override
public void writeToNBT(NBTTagCompound tag)
{
tag.setInteger(Constants.Mod.MODID + ".tracker.digSlowdown", totalBlocksDug);
}
@Override
public boolean onTick(World world, EntityPlayer player, LivingArmour livingArmour)
{
if (changeMap.containsKey(livingArmour))
{
int change = Math.abs(changeMap.get(livingArmour));
if (change > 0)
{
totalBlocksDug += Math.abs(changeMap.get(livingArmour));
changeMap.put(livingArmour, 0);
this.markDirty();
return true;
}
}
return false;
}
@Override
public void onDeactivatedTick(World world, EntityPlayer player, LivingArmour livingArmour)
{
if (changeMap.containsKey(livingArmour))
{
changeMap.remove(livingArmour);
}
}
@Override
public List<LivingArmourUpgrade> getUpgrades()
{
List<LivingArmourUpgrade> upgradeList = new ArrayList<LivingArmourUpgrade>();
for (int i = 0; i < 10; i++)
{
if (totalBlocksDug >= blocksRequired[i])
{
upgradeList.add(new LivingArmourUpgradeDigSlowdown(i));
}
}
return upgradeList;
}
@Override
public double getProgress(LivingArmour livingArmour, int currentLevel)
{
return Utils.calculateStandardProgress(totalBlocksDug, blocksRequired, currentLevel);
}
@Override
public boolean providesUpgrade(String key)
{
return key.equals(Constants.Mod.MODID + ".upgrade.digSlowdown");
}
@Override
public void onArmourUpgradeAdded(LivingArmourUpgrade upgrade)
{
if (upgrade instanceof LivingArmourUpgradeDigSlowdown)
{
int level = upgrade.getUpgradeLevel();
if (level < blocksRequired.length)
{
totalBlocksDug = Math.max(totalBlocksDug, blocksRequired[level]);
this.markDirty();
}
}
}
@Override
public boolean isTrackerDowngrade()
{
return true;
}
}

129
src/main/java/WayofTime/bloodmagic/livingArmour/tracker/downgrade/StatTrackerMeleeDecrease.java
View file

@ -1,129 +0,0 @@
package WayofTime.bloodmagic.livingArmour.tracker.downgrade;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
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.livingArmour.LivingArmour;
import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeMeleeDecrease;
import WayofTime.bloodmagic.util.Utils;
public class StatTrackerMeleeDecrease extends StatTracker
{
public double totalDamageDealt = 0;
public static HashMap<LivingArmour, Double> changeMap = new HashMap<LivingArmour, Double>();
public static int[] damageRequired = new int[] { 40, 100, 200, 350, 650, 1000, 1500, 2000, 3500, 7500 };
public static void incrementCounter(LivingArmour armour, double damage)
{
changeMap.put(armour, changeMap.containsKey(armour) ? changeMap.get(armour) + damage : damage);
}
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".tracker.meleeDecrease";
}
@Override
public void resetTracker()
{
this.totalDamageDealt = 0;
}
@Override
public void readFromNBT(NBTTagCompound tag)
{
totalDamageDealt = tag.getDouble(Constants.Mod.MODID + ".tracker.meleeDecrease");
}
@Override
public void writeToNBT(NBTTagCompound tag)
{
tag.setDouble(Constants.Mod.MODID + ".tracker.meleeDecrease", totalDamageDealt);
}
@Override
public boolean onTick(World world, EntityPlayer player, LivingArmour livingArmour)
{
if (changeMap.containsKey(livingArmour))
{
double change = Math.abs(changeMap.get(livingArmour));
if (change > 0)
{
totalDamageDealt += Math.abs(changeMap.get(livingArmour));
changeMap.put(livingArmour, 0d);
this.markDirty();
return true;
}
}
return false;
}
@Override
public void onDeactivatedTick(World world, EntityPlayer player, LivingArmour livingArmour)
{
if (changeMap.containsKey(livingArmour))
{
changeMap.remove(livingArmour);
}
}
@Override
public List<LivingArmourUpgrade> getUpgrades()
{
List<LivingArmourUpgrade> upgradeList = new ArrayList<LivingArmourUpgrade>();
for (int i = 0; i < 10; i++)
{
if (totalDamageDealt >= damageRequired[i])
{
upgradeList.add(new LivingArmourUpgradeMeleeDecrease(i));
}
}
return upgradeList;
}
@Override
public double getProgress(LivingArmour livingArmour, int currentLevel)
{
return Utils.calculateStandardProgress(totalDamageDealt, damageRequired, currentLevel);
}
@Override
public boolean providesUpgrade(String key)
{
return key.equals(Constants.Mod.MODID + ".upgrade.meleeDecrease");
}
@Override
public void onArmourUpgradeAdded(LivingArmourUpgrade upgrade)
{
if (upgrade instanceof LivingArmourUpgradeMeleeDecrease)
{
int level = upgrade.getUpgradeLevel();
if (level < damageRequired.length)
{
totalDamageDealt = Math.max(totalDamageDealt, damageRequired[level]);
this.markDirty();
}
}
}
@Override
public boolean isTrackerDowngrade()
{
return true;
}
}

129
src/main/java/WayofTime/bloodmagic/livingArmour/tracker/downgrade/StatTrackerQuenched.java
View file

@ -1,129 +0,0 @@
package WayofTime.bloodmagic.livingArmour.tracker.downgrade;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
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.livingArmour.LivingArmour;
import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeQuenched;
import WayofTime.bloodmagic.util.Utils;
public class StatTrackerQuenched extends StatTracker
{
public int totalQuafs = 0;
public static HashMap<LivingArmour, Integer> changeMap = new HashMap<LivingArmour, Integer>();
public static int[] quafsRequired = new int[] { 16 };
public static void incrementCounter(LivingArmour armour)
{
changeMap.put(armour, changeMap.containsKey(armour) ? changeMap.get(armour) + 1 : 1);
}
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".tracker.quenched";
}
@Override
public void resetTracker()
{
this.totalQuafs = 0;
}
@Override
public void readFromNBT(NBTTagCompound tag)
{
totalQuafs = tag.getInteger(Constants.Mod.MODID + ".tracker.quenched");
}
@Override
public void writeToNBT(NBTTagCompound tag)
{
tag.setInteger(Constants.Mod.MODID + ".tracker.quenched", totalQuafs);
}
@Override
public boolean onTick(World world, EntityPlayer player, LivingArmour livingArmour)
{
if (changeMap.containsKey(livingArmour))
{
int change = Math.abs(changeMap.get(livingArmour));
if (change > 0)
{
totalQuafs += Math.abs(changeMap.get(livingArmour));
changeMap.put(livingArmour, 0);
this.markDirty();
return true;
}
}
return false;
}
@Override
public void onDeactivatedTick(World world, EntityPlayer player, LivingArmour livingArmour)
{
if (changeMap.containsKey(livingArmour))
{
changeMap.remove(livingArmour);
}
}
@Override
public List<LivingArmourUpgrade> getUpgrades()
{
List<LivingArmourUpgrade> upgradeList = new ArrayList<LivingArmourUpgrade>();
for (int i = 0; i < 1; i++)
{
if (totalQuafs >= quafsRequired[i])
{
upgradeList.add(new LivingArmourUpgradeQuenched(i));
}
}
return upgradeList;
}
@Override
public double getProgress(LivingArmour livingArmour, int currentLevel)
{
return Utils.calculateStandardProgress(totalQuafs, quafsRequired, currentLevel);
}
@Override
public boolean providesUpgrade(String key)
{
return key.equals(Constants.Mod.MODID + ".upgrade.quenched");
}
@Override
public void onArmourUpgradeAdded(LivingArmourUpgrade upgrade)
{
if (upgrade instanceof LivingArmourUpgradeQuenched)
{
int level = upgrade.getUpgradeLevel();
if (level < quafsRequired.length)
{
totalQuafs = Math.max(totalQuafs, quafsRequired[level]);
this.markDirty();
}
}
}
@Override
public boolean isTrackerDowngrade()
{
return true;
}
}

141
src/main/java/WayofTime/bloodmagic/livingArmour/tracker/downgrade/StatTrackerSlowness.java
View file

@ -1,141 +0,0 @@
package WayofTime.bloodmagic.livingArmour.tracker.downgrade;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.MobEffects;
import net.minecraft.nbt.NBTTagCompound;
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.livingArmour.LivingArmour;
import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeSlowness;
import WayofTime.bloodmagic.util.Utils;
public class StatTrackerSlowness extends StatTracker
{
public static Map<EntityPlayer, Double> lastPosX = new HashMap<EntityPlayer, Double>();
public static Map<EntityPlayer, Double> lastPosZ = new HashMap<EntityPlayer, Double>();
public static int[] blocksRequired = new int[] { 200, 1000, 2000, 4000, 7000, 15000, 25000, 35000, 50000, 70000 };
public double totalMovement = 0;
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".tracker.slowness";
}
@Override
public void resetTracker()
{
this.totalMovement = 0;
}
@Override
public void readFromNBT(NBTTagCompound tag)
{
totalMovement = tag.getDouble(Constants.Mod.MODID + ".tracker.slowness");
}
@Override
public void writeToNBT(NBTTagCompound tag)
{
tag.setDouble(Constants.Mod.MODID + ".tracker.slowness", totalMovement);
}
@Override
public boolean onTick(World world, EntityPlayer player, LivingArmour livingArmour)
{
if (!lastPosX.containsKey(player))
{
lastPosX.put(player, player.posX);
lastPosZ.put(player, player.posZ);
return false;
}
if (!player.onGround || !player.isPotionActive(MobEffects.SLOWNESS))
{
return false;
}
double distanceTravelled = Math.sqrt(Math.pow(lastPosX.get(player) - player.posX, 2) + Math.pow(lastPosZ.get(player) - player.posZ, 2));
if (distanceTravelled > 0.0001 && distanceTravelled < 2)
{
totalMovement += distanceTravelled;
lastPosX.put(player, player.posX);
lastPosZ.put(player, player.posZ);
markDirty();
return true;
}
lastPosX.put(player, player.posX);
lastPosZ.put(player, player.posZ);
return false;
}
@Override
public void onDeactivatedTick(World world, EntityPlayer player, LivingArmour livingArmour)
{
}
@Override
public List<LivingArmourUpgrade> getUpgrades()
{
List<LivingArmourUpgrade> upgradeList = new ArrayList<LivingArmourUpgrade>();
for (int i = 0; i < 10; i++)
{
if (totalMovement >= blocksRequired[i])
{
upgradeList.add(new LivingArmourUpgradeSlowness(i));
}
}
return upgradeList;
}
@Override
public double getProgress(LivingArmour livingArmour, int currentLevel)
{
return Utils.calculateStandardProgress(totalMovement, blocksRequired, currentLevel);
}
@Override
public boolean providesUpgrade(String key)
{
return key.equals(Constants.Mod.MODID + ".upgrade.slowness");
}
@Override
public void onArmourUpgradeAdded(LivingArmourUpgrade upgrade)
{
if (upgrade instanceof LivingArmourUpgradeSlowness)
{
int level = upgrade.getUpgradeLevel();
if (level < blocksRequired.length)
{
totalMovement = Math.max(totalMovement, blocksRequired[level]);
this.markDirty();
}
}
}
@Override
public boolean isTrackerDowngrade()
{
return true;
}
}