1.9.1

AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http:https://schemas.android.com/apk/res/android"
  package="com.watabou.pixeldungeon"
- android:versionCode="70"
- android:versionName="1.7.5a"
+ android:versionCode="74"
+ android:versionName="1.9.1"
  android:installLocation="auto">
 
  <uses-permission android:name="android.permission.VIBRATE"/>
@@ -24,7 +24,12 @@
  android:icon="@drawable/ic_launcher"
  android:label="@string/app_name"
  android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
- android:allowBackup="false">
+ android:allowBackup="true">
+
+ <meta-data android:name="com.google.android.gms.version"
+ android:value="@integer/google_play_services_version" />
+ <meta-data android:name="com.google.android.gms.appstate.APP_ID"
+ android:value="@string/app_id" />
 
  <activity
  android:label="@string/app_name"

src/com/watabou/pixeldungeon/Assets.java

@@ -25,6 +25,7 @@ public class Assets {
 
  public static final String BANNERS = "banners.png";
  public static final String BADGES = "badges.png";
+ public static final String LOCKED = "locked_badge.png";
  public static final String AMULET = "amulet.png";
 
  public static final String CHROME = "chrome.png";

src/com/watabou/pixeldungeon/Badges.java

@@ -408,19 +408,19 @@ public static void validateItemLevelAquired( Item item ) {
 
  Badge badge = null;
 
- if (!local.contains( Badge.ITEM_LEVEL_1 ) && item.level >= 3) {
+ if (!local.contains( Badge.ITEM_LEVEL_1 ) && item.level() >= 3) {
  badge = Badge.ITEM_LEVEL_1;
  local.add( badge );
  }
- if (!local.contains( Badge.ITEM_LEVEL_2 ) && item.level >= 6) {
+ if (!local.contains( Badge.ITEM_LEVEL_2 ) && item.level() >= 6) {
  badge = Badge.ITEM_LEVEL_2;
  local.add( badge );
  }
- if (!local.contains( Badge.ITEM_LEVEL_3 ) && item.level >= 9) {
+ if (!local.contains( Badge.ITEM_LEVEL_3 ) && item.level() >= 9) {
  badge = Badge.ITEM_LEVEL_3;
  local.add( badge );
  }
- if (!local.contains( Badge.ITEM_LEVEL_4 ) && item.level >= 12) {
+ if (!local.contains( Badge.ITEM_LEVEL_4 ) && item.level() >= 12) {
  badge = Badge.ITEM_LEVEL_4;
  local.add( badge );
  }
@@ -892,11 +892,11 @@ public static List<Badge> filtered( boolean global ) {
 
  HashSet<Badge> filtered = new HashSet<Badge>( global ? Badges.global : Badges.local );
 
- if (!global) {
+ {
  Iterator<Badge> iterator = filtered.iterator();
  while (iterator.hasNext()) {
  Badge badge = iterator.next();
- if (badge.meta) {
+ if ((!global && badge.meta) || badge.image == -1) {
  iterator.remove();
  }
  }
@@ -915,7 +915,13 @@ public static List<Badge> filtered( boolean global ) {
  leaveBest( filtered, Badge.DEATH_FROM_GAS, Badge.YASD );
  leaveBest( filtered, Badge.DEATH_FROM_HUNGER, Badge.YASD );
  leaveBest( filtered, Badge.DEATH_FROM_POISON, Badge.YASD );
+ leaveBest( filtered, Badge.ALL_POTIONS_IDENTIFIED, Badge.ALL_ITEMS_IDENTIFIED );
+ leaveBest( filtered, Badge.ALL_SCROLLS_IDENTIFIED, Badge.ALL_ITEMS_IDENTIFIED );
+ leaveBest( filtered, Badge.ALL_RINGS_IDENTIFIED, Badge.ALL_ITEMS_IDENTIFIED );
+ leaveBest( filtered, Badge.ALL_WANDS_IDENTIFIED, Badge.ALL_ITEMS_IDENTIFIED );
  leaveBest( filtered, Badge.VICTORY, Badge.VICTORY_ALL_CLASSES );
+ leaveBest( filtered, Badge.VICTORY, Badge.HAPPY_END );
+ leaveBest( filtered, Badge.VICTORY, Badge.CHAMPION );
  leaveBest( filtered, Badge.GAMES_PLAYED_1, Badge.GAMES_PLAYED_2, Badge.GAMES_PLAYED_3, Badge.GAMES_PLAYED_4 );
 
  ArrayList<Badge> list = new ArrayList<Badge>( filtered );

src/com/watabou/pixeldungeon/Bones.java

@@ -105,8 +105,8 @@ public static Item get() {
  item.cursedKnown = true;
  if (item.isUpgradable()) {
  int lvl = (Dungeon.depth - 1) * 3 / 5 + 1;
- if (lvl < item.level) {
- item.degrade( item.level - lvl );
+ if (lvl < item.level()) {
+ item.degrade( item.level() - lvl );
  }
  item.levelKnown = false;
  }

src/com/watabou/pixeldungeon/Chrome.java

@@ -42,7 +42,7 @@ public static NinePatch get( Type type ) {
  case TOAST_TR:
  return new NinePatch( Assets.CHROME, 40, 0, 18, 18, 5 );
  case BUTTON:
- return new NinePatch( Assets.CHROME, 58, 0, 4, 4, 1 );
+ return new NinePatch( Assets.CHROME, 58, 0, 6, 6, 2 );
  case TAG:
  return new NinePatch( Assets.CHROME, 22, 18, 16, 14, 3 );
  case SCROLL:

src/com/watabou/pixeldungeon/Dungeon.java

@@ -30,6 +30,7 @@
 import com.watabou.pixeldungeon.actors.Char;
 import com.watabou.pixeldungeon.actors.buffs.Amok;
 import com.watabou.pixeldungeon.actors.buffs.Light;
+import com.watabou.pixeldungeon.actors.buffs.Rage;
 import com.watabou.pixeldungeon.actors.hero.Hero;
 import com.watabou.pixeldungeon.actors.hero.HeroClass;
 import com.watabou.pixeldungeon.actors.mobs.npcs.Blacksmith;
@@ -75,7 +76,6 @@ public class Dungeon {
  public static int scrollsOfUpgrade;
  public static int scrollsOfEnchantment;
  public static boolean dewVial; // true if the dew vial can be spawned
- public static int transmutation; // depth number for a well of transmutation
 
  public static int challenges;
 
@@ -121,7 +121,6 @@ public static void init() {
  scrollsOfUpgrade = 0;
  scrollsOfEnchantment = 0;
  dewVial = true;
- transmutation = Random.IntRange( 6, 14 );
 
  chapters = new HashSet<Integer>();
 
@@ -331,7 +330,6 @@ private static boolean chance( int[] quota, int number ) {
  private static final String SOU = "scrollsOfEnhancement";
  private static final String SOE = "scrollsOfEnchantment";
  private static final String DV = "dewVial";
- private static final String WT = "transmutation";
  private static final String CHAPTERS = "chapters";
  private static final String QUESTS = "quests";
  private static final String BADGES = "badges";
@@ -380,7 +378,6 @@ public static void saveGame( String fileName ) throws IOException {
  bundle.put( SOU, scrollsOfUpgrade );
  bundle.put( SOE, scrollsOfEnchantment );
  bundle.put( DV, dewVial );
- bundle.put( WT, transmutation );
 
  int count = 0;
  int ids[] = new int[chapters.size()];
@@ -478,7 +475,6 @@ public static void loadGame( String fileName, boolean fullLoad ) throws IOExcept
  scrollsOfUpgrade = bundle.getInt( SOU );
  scrollsOfEnchantment = bundle.getInt( SOE );
  dewVial = bundle.getBoolean( DV );
- transmutation = bundle.getInt( WT );
 
  if (fullLoad) {
  chapters = new HashSet<Integer>();
@@ -625,7 +621,7 @@ public static int findPath( Char ch, int from, int to, boolean pass[], boolean[]
  return Actor.findChar( to ) == null && (pass[to] || Level.avoid[to]) ? to : -1;
  }
 
- if (ch.flying || ch.buff( Amok.class ) != null) {
+ if (ch.flying || ch.buff( Amok.class ) != null || ch.buff( Rage.class ) != null) {
  BArray.or( pass, Level.avoid, passable );
  } else {
  System.arraycopy( pass, 0, passable, 0, Level.LENGTH );

src/com/watabou/pixeldungeon/Journal.java

@@ -28,6 +28,7 @@ public static enum Feature {
  WELL_OF_HEALTH ( "Well of Health" ),
  WELL_OF_AWARENESS ( "Well of Awareness" ),
  WELL_OF_TRANSMUTATION ( "Well of Transmutation" ),
+ SACRIFICIAL_FIRE ( "Sacrificial chamber" ),
  ALCHEMY ( "Alchemy pot" ),
  GARDEN ( "Garden" ),
  STATUE ( "Animated statue" ),

src/com/watabou/pixeldungeon/PixelDungeon.java

@@ -48,7 +48,7 @@ public PixelDungeon() {
  com.watabou.pixeldungeon.items.rings.RingOfMending.class, 
  "com.watabou.pixeldungeon.items.rings.RingOfRejuvenation" );
  com.watabou.utils.Bundle.addAlias( 
- com.watabou.pixeldungeon.items.wands.WandOfTelekinesis.class, 
+ com.watabou.pixeldungeon.items.wands.WandOfReach.class, 
  "com.watabou.pixeldungeon.items.wands.WandOfTelekenesis" );
  com.watabou.utils.Bundle.addAlias( 
  com.watabou.pixeldungeon.actors.blobs.Foliage.class, 
@@ -71,7 +71,7 @@ public PixelDungeon() {
  "com.watabou.pixeldungeon.items.DriedRose" );
  com.watabou.utils.Bundle.addAlias( 
  com.watabou.pixeldungeon.actors.mobs.npcs.MirrorImage.class,
- "com.watabou.pixeldungeon.items.scrolls.ScrollOfMirrorImage.MirrorImage" );
+ "com.watabou.pixeldungeon.items.scrolls.ScrollOfMirrorImage$MirrorImage" );
  // 1.6.4
  com.watabou.utils.Bundle.addAlias( 
  com.watabou.pixeldungeon.items.rings.RingOfElements.class,
@@ -106,6 +106,20 @@ public PixelDungeon() {
  com.watabou.utils.Bundle.addAlias( 
  com.watabou.pixeldungeon.items.scrolls.ScrollOfEnchantment.class,
  "com.watabou.pixeldungeon.items.Stylus" );
+ // 1.8.0
+ com.watabou.utils.Bundle.addAlias( 
+ com.watabou.pixeldungeon.actors.mobs.FetidRat.class,
+ "com.watabou.pixeldungeon.actors.mobs.npcs.Ghost$FetidRat" );
+ com.watabou.utils.Bundle.addAlias( 
+ com.watabou.pixeldungeon.plants.Rotberry.class,
+ "com.watabou.pixeldungeon.actors.mobs.npcs.Wandmaker$Rotberry" );
+ com.watabou.utils.Bundle.addAlias( 
+ com.watabou.pixeldungeon.plants.Rotberry.Seed.class,
+ "com.watabou.pixeldungeon.actors.mobs.npcs.Wandmaker$Rotberry$Seed" );
+ // 1.9.0
+ com.watabou.utils.Bundle.addAlias( 
+ com.watabou.pixeldungeon.items.wands.WandOfReach.class,
+ "com.watabou.pixeldungeon.items.wands.WandOfTelekinesis" );
  }
 
  @Override

src/com/watabou/pixeldungeon/Rankings.java

@@ -97,7 +97,7 @@ public void submit( boolean win ) {
  }
 
  private int score( boolean win ) {
- return (Statistics.goldCollected + Dungeon.hero.lvl * Dungeon.depth * 100) * (win ? 2 : 1);
+ return (Statistics.goldCollected + Dungeon.hero.lvl * Statistics.deepestFloor * 100) * (win ? 2 : 1);
  }
 
  private static final String RECORDS = "records";

src/com/watabou/pixeldungeon/ResultDescriptions.java

@@ -26,6 +26,7 @@ public class ResultDescriptions {
  // Items
  public static final String WAND = "Killed by your own %s on level %d";
  public static final String GLYPH = "Killed by the %s on level %d";
+ public static final String BOMB = "Killed by an explosion of a bomb on level %d";
 
  // Dungeon features
  public static final String TRAP = "Killed by discharge of %s on level %d";

src/com/watabou/pixeldungeon/actors/blobs/Fire.java

@@ -26,7 +26,6 @@
 import com.watabou.pixeldungeon.effects.particles.FlameParticle;
 import com.watabou.pixeldungeon.items.Heap;
 import com.watabou.pixeldungeon.levels.Level;
-import com.watabou.pixeldungeon.levels.Terrain;
 import com.watabou.pixeldungeon.scenes.GameScene;
 
 public class Fire extends Blob {
@@ -53,7 +52,7 @@ protected void evolve() {
  if (fire <= 0 && flamable[pos]) {
 
  int oldTile = Dungeon.level.map[pos];
- Level.set( pos, Terrain.EMBERS );
+ Dungeon.level.destroy( pos );
 
  observe = true;
  GameScene.updateMap( pos );