diff --git a/src/com/bytezone/diskbrowser/applefile/AbstractFile.java b/src/com/bytezone/diskbrowser/applefile/AbstractFile.java index 8a4033e..6e876d0 100755 --- a/src/com/bytezone/diskbrowser/applefile/AbstractFile.java +++ b/src/com/bytezone/diskbrowser/applefile/AbstractFile.java @@ -38,9 +38,10 @@ public abstract class AbstractFile implements DataSource StringBuilder text = new StringBuilder (); text.append ("Name : " + name + "\n\nNo text description"); + if (resourceFork != null) { - text.append ("\n\n"); + text.append ("\n\nResource Fork:\n\n"); text.append (resourceFork); } diff --git a/src/com/bytezone/diskbrowser/wizardry/Monster.java b/src/com/bytezone/diskbrowser/wizardry/Monster.java index 998c6f9..3817abe 100755 --- a/src/com/bytezone/diskbrowser/wizardry/Monster.java +++ b/src/com/bytezone/diskbrowser/wizardry/Monster.java @@ -8,7 +8,7 @@ import com.bytezone.diskbrowser.applefile.AbstractFile; import com.bytezone.diskbrowser.utilities.HexFormatter; // -----------------------------------------------------------------------------------// -class Monster extends AbstractFile implements Comparable +class Monster extends AbstractFile // -----------------------------------------------------------------------------------// { public final String genericName; @@ -45,26 +45,19 @@ class Monster extends AbstractFile implements Comparable public static String[] monsterClass = { "Fighter", "Mage", "Priest", "Thief", "Midget", "Giant", "Mythical", "Dragon", - "Animal", "Were", "Undead", "Demon", "Insect", "Enchanted" }; + "Animal", "Were", "Undead", "Demon", "Insect", "Enchanted" }; - private static int[] experience = { 55, 235, 415, 230, 380, 620, 840, 520, 550, 350, // 00-09 - 475, 515, 920, 600, 735, 520, 795, 780, 990, 795, // 10-19 - 1360, 1320, 1275, 680, 960, 600, 755, 1120, 2075, - 870, // 20-29 - 960, 1120, 1120, 2435, 1080, 2280, 975, 875, 1135, - 1200, // 30-39 - 620, 740, 1460, 1245, 960, 1405, 1040, 1220, 1520, - 1000, // 40-49 - 960, 2340, 2160, 2395, 790, 1140, 1235, 1790, 1720, - 2240, // 50-59 - 1475, 1540, 1720, 1900, 1240, 1220, 1020, 20435, - 5100, 3515, // 60-69 - 2115, 2920, 2060, 2140, 1400, 1640, 1280, 4450, - 42840, 3300, // 70-79 - 40875, 5000, 3300, 2395, 1935, 1600, 3330, 44090, - 40840, 5200, // 80-89 - 4155, 3000, 9200, 3160, 7460, 7320, 15880, 1600, - 2200, 1000, 1900 // 90-100 + private static int[] experience = { // + 55, 235, 415, 230, 380, 620, 840, 520, 550, 350, // 00-09 + 475, 515, 920, 600, 735, 520, 795, 780, 990, 795, // 10-19 + 1360, 1320, 1275, 680, 960, 600, 755, 1120, 2075, 870, // 20-29 + 960, 1120, 1120, 2435, 1080, 2280, 975, 875, 1135, 1200, // 30-39 + 620, 740, 1460, 1245, 960, 1405, 1040, 1220, 1520, 1000, // 40-49 + 960, 2340, 2160, 2395, 790, 1140, 1235, 1790, 1720, 2240, // 50-59 + 1475, 1540, 1720, 1900, 1240, 1220, 1020, 20435, 5100, 3515, // 60-69 + 2115, 2920, 2060, 2140, 1400, 1640, 1280, 4450, 42840, 3300, // 70-79 + 40875, 5000, 3300, 2395, 1935, 1600, 3330, 44090, 40840, 5200, // 80-89 + 4155, 3000, 9200, 3160, 7460, 7320, 15880, 1600, 2200, 1000, 1900 // 90-100 }; // ---------------------------------------------------------------------------------// @@ -287,18 +280,6 @@ class Monster extends AbstractFile implements Comparable return this.monsterID == monsterID; } - // ---------------------------------------------------------------------------------// - @Override - public int compareTo (Monster other) // where is this used? - // ---------------------------------------------------------------------------------// - { - if (this.type == other.type) - return 0; - if (this.type < other.type) - return -1; - return 1; - } - // ---------------------------------------------------------------------------------// @Override public String toString ()