1.7.5

AndroidManifest.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http:https://schemas.android.com/apk/res/android"
  package="com.watabou.pixeldungeon"
- android:versionCode="61"
- android:versionName="1.7.2a"
+ android:versionCode="70"
+ android:versionName="1.7.5a"
  android:installLocation="auto">
 
  <uses-permission android:name="android.permission.VIBRATE"/>
 
  <uses-sdk 
- android:minSdkVersion="8"
- android:targetSdkVersion="19"/>
+ android:minSdkVersion="9"
+ android:targetSdkVersion="20"/>
 
  <uses-feature 
  android:glEsVersion="0x00020000"/>
@@ -25,6 +25,7 @@
  android:label="@string/app_name"
  android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
  android:allowBackup="false">
+
  <activity
  android:label="@string/app_name"
  android:name=".PixelDungeon"

res/values/strings.xml

@@ -3,4 +3,4 @@
 
  <string name="app_name">Pixel Dungeon</string>
 
-</resources>
+</resources>

src/com/watabou/pixeldungeon/Assets.java

@@ -1,6 +1,6 @@
 /*
  * Pixel Dungeon
- * Copyright (C) 2012-2014  Oleg Dolya
+ * Copyright (C) 2012-2015 Oleg Dolya
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,6 +33,7 @@ public class Assets {
  public static final String HP_BAR = "hp_bar.png";
  public static final String XP_BAR = "exp_bar.png";
  public static final String TOOLBAR = "toolbar.png";
+ public static final String SHADOW = "shadow.png";
 
  public static final String WARRIOR = "warrior.png";
  public static final String MAGE = "mage.png";
@@ -83,6 +84,8 @@ public class Assets {
  public static final String TROLL = "blacksmith.png";
  public static final String IMP = "demon.png";
  public static final String RATKING = "ratking.png";
+ public static final String BEE = "bee.png";
+ public static final String MIMIC = "mimic.png";
 
  public static final String ITEMS = "items.png";
  public static final String PLANTS = "plants.png";
@@ -157,4 +160,7 @@ public class Assets {
  public static final String SND_GHOST = "snd_ghost.mp3";
  public static final String SND_SECRET = "snd_secret.mp3";
  public static final String SND_BONES = "snd_bones.mp3";
+ public static final String SND_BEE = "snd_bee.mp3";
+ public static final String SND_DEGRADE = "snd_degrade.mp3";
+ public static final String SND_MIMIC = "snd_mimic.mp3";
 }

src/com/watabou/pixeldungeon/Badges.java

@@ -1,6 +1,6 @@
 /*
  * Pixel Dungeon
- * Copyright (C) 2012-2014  Oleg Dolya
+ * Copyright (C) 2012-2015 Oleg Dolya
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -46,6 +46,7 @@
 import com.watabou.pixeldungeon.scenes.PixelScene;
 import com.watabou.pixeldungeon.utils.GLog;
 import com.watabou.utils.Bundle;
+import com.watabou.utils.Callback;
 
 public class Badges {
 
@@ -75,7 +76,7 @@ public static enum Badge {
  DEATH_FROM_POISON( "Death from poison", 25 ),
  DEATH_FROM_GAS( "Death from toxic gas", 26 ),
  DEATH_FROM_HUNGER( "Death from hunger", 27 ),
- DEATH_FROM_GLYPH( "Death from a glyph", 57 ),
+ DEATH_FROM_GLYPH( "Death from an enchantment", 57 ),
  DEATH_FROM_FALLING( "Death from falling down", 59 ),
  YASD( "Death from fire, poison, toxic gas & hunger", 34, true ),
  BOSS_SLAIN_1_WARRIOR,
@@ -169,6 +170,8 @@ private Badge() {
 
  private static boolean saveNeeded = false;
 
+ public static Callback loadingListener = null;
+
  public static void reset() {
  local.clear();
  loadGlobal();
@@ -225,9 +228,12 @@ public static void loadGlobal() {
  }
 
  public static void saveGlobal() {
+
+ Bundle bundle = null;
+
  if (saveNeeded) {
 
- Bundle bundle = new Bundle();
+ bundle = new Bundle();
  store( bundle, global );
 
  try {
@@ -393,9 +399,9 @@ public static void validatePiranhasKilled() {
  public static void validateItemLevelAquired( Item item ) {
 
  // This method should be called:
- // 1) When an item is obtained (Item.collect)
- // 2) When an item is upgraded (ScrollOfUpgrade, ScrollOfWeaponUpgrade, ShortSword, WandOfMagicMissile)
- // 3) When an item is identified
+ // 1) When an item gets obtained (Item.collect)
+ // 2) When an item gets upgraded (ScrollOfUpgrade, ScrollOfWeaponUpgrade, ShortSword, WandOfMagicMissile)
+ // 3) When an item gets identified
  if (!item.levelKnown) {
  return;
  }

src/com/watabou/pixeldungeon/Bones.java

@@ -1,6 +1,6 @@
 /*
  * Pixel Dungeon
- * Copyright (C) 2012-2014  Oleg Dolya
+ * Copyright (C) 2012-2015 Oleg Dolya
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/com/watabou/pixeldungeon/Challenges.java

@@ -1,6 +1,6 @@
 /*
  * Pixel Dungeon
- * Copyright (C) 2012-2014  Oleg Dolya
+ * Copyright (C) 2012-2015 Oleg Dolya
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,18 +25,20 @@ public class Challenges {
  public static final int NO_HERBALISM = 8;
  public static final int SWARM_INTELLIGENCE = 16;
  public static final int DARKNESS = 32;
+ public static final int NO_SCROLLS = 64;
 
  public static final String[] NAMES = {
- "No food",
- "No armors",
- "No healing potions",
- "No dew, no seeds",
+ "On diet",
+ "Faith is my armor",
+ "Pharmacophobia",
+ "Barren land",
  "Swarm intelligence",
- "Darkness"
+ "Into darkness",
+ "Forbidden runes"
  };
 
  public static final int[] MASKS = {
- NO_FOOD, NO_ARMOR, NO_HEALING, NO_HERBALISM, SWARM_INTELLIGENCE, DARKNESS
+ NO_FOOD, NO_ARMOR, NO_HEALING, NO_HERBALISM, SWARM_INTELLIGENCE, DARKNESS, NO_SCROLLS
  };
 
 }

src/com/watabou/pixeldungeon/Chrome.java

@@ -1,6 +1,6 @@
 /*
  * Pixel Dungeon
- * Copyright (C) 2012-2014  Oleg Dolya
+ * Copyright (C) 2012-2015 Oleg Dolya
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,7 +27,6 @@ public enum Type {
  WINDOW,
  BUTTON,
  TAG,
- GEM,
  SCROLL,
  TAB_SET,
  TAB_SELECTED,
@@ -46,8 +45,6 @@ public static NinePatch get( Type type ) {
  return new NinePatch( Assets.CHROME, 58, 0, 4, 4, 1 );
  case TAG:
  return new NinePatch( Assets.CHROME, 22, 18, 16, 14, 3 );
- case GEM:
- return new NinePatch( Assets.CHROME, 0, 32, 32, 32, 13 );
  case SCROLL:
  return new NinePatch( Assets.CHROME, 32, 32, 32, 32, 5, 11, 5, 11 );
  case TAB_SET: