Eradicating Pair: CoolDamageEntry

shoftee · shoftee · commit 0a001e8fa88e · 2012-09-16T15:36:59.000+03:00
diff --git a/src/server/life/CoolDamageEntry.java b/src/server/life/CoolDamageEntry.java
@@ -0,0 +1,11 @@
+package server.life;
+
+public class CoolDamageEntry {
+	public final int damage;
+	public final int probability;
+
+	public CoolDamageEntry(int damage, int probability) {
+		this.damage = damage;
+		this.probability = probability;
+	}
+}
diff --git a/src/server/life/MapleLifeFactory.java b/src/server/life/MapleLifeFactory.java
@@ -32,7 +32,6 @@ License, or (at your option) any later version.
 import provider.MapleDataTool;
 import provider.wz.MapleDataType;
 import tools.Output;
-import tools.Pair;
 import tools.StringUtil;
 
 public class MapleLifeFactory {
@@ -81,7 +80,7 @@ public static MapleMonster getMonster(int mid) {
 			if (special != null) {
 				int coolDmg = MapleDataTool.getIntConvert("coolDamage", monsterInfoData);
 				int coolProb = MapleDataTool.getIntConvert("coolDamageProb", monsterInfoData, 0);
-				stats.setCool(new Pair<Integer, Integer>(coolDmg, coolProb));
+				stats.setCool(new CoolDamageEntry(coolDmg, coolProb));
 			}
 			special = monsterInfoData.getChildByPath("loseItem");
 			if (special != null) {
diff --git a/src/server/life/MapleMonsterStats.java b/src/server/life/MapleMonsterStats.java
@@ -29,7 +29,6 @@ License, or (at your option) any later version.
 import server.life.MapleLifeFactory.BanishInfo;
 import server.life.MapleLifeFactory.loseItem;
 import server.life.MapleLifeFactory.selfDestruction;
-import tools.Pair;
 
 /**
  * @author Frz
@@ -45,7 +44,7 @@ public class MapleMonsterStats {
 	private List<Integer> revives = Collections.emptyList();
 	private byte tagColor, tagBgColor;
 	private List<MobSkillEntry> skills = new ArrayList<MobSkillEntry>();
-	private Pair<Integer, Integer> cool = null;
+	private CoolDamageEntry cool = null;
 	private BanishInfo banish = null;
 	private List<loseItem> loseItem = null;
 	private selfDestruction selfDestruction = null;
@@ -285,11 +284,11 @@ public boolean removeOnMiss() {
 		return removeOnMiss;
 	}
 
-	public void setCool(Pair<Integer, Integer> cool) {
+	public void setCool(CoolDamageEntry cool) {
 		this.cool = cool;
 	}
 
-	public Pair<Integer, Integer> getCool() {
+	public CoolDamageEntry getCool() {
 		return cool;
 	}
 }
diff --git a/src/server/maps/MapleMap.java b/src/server/maps/MapleMap.java
@@ -71,13 +71,13 @@ License, or (at your option) any later version.
 import server.events.gm.MapleSnowball;
 import server.partyquest.MonsterCarnival;
 import server.partyquest.MonsterCarnivalParty;
+import server.life.CoolDamageEntry;
 import server.life.MapleLifeFactory;
 import server.life.MapleLifeFactory.selfDestruction;
 import server.life.MapleMonsterInformationProvider;
 import server.life.MonsterDropEntry;
 import server.life.MonsterGlobalDropEntry;
 import server.partyquest.Pyramid;
-import tools.Pair;
 
 public class MapleMap {
 
@@ -508,13 +508,13 @@ public boolean damageMonster(final MapleCharacter chr, final MapleMonster monste
 				if (!monster.isAlive()) {
 					return false;
 				}
-				Pair<Integer, Integer> cool = monster.getStats().getCool();
+				CoolDamageEntry cool = monster.getStats().getCool();
 				if (cool != null) {
 					Pyramid pq = (Pyramid) chr.getPartyQuest();
 					if (pq != null) {
 						if (damage > 0) {
-							if (damage >= cool.getLeft()) {
-								if ((Math.random() * 100) < cool.getRight()) {
+							if (damage >= cool.damage) {
+								if ((Math.random() * 100) < cool.probability) {
 									pq.cool();
 								} else {
 									pq.kill();
