Merging 1.9.1 source: level changes

Differences:
- Altar room turned off for now
- Keep the guaranteed transmutation well
This commit is contained in:
Evan Debenham
2015-11-09 15:23:22 -05:00
committed by Evan Debenham
parent d894c7297f
commit 648246641a
12 changed files with 109 additions and 18 deletions
@@ -77,7 +77,7 @@ public class DisintegrationTrap extends Trap {
bag = (Bag)item;
item = Random.element(bag.items);
}
if (item.level > 0 || item.unique) return;
if (item.level() > 0 || item.unique) return;
if (!item.stackable){
item.detachAll(bag);
GLog.w("the trap disintegrates your " + item.name() + "!");