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

Added speed upgrades to Living Armour

Browse source
This commit is contained in:
WayofTime 2016-01-03 14:12:55 -05:00
parent 81edc58769
commit f0331b4d4d
4 changed files with 144 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,6 +2,7 @@ package WayofTime.bloodmagic.livingArmour;
import java.lang.reflect.Constructor;
import java.util.HashMap;
import java.util.List;
import java.util.Map.Entry;
import net.minecraft.entity.ai.attributes.AttributeModifier;
@ -21,6 +22,9 @@ public class LivingArmour
public HashMap<String, StatTracker> trackerMap = new HashMap<String, StatTracker>();
public HashMap<String, LivingArmourUpgrade> upgradeMap = new HashMap<String, LivingArmourUpgrade>();
public int maxUpgradePoints = 100;
public int totalUpgradePoints = 0;
public Multimap<String, AttributeModifier> getAttributeModifiers()
{
HashMultimap<String, AttributeModifier> modifierMap = HashMultimap.<String, AttributeModifier>create();
@ -28,12 +32,54 @@ public class LivingArmour
for (Entry<String, LivingArmourUpgrade> entry : upgradeMap.entrySet())
{
LivingArmourUpgrade upgrade = entry.getValue();
if (upgrade == null)
{
continue;
}
modifierMap.putAll(upgrade.getAttributeModifiers());
}
return modifierMap;
}
public boolean upgradeArmour(EntityPlayer user, LivingArmourUpgrade upgrade)
{
String key = upgrade.getUniqueIdentifier();
if (upgradeMap.containsKey(key))
{
//Check if this is a higher level than the previous upgrade
int nextLevel = upgrade.getUpgradeLevel();
int currentLevel = upgradeMap.get(key).getUpgradeLevel();
if (nextLevel > currentLevel)
{
int upgradePointDifference = upgrade.getCostOfUpgrade() - upgradeMap.get(key).getCostOfUpgrade();
if (upgradePointDifference >= 0 && totalUpgradePoints + upgradePointDifference <= maxUpgradePoints)
{
upgradeMap.put(key, upgrade);
notifyPlayerOfUpgrade(user, upgrade);
return true;
}
}
} else
{
int upgradePoints = upgrade.getCostOfUpgrade();
if (totalUpgradePoints + upgradePoints <= maxUpgradePoints)
{
upgradeMap.put(key, upgrade);
notifyPlayerOfUpgrade(user, upgrade);
return true;
}
}
return false;
}
public void notifyPlayerOfUpgrade(EntityPlayer user, LivingArmourUpgrade upgrade)
{
System.out.println("Upgraded!");
}
/**
* Ticks the upgrades and stat trackers, passing in the world and player as
* well as the LivingArmour
@ -64,8 +110,15 @@ public class LivingArmour
continue;
}
tracker.onTick(world, player, this); // TODO: Check if the upgrades
// need to be updated.
if (tracker.onTick(world, player, this))
{
List<LivingArmourUpgrade> upgradeList = tracker.getUpgrades();
for (LivingArmourUpgrade upgrade : upgradeList) //TODO: make a getNextUpgrade?
{
upgradeArmour(player, upgrade);
}
}
}
}
@ -80,7 +133,12 @@ public class LivingArmour
String key = upgradeTag.getString("key");
int level = upgradeTag.getInteger("level");
NBTTagCompound nbtTag = upgradeTag.getCompoundTag("upgrade");
LivingArmourHandler.generateUpgradeFromKey(key, level, nbtTag);
LivingArmourUpgrade upgrade = LivingArmourHandler.generateUpgradeFromKey(key, level, nbtTag);
if (upgrade != null)
{
upgradeMap.put(key, upgrade);
totalUpgradePoints += upgrade.getCostOfUpgrade();
}
}
}