TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-02-18 22:24:35 +00:00
Code Issues Projects Releases Wiki Activity

Improve ComboManager Efficiency

Browse source
This commit is contained in:
Nathan Braun 2015-08-20 16:22:02 -07:00
parent 7680a468d3
commit 2e5312fb1f
1 changed files with 34 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/com/projectkorra/projectkorra/ability/combo/ComboManager.java
View file

@ -123,11 +123,16 @@ public class ComboManager {
descriptions.put("IceWave", "PhaseChange your WaterWave into an IceWave that freezes and damages enemies."); descriptions.put("IceWave", "PhaseChange your WaterWave into an IceWave that freezes and damages enemies.");
instructions.put("IceWave", "Create a WaterSpout Wave > PhaseChange (Left Click)"); instructions.put("IceWave", "Create a WaterSpout Wave > PhaseChange (Left Click)");
/*ArrayList<AbilityInformation> icePillar = new ArrayList<AbilityInformation>(); /*
icePillar.add(new AbilityInformation("IceSpike", ClickType.LEFT_CLICK)); * ArrayList<AbilityInformation> icePillar = new
icePillar.add(new AbilityInformation("IceSpike", ClickType.LEFT_CLICK)); * ArrayList<AbilityInformation>(); icePillar.add(new
icePillar.add(new AbilityInformation("WaterSpout", ClickType.LEFT_CLICK)); * AbilityInformation("IceSpike", ClickType.LEFT_CLICK));
comboAbilityList.add(new ComboAbility("IcePillar", icePillar, WaterCombo.class));*/ * icePillar.add(new AbilityInformation("IceSpike",
* ClickType.LEFT_CLICK)); icePillar.add(new
* AbilityInformation("WaterSpout", ClickType.LEFT_CLICK));
* comboAbilityList.add(new ComboAbility("IcePillar", icePillar,
* WaterCombo.class));
*/
ArrayList<AbilityInformation> iceBullet = new ArrayList<AbilityInformation>(); ArrayList<AbilityInformation> iceBullet = new ArrayList<AbilityInformation>();
iceBullet.add(new AbilityInformation("WaterBubble", ClickType.SHIFT_DOWN)); iceBullet.add(new AbilityInformation("WaterBubble", ClickType.SHIFT_DOWN));
@ -219,18 +224,18 @@ public class ComboManager {
Enumeration<String> keys = recentlyUsedAbilities.keys(); Enumeration<String> keys = recentlyUsedAbilities.keys();
while (keys.hasMoreElements()) { while (keys.hasMoreElements()) {
String name = keys.nextElement(); String name = keys.nextElement();
ArrayList<AbilityInformation> combos = recentlyUsedAbilities.get(name); ArrayList<AbilityInformation> usedAbilities = recentlyUsedAbilities.get(name);
ArrayList<AbilityInformation> stillValidAbilities = new ArrayList<AbilityInformation>();
recentlyUsedAbilities.remove(name); recentlyUsedAbilities.remove(name);
for (int i = 0; i < combos.size(); i++) {
AbilityInformation info = combos.get(i); for (AbilityInformation info : usedAbilities) {
if (System.currentTimeMillis() - info.getTime() > CLEANUP_DELAY) { if (System.currentTimeMillis() - info.getTime() <= CLEANUP_DELAY) {
combos.remove(i); stillValidAbilities.add(info);
i--;
} }
} }
if (combos.size() > 0) if (stillValidAbilities.size() > 0)
recentlyUsedAbilities.put(name, combos); recentlyUsedAbilities.put(name, stillValidAbilities);
} }
} }
@ -252,7 +257,8 @@ public class ComboManager {
public static ArrayList<String> getCombosForElement(Element element) { public static ArrayList<String> getCombosForElement(Element element) {
ArrayList<String> list = new ArrayList<String>(); ArrayList<String> list = new ArrayList<String>();
for (ComboAbility comboab : comboAbilityList) { for (ComboAbility comboab : comboAbilityList) {
if (GeneralMethods.getComboElement(comboab.getName()) == element && descriptions.containsKey(comboab.getName())) list.add(comboab.getName()); if (GeneralMethods.getComboElement(comboab.getName()) == element && descriptions.containsKey(comboab.getName()))
list.add(comboab.getName());
} }
Collections.sort(list); Collections.sort(list);
return list; return list;
@ -263,7 +269,7 @@ public class ComboManager {
public void run() { public void run() {
cleanupOldCombos(); cleanupOldCombos();
} }
}.runTaskTimer(ProjectKorra.plugin, 0, CLEANUP_DELAY); }.runTaskTimer(ProjectKorra.plugin, 0, CLEANUP_DELAY / 1000 * 20);
} }
public static class AbilityInformation { public static class AbilityInformation {