ported over 0.6.2b-0.6.2d changes

PD-classes/src/com/watabou/noosa/Camera.java

@@ -30,7 +30,7 @@
 
 public class Camera extends Gizmo {
 
-	protected static ArrayList<Camera> all = new ArrayList<Camera>();
+	private static ArrayList<Camera> all = new ArrayList<Camera>();
 
 	protected static float invW2;
 	protected static float invH2;
@@ -66,7 +66,7 @@ public static Camera reset() {
 		return reset( createFullscreen( 1 ) );
 	}
 
-	public static Camera reset( Camera newCamera ) {
+	public static synchronized Camera reset( Camera newCamera ) {
 
 		invW2 = 2f / Game.width;
 		invH2 = 2f / Game.height;
@@ -80,20 +80,18 @@ public static Camera reset( Camera newCamera ) {
 		return main = add( newCamera );
 	}
 
-	public static Camera add( Camera camera ) {
+	public static synchronized Camera add( Camera camera ) {
 		all.add( camera );
 		return camera;
 	}
 
-	public static Camera remove( Camera camera ) {
+	public static synchronized Camera remove( Camera camera ) {
 		all.remove( camera );
 		return camera;
 	}
 
-	public static void updateAll() {
-		int length = all.size();
-		for (int i=0; i < length; i++) {
-			Camera c = all.get( i );
+	public static synchronized void updateAll() {
+		for (Camera c : all) {
 			if (c.exists && c.active) {
 				c.update();
 			}

PD-classes/src/com/watabou/noosa/audio/Music.java

@@ -33,6 +33,7 @@ public enum Music {
 	private boolean lastLooping;
 
 	private boolean enabled = true;
+	private float volume = 1f;
 
 	public void play( String assetName, boolean looping ) {
 
@@ -51,7 +52,7 @@ public void play( String assetName, boolean looping ) {
 
 		player = Gdx.audio.newMusic(Gdx.files.internal(assetName));
 		player.setLooping(looping);
-
+		player.setVolume(volume);
 		player.play();
 	}
 
@@ -81,6 +82,7 @@ public void stop() {
 	}
 
 	public void volume( float value ) {
+		volume = value;
 		if (player != null) {
 			player.setVolume( value );
 		}

build.gradle

@@ -16,9 +16,9 @@ allprojects {
 	apply plugin: "eclipse"
 	apply plugin: "idea"
 
-	version = '0.6.2a'
+	version = '0.6.2d'
 	ext {
-		versionCode = 224
+		versionCode = 228
 		appName = 'shattered-pixel-dungeon'
 		appTitle = 'Shattered Pixel Dungeon'
 		appId = 'com.shatteredpixel.shatteredpixeldungeon'

core/src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java

@@ -136,6 +136,7 @@ public void create() {
 		fullscreen( prefs.getBoolean(Preferences.KEY_WINDOW_FULLSCREEN, false) );
 
 		Music.INSTANCE.enable( music() );
+		Music.INSTANCE.volume( musicVol()/10f );
 		Sample.INSTANCE.enable( soundFx() );
 		Sample.INSTANCE.volume( SFXVol()/10f );
 
@@ -261,7 +262,6 @@ public static int zoom() {
 
 	public static void music( boolean value ) {
 		Music.INSTANCE.enable( value );
-		Music.INSTANCE.volume( musicVol()/10f );
 		Preferences.INSTANCE.put( Preferences.KEY_MUSIC, value );
 	}
 

core/src/com/shatteredpixel/shatteredpixeldungeon/actors/Actor.java

@@ -218,7 +218,7 @@ public static void process() {
 					current = null;
 				} else {
 					doNext = acting.act();
-					if (doNext && !Dungeon.hero.isAlive()) {
+					if (doNext && (Dungeon.hero == null || !Dungeon.hero.isAlive())) {
 						doNext = false;
 						current = null;
 					}

core/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Buff.java

@@ -71,7 +71,7 @@ public boolean attachTo( Char target ) {
 	}
 
 	public void detach() {
-		fx( false );
+		if (target.sprite != null) fx( false );
 		target.remove( this );
 	}
 

core/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Venom.java

@@ -23,7 +23,6 @@
 import com.shatteredpixel.shatteredpixeldungeon.Badges;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
-import com.shatteredpixel.shatteredpixeldungeon.messages.Languages;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
 import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
@@ -99,11 +98,7 @@ public void onDeath() {
 		Badges.validateDeathFromPoison();
 
 		Dungeon.fail( getClass() );
-		if (Messages.lang() == Languages.ENGLISH){
-			GLog.n("You died from venom...");
-		} else {
-			GLog.n(Messages.get(Poison.class, "ondeath"));
-		}
+		GLog.n(Messages.get(Poison.class, "ondeath"));
 	}
 
 }

core/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mimic.java

@@ -108,6 +108,7 @@ public boolean reset() {
 	}
 
 	public static Mimic spawnAt( int pos, List<Item> items ) {
+		if (Dungeon.level.pit[pos]) return null;
 		Char ch = Actor.findChar( pos );
 		if (ch != null) {
 			ArrayList<Integer> candidates = new ArrayList<>();

core/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java

@@ -164,6 +164,13 @@ protected boolean doAttack(Char enemy) {
 	private void jump() {
 
 		Level level = Dungeon.level;
+
+		//incase tengu hasn't had a chance to act yet
+		if (fieldOfView == null || fieldOfView.length != Dungeon.level.length()){
+			fieldOfView = new boolean[Dungeon.level.length()];
+			Dungeon.level.updateFieldOfView( this, fieldOfView );
+		}
+
 		if (enemy == null) enemy = chooseEnemy();
 		if (enemy == null) return;
 

core/src/com/shatteredpixel/shatteredpixeldungeon/effects/BlobEmitter.java

@@ -55,7 +55,9 @@ protected void emit( int index ) {
 		for (int i = blob.area.left; i < blob.area.right; i++) {
 			for (int j = blob.area.top; j < blob.area.bottom; j++) {
 				cell = i + j*Dungeon.level.width();
-				if (map[cell] > 0 && Dungeon.level.heroFOV[cell]) {
+				if (map[cell] > 0
+						&& cell < Dungeon.level.heroFOV.length
+						&& Dungeon.level.heroFOV[cell]) {
 					float x = (i + Random.Float()) * size;
 					float y = (j + Random.Float()) * size;
 					factory.emit(this, index, x, y);

core/src/com/shatteredpixel/shatteredpixeldungeon/effects/SpellSprite.java

@@ -79,8 +79,10 @@ public void reset( int index ) {
 	public void update() {
 		super.update();
 
-		x = target.sprite.center().x - SIZE / 2;
-		y = target.sprite.y - SIZE;
+		if (target.sprite != null) {
+			x = target.sprite.center().x - SIZE / 2;
+			y = target.sprite.y - SIZE;
+		}
 
 		switch (phase) {
 		case FADE_IN:

core/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/FlowParticle.java

@@ -95,7 +95,7 @@ public Flow( int pos ) {
 		@Override
 		public void update() {
 
-			if (visible = Dungeon.level.heroFOV[pos]) {
+			if (visible = (pos < Dungeon.level.heroFOV.length && Dungeon.level.heroFOV[pos])) {
 
 				super.update();
 

core/src/com/shatteredpixel/shatteredpixeldungeon/items/BrokenSeal.java

@@ -106,7 +106,7 @@ public static class WarriorShield extends Buff {
 		private float partialShield;
 
 		@Override
-		public boolean act() {
+		public synchronized boolean act() {
 			if (armor == null) detach();
 			else if (armor.isEquipped((Hero)target)) {
 				if (target.SHLD < maxShield()){
@@ -121,11 +121,11 @@ else if (armor.isEquipped((Hero)target)) {
 			return true;
 		}
 
-		public void setArmor(Armor arm){
+		public synchronized void setArmor(Armor arm){
 			armor = arm;
 		}
 
-		public int maxShield() {
+		public synchronized int maxShield() {
 			return 1 + armor.tier + armor.level();
 		}
 	}

core/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/ClassArmor.java

@@ -140,8 +140,8 @@ public int DRMax(int lvl){
 		int effectiveTier = armorTier;
 		if (glyph != null) effectiveTier += glyph.tierDRAdjust();
 		effectiveTier = Math.max(0, effectiveTier);
-
-		return effectiveTier * (2 + lvl);
+		
+		return Math.max(DRMin(lvl), effectiveTier * (2 + lvl));
 	}
 
 	@Override

core/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/MageArmor.java

@@ -40,7 +40,7 @@ public class MageArmor extends ClassArmor {
 	@Override
 	public void doSpecial() {
 
-		for (Mob mob : Dungeon.level.mobs) {
+		for (Mob mob : Dungeon.level.mobs.toArray(new Mob[0])) {
 			if (Dungeon.level.heroFOV[mob.pos]) {
 				Buff.affect( mob, Burning.class ).reignite( mob );
 				Buff.prolong( mob, Roots.class, 3 );

core/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java

@@ -170,7 +170,7 @@ public boolean act() {
 			if (charge < chargeCap) {
 				LockedFloor lock = target.buff(LockedFloor.class);
 				if (!stealthed && (lock == null || lock.regenOn())) {
-					float turnsToCharge = (60 - 2*(chargeCap - charge));
+					float turnsToCharge = (50 - (chargeCap - charge));
 					if (level() > 7) turnsToCharge -= 10*(level() - 7)/3f;
 					partialCharge += (1f / turnsToCharge);
 				}

core/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/Bag.java

@@ -68,9 +68,14 @@ public boolean collect( Bag container ) {
 
 		for (Item item : container.items.toArray( new Item[0] )) {
 			if (grab( item )) {
-				item.detachAll( container );
-				if (!item.collect( this ))
-					item.collect( container );
+				int slot = Dungeon.quickslot.getSlot(item);
+				item.detachAll(container);
+				if (!item.collect(this)) {
+					item.collect(container);
+				}
+				if (slot != -1) {
+					Dungeon.quickslot.setSlot(slot, item);
+				}
 			}
 		}
 

core/src/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfEnchantment.java

@@ -26,7 +26,6 @@
 import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor;
 import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon;
-import com.shatteredpixel.shatteredpixeldungeon.messages.Languages;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
 import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
@@ -56,8 +55,10 @@ protected void onItemSelected(Item item) {
 		Enchanting.show( curUser, item );
 
 		//FIXME add this to translations
-		if (Messages.lang() == Languages.ENGLISH) {
-			GLog.w("your %s glows in the dark", item.name());
+		if (item instanceof Weapon) {
+			GLog.p(Messages.get(this, "weapon"));
+		} else {
+			GLog.p(Messages.get(this, "armor"));
 		}
 
 	}

core/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java

@@ -121,7 +121,11 @@ public class WandOfCorruption extends Wand {
 	protected void onZap(Ballistica bolt) {
 		Char ch = Actor.findChar(bolt.collisionPos);
 
-		if (ch != null && ch instanceof Mob && !(ch instanceof NPC)){
+		if (ch != null){
+
+			if (!(ch instanceof Mob) || ch instanceof NPC){
+				return;
+			}
 
 			Mob enemy = (Mob) ch;
 
@@ -172,6 +176,9 @@ protected void onZap(Ballistica bolt) {
 			}
 
 			processSoulMark(ch, chargesPerCast());
+
+		} else {
+			Dungeon.level.press(bolt.collisionPos, null);
 		}
 	}
 

core/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFrost.java

@@ -85,6 +85,8 @@ protected void onZap(Ballistica bolt) {
 				else
 					Buff.prolong(ch, Chill.class, 2+level());
 			}
+		} else {
+			Dungeon.level.press(bolt.collisionPos, null);
 		}
 	}
 

core/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfMagicMissile.java

@@ -20,6 +20,7 @@
  */
 package com.shatteredpixel.shatteredpixeldungeon.items.wands;
 
+import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
@@ -54,6 +55,8 @@ protected void onZap( Ballistica bolt ) {
 
 			ch.sprite.burst(0xFFFFFFFF, level() / 2 + 2);
 
+		} else {
+			Dungeon.level.press(bolt.collisionPos, null);
 		}
 	}
 

core/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfVenom.java

@@ -21,6 +21,7 @@
 package com.shatteredpixel.shatteredpixeldungeon.items.wands;
 
 import com.shatteredpixel.shatteredpixeldungeon.Assets;
+import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob;
@@ -56,6 +57,10 @@ protected void onZap(Ballistica bolt) {
 				processSoulMark(ch, chargesPerCast());
 			}
 		}
+
+		if (Actor.findChar(bolt.collisionPos) == null){
+			Dungeon.level.press(bolt.collisionPos, null);
+		}
 	}
 
 	@Override

core/src/com/shatteredpixel/shatteredpixeldungeon/journal/Notes.java

@@ -249,4 +249,8 @@ public static <T extends Record> ArrayList<T> getRecords( Class<T> recordType ){
 		return filtered;
 	}
 
+	public static void remove( Record rec ){
+		records.remove(rec);
+	}
+
 }

core/src/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java

@@ -949,6 +949,14 @@ public int distance( int a, int b ) {
 	public boolean adjacent( int a, int b ) {
 		return distance( a, b ) == 1;
 	}
+
+	public int distNoDiag( int a, int b){
+		int ax = a % width();
+		int ay = a / width();
+		int bx = b % width();
+		int by = b / width();
+		return Math.abs( ax - bx ) + Math.abs( ay - by );
+	}
 
 	//returns true if the input is a valid tile within the level
 	public boolean insideMap( int tile ){

core/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/DisintegrationTrap.java

@@ -59,7 +59,7 @@ public void activate() {
 			for (Char ch : Actor.chars()){
 				Ballistica bolt = new Ballistica(pos, ch.pos, Ballistica.PROJECTILE);
 				if (bolt.collisionPos == ch.pos &&
-						(target == null || Dungeon.level.distance(pos, ch.pos) < Dungeon.level.distance(pos, target.pos))){
+						(target == null || Dungeon.level.distNoDiag(pos, ch.pos) < Dungeon.level.distNoDiag(pos, target.pos))){
 					target = ch;
 				}
 			}