diff --git a/core/src/main/assets/messages/actors/actors.properties b/core/src/main/assets/messages/actors/actors.properties index 12fe2d353..9edd78583 100644 --- a/core/src/main/assets/messages/actors/actors.properties +++ b/core/src/main/assets/messages/actors/actors.properties @@ -491,13 +491,13 @@ actors.hero.hero.revive=The ankh explodes with life-giving energy! actors.hero.heroclass.warrior=warrior actors.hero.heroclass.warrior_desc_innate=The Warrior starts with a _unique broken seal,_ which he can affix to armor. He will slowly generate shielding over his health while he is wearing armor with the seal affixed.\n\nThe Warrior's seal can be moved between different armor sets, transferring a single upgrade with it.\n\nThe Warrior automatically identifies:\n- Scrolls of Identify\n- Potions of Healing\n- Scrolls of Rage -actors.hero.heroclass.warrior_desc_loadout=The Warrior starts with a _worn shortsword,_ which offers more direct damage than other starter weapons.\n\nThe Warrior starts with _three throwing stones,_ which offer limited ranged damage.\n\nThe Warrior starts with a _potion bandolier,_ which can store various potions and protect them from the cold. +actors.hero.heroclass.warrior_desc_loadout=The Warrior starts with a _worn shortsword,_ which offers more direct damage than other starter weapons.\n\nThe Warrior starts with _three throwing stones,_ which offer limited ranged damage.\n\nThe Warrior starts with a _velvet pouch,_ which can store small items like seeds and runestones. actors.hero.heroclass.warrior_desc_subclasses=A subclass can be chosen after defeating the second boss. The Warrior has two subclasses: actors.hero.heroclass.mage=mage actors.hero.heroclass.mage_unlock=The Mage is an expert with wands, and carries a _unique magical staff._\n\nTo unlock him _use a scroll of upgrade to make an item stronger._ actors.hero.heroclass.mage_desc_innate=The Mage starts with a _unique staff_ of magic missile. The staff recharges significantly faster than a wand, and has 1 more maximum charge.\n\nThe Mage's staff can be imbued with any wand he finds in the dungeon. Imbuing changes the staff's effect and can be used to transfer some upgrades.\n\nThe Mage automatically identifies:\n- Scrolls of Identify\n- Potions of Liquid Flame\n- Scrolls of Upgrade -actors.hero.heroclass.mage_desc_loadout=The Mage starts with his staff as his melee weapon. The staff deals less melee damage than other starter weapons.\n\nThe Mage can use the magic in his staff to attack at range.\n\nThe Mage starts with a _scroll holder,_ which can store various scrolls and protect them from fire. +actors.hero.heroclass.mage_desc_loadout=The Mage starts with his staff as his melee weapon. The staff deals less melee damage than other starter weapons.\n\nThe Mage can use the magic in his staff to attack at range.\n\nThe Mage starts with a _velvet pouch,_ which can store small items like seeds and runestones. actors.hero.heroclass.mage_desc_subclasses=A subclass can be chosen after defeating the second boss. The Mage has two subclasses: actors.hero.heroclass.rogue=rogue diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java index 6aa6347b8..59929a215 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java @@ -29,8 +29,6 @@ import com.shatteredpixel.shatteredpixeldungeon.items.BrokenSeal; import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.armor.ClothArmor; import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.CloakOfShadows; -import com.shatteredpixel.shatteredpixeldungeon.items.bags.PotionBandolier; -import com.shatteredpixel.shatteredpixeldungeon.items.bags.ScrollHolder; import com.shatteredpixel.shatteredpixeldungeon.items.bags.VelvetPouch; import com.shatteredpixel.shatteredpixeldungeon.items.food.Food; import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfHealing; @@ -103,6 +101,9 @@ public enum HeroClass { i = new Food(); if (!Challenges.isItemBlocked(i)) i.collect(); + new VelvetPouch().collect(); + Dungeon.LimitedDrops.VELVET_POUCH.drop(); + new ScrollOfIdentify().identify(); } @@ -131,9 +132,6 @@ public enum HeroClass { hero.belongings.armor.affixSeal(new BrokenSeal()); } - new PotionBandolier().collect(); - Dungeon.LimitedDrops.POTION_BANDOLIER.drop(); - new PotionOfHealing().identify(); new ScrollOfRage().identify(); } @@ -148,9 +146,6 @@ public enum HeroClass { Dungeon.quickslot.setSlot(0, staff); - new ScrollHolder().collect(); - Dungeon.LimitedDrops.SCROLL_HOLDER.drop(); - new ScrollOfUpgrade().identify(); new PotionOfLiquidFlame().identify(); } @@ -168,9 +163,6 @@ public enum HeroClass { Dungeon.quickslot.setSlot(0, cloak); Dungeon.quickslot.setSlot(1, knives); - new VelvetPouch().collect(); - Dungeon.LimitedDrops.VELVET_POUCH.drop(); - new ScrollOfMagicMapping().identify(); new PotionOfInvisibility().identify(); } @@ -183,9 +175,6 @@ public enum HeroClass { Dungeon.quickslot.setSlot(0, bow); - new VelvetPouch().collect(); - Dungeon.LimitedDrops.VELVET_POUCH.drop(); - new PotionOfMindVision().identify(); new ScrollOfLullaby().identify(); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/HeroSelectScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/HeroSelectScene.java index b64c42833..fd8a67488 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/HeroSelectScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/HeroSelectScene.java @@ -407,7 +407,7 @@ public class HeroSelectScene extends PixelScene { case MAGE: tabIcons = new Image[]{ new ItemSprite(ItemSpriteSheet.MAGES_STAFF, null), - new ItemSprite(ItemSpriteSheet.HOLDER, null) + new ItemSprite(ItemSpriteSheet.MAGES_STAFF, null) }; break; case ROGUE: