Merge remote-tracking branch 'origin/master'

This commit is contained in:
Evan Debenham 2014-11-24 16:49:13 -05:00
commit 2ab55e2417

View File

@ -137,7 +137,7 @@ public class TalismanOfForesight extends Artifact {
} }
} }
if (smthFound == true || !cursed){ if (smthFound == true && !cursed){
if (warn == 0){ if (warn == 0){
GLog.w("You feel uneasy."); GLog.w("You feel uneasy.");
if (target instanceof Hero){ if (target instanceof Hero){