From 71e78f23c4d3b356570a26327fb93725370cc306 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Tue, 22 Sep 2015 03:19:36 -0400
Subject: [PATCH] v0.3.2: tome of mastery is no longer given at level 1 once
 unlocked

---
 .../actors/hero/HeroClass.java                 |  6 ------
 .../actors/mobs/Tengu.java                     | 18 ++----------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java
index c9494af21..40f04794c 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java
@@ -25,7 +25,6 @@ import com.shatteredpixel.shatteredpixeldungeon.Badges;
 import com.shatteredpixel.shatteredpixeldungeon.Challenges;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
 import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
-import com.shatteredpixel.shatteredpixeldungeon.items.TomeOfMastery;
 import com.shatteredpixel.shatteredpixeldungeon.items.armor.ClothArmor;
 import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.CloakOfShadows;
 import com.shatteredpixel.shatteredpixeldungeon.items.food.Food;
@@ -33,7 +32,6 @@ import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfMindVision
 import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfStrength;
 import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMagicMapping;
 import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade;
-import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfFireblast;
 import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MagesStaff;
 import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfMagicMissile;
 import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.Dagger;
@@ -110,10 +108,6 @@ public enum HeroClass {
 				break;
 		}
 
-		if (Badges.isUnlocked( masteryBadge() )) {
-			new TomeOfMastery().collect();
-		}
-
 		hero.updateAwareness();
 	}
 
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java
index c527c04cf..e24ee09fb 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java
@@ -22,6 +22,7 @@ package com.shatteredpixel.shatteredpixeldungeon.actors.mobs;
 
 import java.util.HashSet;
 
+import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass;
 import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.LloydsBeacon;
 import com.shatteredpixel.shatteredpixeldungeon.levels.traps.PoisonTrap;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BossHealthBar;
@@ -83,22 +84,7 @@ public class Tengu extends Mob {
 	@Override
 	public void die( Object cause ) {
 		
-		Badges.Badge badgeToCheck = null;
-		switch (Dungeon.hero.heroClass) {
-		case WARRIOR:
-			badgeToCheck = Badge.MASTERY_WARRIOR;
-			break;
-		case MAGE:
-			badgeToCheck = Badge.MASTERY_MAGE;
-			break;
-		case ROGUE:
-			badgeToCheck = Badge.MASTERY_ROGUE;
-			break;
-		case HUNTRESS:
-			badgeToCheck = Badge.MASTERY_HUNTRESS;
-			break;
-		}
-		if (!Badges.isUnlocked( badgeToCheck )) {
+		if (Dungeon.hero.subClass == HeroSubClass.NONE) {
 			Dungeon.level.drop( new TomeOfMastery(), pos ).sprite.drop();
 		}