Added a Repairing Living Armour Upgrade (trained by damaging the chestplate of the Living Armour while you have a full set on - it repairs all of your armour pieces over time)
Added the stat trackers for various Living Armour Downgrades.
This commit is contained in:
WayofTime
parent
6ea17510b7
commit
16a4857dfb
13 changed files with 545 additions and 13 deletions
|
|
@ -167,7 +167,7 @@ public class LivingArmour implements ILivingArmour
|
|||
continue;
|
||||
}
|
||||
|
||||
if (world.isRemote && upgrade.runOnClient())
|
||||
if ((world.isRemote && upgrade.runOnClient()) || !world.isRemote)
|
||||
{
|
||||
upgrade.onTick(world, player, this);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,124 @@
|
|||
package WayofTime.bloodmagic.livingArmour.tracker;
|
||||
|
||||
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.upgrade.LivingArmourUpgradeRepairing;
|
||||
import WayofTime.bloodmagic.util.Utils;
|
||||
|
||||
public class StatTrackerRepairing extends StatTracker
|
||||
{
|
||||
public double totalDamage = 0;
|
||||
|
||||
public static HashMap<LivingArmour, Integer> changeMap = new HashMap<LivingArmour, Integer>();
|
||||
public static int[] damageRequired = new int[] { 500 };
|
||||
|
||||
public static void incrementCounter(LivingArmour armour, int receivedDamage)
|
||||
{
|
||||
changeMap.put(armour, changeMap.containsKey(armour) ? changeMap.get(armour) + receivedDamage : receivedDamage);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getUniqueIdentifier()
|
||||
{
|
||||
return Constants.Mod.MODID + ".tracker.repair";
|
||||
}
|
||||
|
||||
@Override
|
||||
public void resetTracker()
|
||||
{
|
||||
this.totalDamage = 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readFromNBT(NBTTagCompound tag)
|
||||
{
|
||||
totalDamage = tag.getDouble(Constants.Mod.MODID + ".tracker.repair");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound tag)
|
||||
{
|
||||
tag.setDouble(Constants.Mod.MODID + ".tracker.repair", totalDamage);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onTick(World world, EntityPlayer player, LivingArmour livingArmour)
|
||||
{
|
||||
if (changeMap.containsKey(livingArmour))
|
||||
{
|
||||
double change = Math.abs(changeMap.get(livingArmour));
|
||||
if (change > 0)
|
||||
{
|
||||
totalDamage += 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 (totalDamage >= damageRequired[i])
|
||||
{
|
||||
upgradeList.add(new LivingArmourUpgradeRepairing(i));
|
||||
}
|
||||
}
|
||||
|
||||
return upgradeList;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getProgress(LivingArmour livingArmour, int currentLevel)
|
||||
{
|
||||
return Utils.calculateStandardProgress(totalDamage, damageRequired, currentLevel);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean providesUpgrade(String key)
|
||||
{
|
||||
return key.equals(Constants.Mod.MODID + ".upgrade.repair");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onArmourUpgradeAdded(LivingArmourUpgrade upgrade)
|
||||
{
|
||||
if (upgrade instanceof LivingArmourUpgradeRepairing)
|
||||
{
|
||||
int level = upgrade.getUpgradeLevel();
|
||||
if (level < damageRequired.length)
|
||||
{
|
||||
totalDamage = Math.max(totalDamage, damageRequired[level]);
|
||||
this.markDirty();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,130 @@
|
|||
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;
|
||||
}
|
||||
}
|
||||
|
|
@ -59,7 +59,6 @@ public class StatTrackerMeleeDecrease extends StatTracker
|
|||
if (change > 0)
|
||||
{
|
||||
totalDamageDealt += Math.abs(changeMap.get(livingArmour));
|
||||
System.out.println(totalDamageDealt);
|
||||
changeMap.put(livingArmour, 0d);
|
||||
|
||||
this.markDirty();
|
||||
|
|
|
|||
|
|
@ -0,0 +1,129 @@
|
|||
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;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,87 @@
|
|||
package WayofTime.bloodmagic.livingArmour.upgrade;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.EntityEquipmentSlot;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.world.World;
|
||||
import WayofTime.bloodmagic.api.Constants;
|
||||
import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
|
||||
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
|
||||
|
||||
public class LivingArmourUpgradeRepairing extends LivingArmourUpgrade
|
||||
{
|
||||
public static final int[] costs = new int[] { 15 };
|
||||
public static final int[] repairDelay = new int[] { 200 };
|
||||
|
||||
int maxRepair = 1;
|
||||
|
||||
int delay = 0;
|
||||
|
||||
public LivingArmourUpgradeRepairing(int level)
|
||||
{
|
||||
super(level);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour)
|
||||
{
|
||||
if (delay <= 0)
|
||||
{
|
||||
delay = repairDelay[this.level];
|
||||
|
||||
EntityEquipmentSlot randomSlot = EntityEquipmentSlot.values()[2 + world.rand.nextInt(4)];
|
||||
ItemStack repairStack = player.getItemStackFromSlot(randomSlot);
|
||||
if (repairStack != null)
|
||||
{
|
||||
if (repairStack.isItemStackDamageable() && repairStack.isItemDamaged())
|
||||
{
|
||||
int toRepair = Math.min(maxRepair, repairStack.getItemDamage());
|
||||
if (toRepair > 0)
|
||||
{
|
||||
repairStack.setItemDamage(repairStack.getItemDamage() - toRepair);
|
||||
}
|
||||
}
|
||||
}
|
||||
} else
|
||||
{
|
||||
delay--;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getUniqueIdentifier()
|
||||
{
|
||||
return Constants.Mod.MODID + ".upgrade.repair";
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMaxTier()
|
||||
{
|
||||
return 1; // Set to here until I can add more upgrades to it.
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getCostOfUpgrade()
|
||||
{
|
||||
return costs[this.level];
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound tag)
|
||||
{
|
||||
tag.setInteger("repairingDelay", delay);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readFromNBT(NBTTagCompound tag)
|
||||
{
|
||||
delay = tag.getInteger("repairingDelay");
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getUnlocalizedName()
|
||||
{
|
||||
return tooltipBase + "repair";
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue