Merging 1.7.5 Source: core changes

This commit is contained in:
Evan Debenham
2015-02-04 16:21:42 -05:00
parent 12b647959c
commit a2670f2a36
7 changed files with 132 additions and 111 deletions
@@ -25,18 +25,20 @@ public class Challenges {
public static final int NO_HERBALISM = 8;
public static final int SWARM_INTELLIGENCE = 16;
public static final int DARKNESS = 32;
public static final int NO_SCROLLS = 64;
public static final String[] NAMES = {
"No food",
"No armors",
"No healing potions",
"No dew, no seeds",
"Swarm intelligence",
"Darkness"
"On diet",
"Faith is my armor",
"Pharmacophobia",
"Barren land",
"Swarm intelligence",
"Into darkness",
"Forbidden runes"
};
public static final int[] MASKS = {
NO_FOOD, NO_ARMOR, NO_HEALING, NO_HERBALISM, SWARM_INTELLIGENCE, DARKNESS
NO_FOOD, NO_ARMOR, NO_HEALING, NO_HERBALISM, SWARM_INTELLIGENCE, DARKNESS, NO_SCROLLS
};
}