Undo support (reopen of #53)

res/values/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-	<string name="app_name">Pixel Dungeon</string>
+	<string name="app_name">Pixel Dungeon Undone</string>
 
 </resources>

src/com/watabou/pixeldungeon/Dungeon.java

@@ -17,6 +17,8 @@
  */
 package com.watabou.pixeldungeon;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -62,6 +64,7 @@
 import com.watabou.pixeldungeon.scenes.StartScene;
 import com.watabou.pixeldungeon.ui.QuickSlot;
 import com.watabou.pixeldungeon.utils.BArray;
+import com.watabou.pixeldungeon.utils.FIFO;
 import com.watabou.pixeldungeon.utils.Utils;
 import com.watabou.pixeldungeon.windows.WndResurrect;
 import com.watabou.utils.Bundlable;
@@ -95,14 +98,18 @@ public class Dungeon {
 	public static boolean nightMode;
 
 	public static SparseArray<ArrayList<Item>> droppedItems;
-
+
+	final static int undoLength = 10;
+	public static FIFO<byte[]> undoGameBuffer = null;
+	public static FIFO<byte[]> undoLevelBuffer = null;
+
 	public static void init() {
 
 		challenges = PixelDungeon.challenges();
 
 		Actor.clear();
 
-		PathFinder.setMapSize( Level.WIDTH, Level.HEIGHT );
+		PathFinder.setMapSize(Level.WIDTH, Level.HEIGHT);
 
 		Scroll.initLabels();
 		Potion.initColors();
@@ -116,7 +123,8 @@ public static void init() {
 		gold = 0;
 
 		droppedItems = new SparseArray<ArrayList<Item>>();
-
+
+
 		potionOfStrength = 0;
 		scrollsOfUpgrade = 0;
 		scrollsOfEnchantment = 0;
@@ -359,63 +367,100 @@ private static String depthFile( HeroClass cl ) {
 			return RG_DEPTH_FILE;
 		}
 	}
-
+
+	public static Bundle saveGameBundle () {
+		Bundle bundle = new Bundle();
+
+		bundle.put( VERSION, Game.version );
+		bundle.put( CHALLENGES, challenges );
+		bundle.put( HERO, hero );
+		bundle.put( GOLD, gold );
+		bundle.put( DEPTH, depth );
+
+		for (int d : droppedItems.keyArray()) {
+			bundle.put( String.format( DROPPED, d ), droppedItems.get( d ) );
+		}
+
+		bundle.put( POS, potionOfStrength );
+		bundle.put( SOU, scrollsOfUpgrade );
+		bundle.put( SOE, scrollsOfEnchantment );
+		bundle.put( DV, dewVial );
+
+		int count = 0;
+		int ids[] = new int[chapters.size()];
+		for (Integer id : chapters) {
+			ids[count++] = id;
+		}
+		bundle.put( CHAPTERS, ids );
+
+		Bundle quests = new Bundle();
+		Ghost		.Quest.storeInBundle( quests );
+		Wandmaker	.Quest.storeInBundle( quests );
+		Blacksmith	.Quest.storeInBundle( quests );
+		Imp			.Quest.storeInBundle( quests );
+		bundle.put( QUESTS, quests );
+
+		Room.storeRoomsInBundle( bundle );
+
+		Statistics.storeInBundle( bundle );
+		Journal.storeInBundle( bundle );
+
+		QuickSlot.save( bundle );
+
+		Scroll.save( bundle );
+		Potion.save( bundle );
+		Wand.save( bundle );
+		Ring.save( bundle );
+
+		Bundle badges = new Bundle();
+		Badges.saveLocal( badges );
+		bundle.put( BADGES, badges );
+
+		return bundle;
+	}
+
+	public static void saveUndo () {
+
+		Actor.fixTime();
+		ByteArrayOutputStream bos;
+
+		if (undoGameBuffer == null)
+			undoGameBuffer = new FIFO<>(undoLength);
+
+		if (undoLevelBuffer == null)
+			undoLevelBuffer = new FIFO<>(undoLength);
+
+		try {
+			Bundle gameBundle = saveGameBundle();
+
+			bos = new ByteArrayOutputStream();
+			Bundle.write(gameBundle, bos);
+			undoGameBuffer.add(bos.toByteArray());
+			bos.close();
+
+			Bundle levelBundle = new Bundle();
+			levelBundle.put(LEVEL, level);
+
+			bos = new ByteArrayOutputStream();
+			Bundle.write(levelBundle, bos);
+			undoLevelBuffer.add(bos.toByteArray());
+			bos.close();
+
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
 	public static void saveGame( String fileName ) throws IOException {
 		try {
-			Bundle bundle = new Bundle();
-
-			bundle.put( VERSION, Game.version );
-			bundle.put( CHALLENGES, challenges );
-			bundle.put( HERO, hero );
-			bundle.put( GOLD, gold );
-			bundle.put( DEPTH, depth );
-
-			for (int d : droppedItems.keyArray()) {
-				bundle.put( String.format( DROPPED, d ), droppedItems.get( d ) );
-			}
-
-			bundle.put( POS, potionOfStrength );
-			bundle.put( SOU, scrollsOfUpgrade );
-			bundle.put( SOE, scrollsOfEnchantment );
-			bundle.put( DV, dewVial );
-
-			int count = 0;
-			int ids[] = new int[chapters.size()];
-			for (Integer id : chapters) {
-				ids[count++] = id;
-			}
-			bundle.put( CHAPTERS, ids );
-
-			Bundle quests = new Bundle();
-			Ghost		.Quest.storeInBundle( quests );
-			Wandmaker	.Quest.storeInBundle( quests );
-			Blacksmith	.Quest.storeInBundle( quests );
-			Imp			.Quest.storeInBundle( quests );
-			bundle.put( QUESTS, quests );
-
-			Room.storeRoomsInBundle( bundle );
-
-			Statistics.storeInBundle( bundle );
-			Journal.storeInBundle( bundle );
-
-			QuickSlot.save( bundle );
-
-			Scroll.save( bundle );
-			Potion.save( bundle );
-			Wand.save( bundle );
-			Ring.save( bundle );
-
-			Bundle badges = new Bundle();
-			Badges.saveLocal( badges );
-			bundle.put( BADGES, badges );
-
+			Bundle bundle = saveGameBundle();
 			OutputStream output = Game.instance.openFileOutput( fileName, Game.MODE_PRIVATE );
-			Bundle.write( bundle, output );
+			Bundle.write(bundle, output);
 			output.close();
 
 		} catch (Exception e) {
 
-			GamesInProgress.setUnknown( hero.heroClass );
+			GamesInProgress.setUnknown(hero.heroClass);
 		}
 	}
 
@@ -452,10 +497,22 @@ public static void loadGame( HeroClass cl ) throws IOException {
 	public static void loadGame( String fileName ) throws IOException {
 		loadGame( fileName, false );
 	}
-
+
+	public static void loadGame( int undoLocation) {
+
+		try {
+			loadGame(gameBundle(undoLocation), true);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
 	public static void loadGame( String fileName, boolean fullLoad ) throws IOException {
-
-		Bundle bundle = gameBundle( fileName );
+		loadGame(gameBundle(fileName), fullLoad);
+
+	}
+
+	public static void loadGame( Bundle bundle, boolean fullLoad ) throws IOException {
 
 		Dungeon.challenges = bundle.getInt( CHALLENGES );
 
@@ -535,19 +592,25 @@ public static void loadGame( String fileName, boolean fullLoad ) throws IOExcept
 			}
 		}
 	}
-
-	public static Level loadLevel( HeroClass cl ) throws IOException {
-
+
+	public static Level loadLevel( InputStream input) throws IOException {
 		Dungeon.level = null;
 		Actor.clear();
-
-		InputStream input = Game.instance.openFileInput( Utils.format( depthFile( cl ), depth ) ) ;
+
 		Bundle bundle = Bundle.read( input );
 		input.close();
-		
+
 		return (Level)bundle.get( "level" );
 	}
 
+	public static Level loadLevel( HeroClass cl ) throws IOException {
+		return loadLevel(Game.instance.openFileInput( Utils.format( depthFile( cl ), depth ) )) ;
+	}
+
+	public static Level loadLevel( int undoLocation) throws IOException {
+		return loadLevel(new ByteArrayInputStream( undoLevelBuffer.get(undoLocation)));
+	}
+
 	public static void deleteGame( HeroClass cl, boolean deleteLevels ) {
 
 		Game.instance.deleteFile( gameFile( cl ) );
@@ -559,17 +622,22 @@ public static void deleteGame( HeroClass cl, boolean deleteLevels ) {
 			}
 		}
 
-		GamesInProgress.delete( cl );
+		GamesInProgress.delete(cl);
 	}
-
-	public static Bundle gameBundle( String fileName ) throws IOException {
-
-		InputStream input = Game.instance.openFileInput( fileName );
-		Bundle bundle = Bundle.read( input );
+
+	public static Bundle gameBundle( InputStream input ) throws IOException {
+		Bundle bundle = Bundle.read(input);
 		input.close();
-
 		return bundle;
 	}
+
+	public static Bundle gameBundle( int undoLocation ) throws IOException {
+		return gameBundle(new ByteArrayInputStream( undoGameBuffer.get(undoLocation) ));
+	}
+
+	public static Bundle gameBundle( String fileName ) throws IOException {
+		return gameBundle(Game.instance.openFileInput( fileName ));
+	}
 
 	public static void preview( GamesInProgress.Info info, Bundle bundle ) {
 		info.depth = bundle.getInt( DEPTH );

src/com/watabou/pixeldungeon/actors/hero/Hero.java

@@ -398,7 +398,7 @@ public boolean act() {
 			return false;
 
 		} else {
-			
+
 			restoreHealth = false;
 
 			ready = false;
@@ -466,7 +466,8 @@ private void ready() {
 		sprite.idle();
 		curAction = null;
 		ready = true;
-
+
+		Dungeon.saveUndo();
 		GameScene.ready();
 	}
 
@@ -1218,8 +1219,6 @@ public static void reallyDie( Object cause ) {
 		if (cause instanceof Hero.Doom) {
 			((Hero.Doom)cause).onDeath();
 		}
-
-		Dungeon.deleteGame( Dungeon.hero.heroClass, true );
 	}
 
 	@Override

src/com/watabou/pixeldungeon/actors/mobs/Mimic.java

@@ -36,6 +36,7 @@
 import com.watabou.pixeldungeon.levels.Level;
 import com.watabou.pixeldungeon.scenes.GameScene;
 import com.watabou.pixeldungeon.sprites.MimicSprite;
+import com.watabou.utils.Bundlable;
 import com.watabou.utils.Bundle;
 import com.watabou.utils.Random;
 
@@ -64,7 +65,10 @@ public void storeInBundle( Bundle bundle ) {
 	@Override
 	public void restoreFromBundle( Bundle bundle ) {
 		super.restoreFromBundle( bundle );
-		items = new ArrayList<Item>( (Collection<? extends Item>) bundle.getCollection( ITEMS ) ); 
+		items = new ArrayList<Item>();
+		for (Bundlable bund:  bundle.getCollection( ITEMS )) {
+			items.add((Item) bund);
+		}
 		adjustStats( bundle.getInt( LEVEL ) );
 	}
 

src/com/watabou/pixeldungeon/items/Heap.java

@@ -370,7 +370,11 @@ public void destroy() {
 	public void restoreFromBundle( Bundle bundle ) {
 		pos = bundle.getInt( POS );
 		type = Type.valueOf( bundle.getString( TYPE ) );
-		items = new LinkedList<Item>( (Collection<? extends Item>) bundle.getCollection( ITEMS ) ); 
+
+		items = new LinkedList<Item>();
+		for (Bundlable bun : bundle.getCollection( ITEMS )) {
+			items.add( (Item) bun);
+		}
 	}
 
 	@Override

src/com/watabou/pixeldungeon/levels/RegularLevel.java

@@ -33,6 +33,7 @@
 import com.watabou.pixeldungeon.items.scrolls.ScrollOfUpgrade;
 import com.watabou.pixeldungeon.levels.Room.Type;
 import com.watabou.pixeldungeon.levels.painters.*;
+import com.watabou.utils.Bundlable;
 import com.watabou.utils.Bundle;
 import com.watabou.utils.Graph;
 import com.watabou.utils.Random;
@@ -678,8 +679,11 @@ public void storeInBundle( Bundle bundle ) {
 	@Override
 	public void restoreFromBundle( Bundle bundle ) {
 		super.restoreFromBundle( bundle );
-
-		rooms = new HashSet<Room>( (Collection<? extends Room>) bundle.getCollection( "rooms" ) );
+		rooms = new HashSet<Room>();
+		for (Bundlable bund: bundle.getCollection( "rooms" ) ) {
+			rooms.add((Room) bund);
+		}
+
 		for (Room r : rooms) {
 			if (r.type == Type.WEAK_FLOOR) {
 				weakFloorCreated = true;