Index: score_memo.txt
==================================================================
--- score_memo.txt
+++ score_memo.txt
@@ -1,22 +1,22 @@
 contest1     212!
 contest2     280?
 contest3     275!
 contest4     561?
 contest5    1281?
-contest6     737   // deadend trap
+contest6     737
 contest7     867?
-contest8    1245   // tricky
+contest8    1245
 contest9    3042?
-contest10   2076   // * on lambda, must move * first
-flood1       569   // too slow, because of 1-left danger lambda 
+contest10   2076
+flood1       569
 flood2       280?
-flood3       802   // too slow, drown
-flood4       970   // incorrect order of digging
+flood3       802
+flood4       970
 flood5       561?
-trampoline1  291   // * on trampoline. must move * first
+trampoline1  291
 trampoline2 1728?
-trampoline3  698   // * on trampoline target. must move * first.
+trampoline3  698
 beard1       856?
-beard2      2792   // hutsu-ni muzui
-beard3       811   // tricky. must hurry to cut hige.
-beard4       677   // deadend trap
+beard2      2792
+beard3       811
+beard4       677

DELETED src/driver.d
Index: src/driver.d
==================================================================
--- src/driver.d
+++ src/driver.d
@@ -1,65 +0,0 @@
-import game;
-import util;
-
-interface GameObserver
-{
-	// this(in Game g);
-	void on_game_changed(char c, in Game g, bool finished);
-}
-
-class Driver
-{
-	this(Game g) { this.game = g; }
-	this(File game_data) { this(new Game(game_data)); }
-
-	void command(char c)
-	{
-		if( finished )
-			return;
-		if( c == 'A' )
-			aborted = true;
-		else
-			game.command(c);
-		foreach(ob; observers)
-			ob.on_game_changed(c, game, finished);
-	}
-
-	T addObserver(T)()
-	{
-		T t = new T(game);
-		observers ~= t;
-		return t;
-	}
-
-	@property bool finished()
-	{
-		return game.cleared || game.dead || aborted;
-	}
-
-private:
-	Game           game;
-	GameObserver[] observers;
-	bool           aborted = false;
-}
-
-unittest
-{
-	static class MockGame : Game {
-		this() { super(null,null,null); }
-		string log;
-		void command(char c) { log ~= c; }
-	}
-	static class MockObserver : GameObserver {
-		string log;
-		this(in Game g) {}
-		void on_game_changed(char c, in Game g, bool fin) { log~=c; if(fin)log~="$"; }
-	}
-
-	auto g = new MockGame;
-	auto d = new Driver(g);
-	auto o = d.addObserver!MockObserver();
-	foreach(char c; "UDLRSAUDLRSA")
-		d.command(c);
-	assert(g.log == "UDLRS");
-	assert(o.log == "UDLRSA$");
-}

Index: src/game.d
==================================================================
--- src/game.d
+++ src/game.d
@@ -235,11 +235,11 @@
 		for(int x=1; x<=W; ++x)
 			if(this[y,x] == 'L' || this[y,x] == 'O')
 				return false;
 		return true;
 	}
-
+	
 	Tuple!(int,bool) command(char c, int turn)
 	{
 		assert( this[robot] == 'R' );
 		if(c=='R') return move( 0, +1, turn);
 		if(c=='L') return move( 0, -1, turn);
@@ -348,11 +348,11 @@
 		return dead;
 	}
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-/*
+
 class Game
 {
 	mixin DeriveShow;
 
 	static Game load(File input)
@@ -442,441 +442,5 @@
 		int water_until_rise() { return water.until_rise(turn); }
 		int hige_until_rise() { return map.hige.until_rise(turn); }
 		int hp() { return map.waterproof - under_water; }
 	}
 }
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-
-class Game
-{
-public:
-	this(File input)
-	{
-		// Read map data
-		string[] map_data_lines;
-		for(string line; !(line=input.readln().chomp()).empty; )
-			map_data_lines ~= line;
-
-		// H*W
-		H_ = map_data_lines.length;
-		W_ = 0;
-		foreach(mdl; map_data_lines)
-			W_ = max(W_, mdl.length);
-
-		// Copy to modifiable buffer and adjust coordinates.
-		raw_data_ = new char[][H_+1];
-		foreach(i,mdl; map_data_lines) {
-			char[] buf = new char[mdl.length+1];
-			buf[0] = '#';
-			buf[1..$] = mdl[];
-			raw_data_[H_-i] = buf;
-		}
-
-		// Detect objects
-		for(int y=1; y<=H_; ++y)
-		for(int x=1; x<raw_data_[y].length; ++x)
-		{
-			char c = raw_data_[y][x];
-			switch(c)
-			{
-			case '#':
-			case '.':
-			case ' ':
-				break;
-			case 'L':
-			case 'O':
-				lift_pos_ = new Pos(y,x);
-				break;
-			case 'A': .. case 'I':
-			case '1': .. case '9':
-				trampoline_pos_[c] = new Pos(y,x);
-				break;
-			case '!':
-				razor_pos_ ~= new Pos(y,x);
-				break;
-			case '\\':
-				lambda_pos_ ~= new Pos(y,x);
-				break;
-
-			// Moving objects are erased from raw_data_
-			case 'R':
-				robot_pos_ = new Pos(y,x);
-				raw_data_[y][x] = ' ';
-				break;
-			case '*':
-			case 'W':
-				dynamic_objects_[new Pos(y,x)] = c;
-				raw_data_[y][x] = ' ';
-				if(c=='*')
-					may_update_[new Pos(y,x)] = true;
-				break;
-			default:
-				assert(false);
-			}
-		}
-
-		// Read other parameters
-		for(string line; !(line=input.readln()).empty; )
-		{
-			string[] ss = line.split();
-			if( ss.length == 2 )
-				switch(ss[0])
-				{
-				case "Water":      water_base_ = ss[1].to!int(); break;
-				case "Flooding":   water_pace_ = ss[1].to!int(); break;
-				case "Waterproof": max_air_    = ss[1].to!int(); break;
-				case "Growth":     hige_pace_  = ss[1].to!int(); break;
-				case "Razors":     num_razor_  = ss[1].to!int(); break;
-				default: assert(false);
-				}
-			if( ss.length == 4 && ss[0]=="Trampoline" && ss[2]=="targets" )
-			{
-				char fr=ss[1][0], to=ss[3][0];
-				trampoline_[fr] = to;
-				if(to !in trampoline_rev_) trampoline_rev_[to] = [];
-				trampoline_rev_[to] ~= fr;
-			}
-		}
-
-		air_left_ = max_air_;
-	}
-
-	@property const {
-		int H() { return H_; }
-		int W() { return W_; }
-		char trampoline(char c) { return (c in trampoline_ ? trampoline_[c] : 0); }
-		const(Pos)[] trampoline_rev(char c) {
-			const(Pos)[] pp;
-			if(c in trampoline_rev_) {
-				foreach(ch; trampoline_rev_[c])
-					pp ~= trampoline_pos_[ch];
-			}
-			return pp;
-		}
-		int water_level() {
-			return water_pace_ ? water_base_ + turn_/water_pace_ : water_base_;
-		}
-		int water_until_rise() {
-			return water_pace_ ? water_pace_ - turn_%water_pace_ : int.max;
-		}
-		int hige_until_rise() {
-			return hige_pace_ ? hige_pace_ - turn_%hige_pace_ : int.max;
-		}
-		bool is_hige_turn() {
-			return hige_pace_ ? turn_%hige_pace_ == hige_pace_-1 : false;
-		}
-		int hp() { return air_left_; }
-		int num_razor() { return num_razor_; }
-		bool cleared() { return cleared_; }
-		bool dead() { return dead_; }
-		long score() { return num_lambda_*(dead_ ? 25L : cleared_ ? 75L : 50L) - turn_; }
-		const(Pos) robot() { return robot_pos_; }
-		const(Pos) lift() { return lift_pos_; }
-		Pos[] lambdas() {
-			Pos[] pp;
-			foreach(p; lambda_pos_)
-				pp ~= p.clone();
-			return pp;
-		}
-		Pos[] razors() {
-			Pos[] pp;
-			foreach(p; razor_pos_)
-				pp ~= p.clone();
-			return pp;
-		}
-		const(Pos)[] higes() {
-			const(Pos)[] pp;
-			foreach(p,c; dynamic_objects_)
-				if(c=='W')
-					pp ~= p;
-			return pp;
-		}
-	}
-	const {
-		char opIndex(in Pos p) { return opIndex(p.y, p.x); }
-		char opIndex(int y, int x) { return map_get(y, x); }
-	}
-
-public:
-	void command(char c)
-	{
-		if(dead || cleared)
-			return;
-
-		if(c == 'U') command_move(+1, 0);
-		if(c == 'D') command_move(-1, 0);
-		if(c == 'L') command_move(0, -1);
-		if(c == 'R') command_move(0, +1);
-		if(c == 'S') use_razor();
-		if(c == 'W') {}
-
-		if(!cleared)
-		{
-			map_update();
-			water_update();
-		}
-		turn_ ++;
-	}
-
-	void command_move(int dy, int dx)
-	{
-		int y = robot_pos_.y, x = robot_pos_.x;
-		char c = this[y+dy, x+dx];
-		Pos p = new Pos(y+dy, x+dx);
-
-		switch(c){
-		case 'O':
-			cleared_ = true;
-			move_robot_to(p);
-			break;
-		case '\\':
-			take_lambda_at(p);
-			move_robot_to(p);
-			break;
-		case '!':
-			take_razor_at(p);
-			move_robot_to(p);
-			break;
-		case 'A': .. case 'I':
-			enter_trampoline_at(p, c);
-			break;
-		case ' ':
-		case '.':
-			move_robot_to(p);
-			break;
-		case '*':
-			if(dy!=0 || this[y,x+dx*2]!=' ')
-				break;
-			move_robot_to(p);
-			push_rock(p, new Pos(y,x+dx*2));
-			break;
-		default:
-			break;
-		}
-	}
-
-	void use_razor()
-	{
-		if(num_razor_ == 0)
-			return;
-		num_razor_ --;
-
-		for(int dy=-1; dy<=+1; ++dy)
-		for(int dx=-1; dx<=+1; ++dx) if(dy||dx)
-		{
-			Pos p = new Pos(robot_pos_.y+dy, robot_pos_.x+dx);
-			if(auto it = p in dynamic_objects_)
-				if(*it == 'W') {
-					something_gone(p);
-					dynamic_objects_.remove(p);
-				}
-		}
-	}
-
-	void take_lambda_at(Pos p)
-	{
-		map_set_empty(p);
-		num_lambda_ ++;
-		lambda_pos_ = lambda_pos_.erase(p);
-	}
-
-	void take_razor_at(Pos p)
-	{
-		map_set_empty(p);
-		num_razor_ ++;
-		razor_pos_ = razor_pos_.erase(p);
-	}
-
-	void enter_trampoline_at(Pos p, char c)
-	{
-		char d = trampoline(c);
-		foreach(cc; trampoline_rev_[d]) {
-			Pos pp = trampoline_pos_[cc];
-			something_gone(pp);
-			map_set_empty(pp);
-		}
-		move_robot_to(trampoline_pos_[d]);
-	}
-
-	void move_robot_to(Pos p)
-	{
-		something_gone(robot_pos_);
-		map_set_empty(p.y, p.x);
-		robot_pos_ = p;
-	}
-
-	void push_rock(Pos fr, Pos to)
-	{
-		dynamic_objects_.remove(fr);
-		dynamic_objects_[to] = '*';
-		may_update_[to] = true;
-	}
-
-	void something_gone(Pos p)
-	{
-		for(int dy=0;  dy<=+1; ++dy)
-		for(int dx=-1; dx<=+1; ++dx) if(dy||dx)
-			may_update_[new Pos(p.y+dy,p.x+dx)] = true;
-	}
-
-	void map_update()
-	{
-		Pos[] may_update_list;
-		foreach(p,_; may_update_)
-			if(this[p] == '*')
-				may_update_list ~= p;
-		may_update_ = null;
-
-		if( is_hige_turn() )
-			foreach(p,c; dynamic_objects_)
-				if(c == 'W')
-					may_update_list ~= p;
-
-		sort(may_update_list);
-		char[Pos] to_be_written;
-		foreach(p; may_update_list)
-			if(is_hige_turn() && this[p]=='W')
-			{
-				for(int dy=-1; dy<=+1; ++dy)
-				for(int dx=-1; dx<=+1; ++dx) {
-					Pos q = new Pos(p.y+dy,p.x+dx);
-					if( this[q] == ' ' )
-						to_be_written[q] = 'W';
-				}
-			}
-			else
-			{
-				int y = p.y;
-				int x = p.x;
-				char below = this[y-1,x];
-				// *
-				// _
-				if(below==' ') {
-					Pos q = new Pos(y-1,x);
-					to_be_written[p] = ' ';
-					to_be_written[q] = '*';
-					may_update_[q] = true;
-				}
-				// *_      *_
-				// *_  or  \_
-				else if((below=='*'||below=='\\')&&this[y-1,x+1]==' '&&this[y,x+1]==' ') {
-					Pos q = new Pos(y-1,x+1);
-					to_be_written[p] = ' ';
-					to_be_written[q] = '*';
-					may_update_[q] = true;
-				}
-				// _*
-				// _*
-				else if(below=='*'&&this[y-1,x-1]==' '&&this[y,x-1]==' ') {
-					Pos q = new Pos(y-1,x-1);
-					to_be_written[p] = ' ';
-					to_be_written[q] = '*';
-					may_update_[q] = true;
-				}
-			}
-
-		foreach(p,c; to_be_written) {
-			dynamic_objects_[p] = c;
-			if(c=='*' && p.y==robot_pos_.y+1 && p.x==robot_pos_.x)
-				dead_ = true;
-		}
-
-		if(lambda_pos_.empty)
-			raw_data_[lift_pos_.y][lift_pos_.x] = 'O';
-	}
-
-	void water_update()
-	{
-		if( robot_pos_.y <= water_level() )
-			air_left_ --;
-		else
-			air_left_ = max_air_;
-		if( air_left_ < 0 )
-			dead_ = true;
-	}
-
-private:
-	char map_get(int y, int x) const
-	{
-		if( y<1 || H<y || x<1 || W<x ) return '#';
-		Pos p = new Pos(y,x);
-		if(p == robot_pos_)
-			return 'R';
-		if(auto it = (p in dynamic_objects_))
-			return *it;
-		if( x<0 || raw_data_[y].length<=x ) return ' ';
-		return raw_data_[y][x];
-	}
-
-	void map_set_empty(in Pos p)
-	{
-		return map_set_empty(p.y, p.x);
-	}
-
-	void map_set_empty(int y, int x)
-	{
-		if( y<1 || H<y || x<1 || W<x ) return;
-		if( x<0 || raw_data_[y].length<=x ) return;
-		raw_data_[y][x] = ' ';
-	}
-
-public:
-	Game clone() const { return new Game(this); }
-	this(in Game g) {
-		H_ = g.H_;
-		W_ = g.W_;
-		raw_data_ = new char[][g.raw_data_.length];
-		foreach(i,d; g.raw_data_) raw_data_[i] = d.dup;
-		trampoline_pos_ = cast(Pos[char]) g.trampoline_pos_;
-		razor_pos_  = (cast(Game)g).razor_pos_.dup;
-		lambda_pos_ = (cast(Game)g).lambda_pos_.dup;
-		lift_pos_   = g.lift_pos_.clone();
-		robot_pos_  = g.robot_pos_.clone();
-		dynamic_objects_ = dup(g.dynamic_objects_);
-		trampoline_     = (cast(Game)g).trampoline_;
-		trampoline_rev_ = (cast(Game)g).trampoline_rev_;
-		water_base_ = g.water_base_;
-		water_pace_ = g.water_pace_;
-		max_air_    = g.max_air_;
-		hige_pace_  = g.hige_pace_;
-		num_razor_  = g.num_razor_;
-		num_lambda_ = g.num_lambda_;
-		turn_       = g.turn_;
-		air_left_   = g.air_left_;
-		cleared_    = g.cleared_;
-		dead_       = g.dead_;
-		may_update_ = dup(g.may_update_);
-	}
-
-	V[K] dup(V,K)(in V[K] aa) {
-		V[K] aa2;
-		foreach(k,v; aa) aa2[k] = v;
-		return aa2;
-	}
-
-private:
-	int          H_;
-	int          W_;
-	char[][]     raw_data_;
-	Pos[char]    trampoline_pos_;
-	Pos[]        razor_pos_;
-	Pos[]        lambda_pos_;
-	Pos          lift_pos_;
-	Pos          robot_pos_;
-	char[Pos]    dynamic_objects_;
-	char[char]   trampoline_;
-	char[][char] trampoline_rev_;
-	int          water_base_ = 0;
-	int          water_pace_ = 0;
-	int          max_air_    = 10;
-	int          hige_pace_  = 25;
-	int          num_razor_  = 0;
-	int          num_lambda_ = 0;
-
-	int turn_     = 0;
-	int air_left_ = 0;
-	bool cleared_ = false;
-	bool dead_    = false;
-	bool[Pos] may_update_;
-}

Index: src/gui.d
==================================================================
--- src/gui.d
+++ src/gui.d
@@ -6,11 +6,11 @@
 class GUI(Solver) : Form, GameObserver
 {
 	this(in Game g)
 	{
 		this.solver = new Solver(g);
-		setup_size(g.W, g.H);
+		setup_size(g.map.W, g.map.H);
 		setup_resources(g);
 		draw(g);
 	}
 
 	private void delegate(char c) fn;
@@ -81,11 +81,14 @@
 		this.render['d'] = "☠";
 		this.render['L'] = "☒";
 		this.render['O'] = "☐";
 		this.render['W'] = "ꔣ";
 		this.render['!'] = "✄";
-		foreach(char c; 'A'..'J') this.render[c] = [cast(dchar)('☢'+g.trampoline(c)-'1')].to!string();
+		foreach(c,tp; g.map.tr_target) {
+			char d = g.map[tp];
+			this.render[c] = [cast(dchar)('☢'+d-'1')].to!string();
+		}
 		foreach(char c; '1'..':') this.render[c] = [cast(dchar)('☢'+c-'1')].to!string();
 		this.paint ~= (Control c, PaintEventArgs ev) {
 			graphicContext.copyTo(ev.graphics, Rect(0,0,this.clientSize.width,this.clientSize.height));
 		};
 	}
@@ -101,14 +104,14 @@
 		// Fill water.
 		int w = g.water_level();
 		graphicContext.fillRectangle(this.colors['w'], Rect(0, scrH-cell*w-1, scrW, cell*w+1));
 
 		// Paint map.
-		for(int y=1; y<=g.H; ++y)
-		for(int x=1; x<=g.W; ++x) {
+		for(int y=1; y<=g.map.H; ++y)
+		for(int x=1; x<=g.map.W; ++x) {
 			Rect r = Rect(cell*(x-1), scrH-cell*y, cell, cell);
-			char c = g[y,x];
+			char c = g.map[y,x];
 			if( c != ' ' ) {
 				if( c == 'R' && g.dead )
 					c = 'd';
 				graphicContext.drawText(this.render[c], font, this.colors[c], r);
 			}
@@ -118,11 +121,11 @@
 		this.text = .text(
 			"Score: ", g.score,
 			" Air: ", g.hp,
 			" Tide: ", g.water_until_rise,
 			" Wadler: ", g.hige_until_rise,
-			" Razor: ", g.num_razor);
+			" Razor: ", g.map.razor);
 		invalidate();
 	}
 
 private:
 	void setup_keyhandling()

Index: src/output.d
==================================================================
--- src/output.d
+++ src/output.d
@@ -33,11 +33,11 @@
 		if(flushed)
 			return;
 
 		log ~= c;
 		score_log ~= g.score;
-		if(finished || log.length+1==g.W*g.H)
+		if(finished || log.length+1==g.map.W*g.map.H)
 			flush();
 	}
 
 private:
 	string log;

Index: src/solver.d
==================================================================
--- src/solver.d
+++ src/solver.d
@@ -15,11 +15,11 @@
 
 	Game g;
 	this(in Game g)
 	{
 		this.g = g.clone();
-		forbidden_cell = new bool[][](g.H+2, g.W+2);
+		forbidden_cell = new bool[][](g.map.H+2, g.map.W+2);
 	}
 
 	char single_step()
 	{
 		Tuple!(string,int) de = death_move(g);
@@ -41,11 +41,11 @@
 		foreach(char c; "UDLRW") {
 			Game gg = g.clone();
 			gg.command(c);
 			if( !gg.cleared && gg.dead )
 				death ~= c;
-			else if( gg.robot != g.robot )
+			else if( gg.map.robot != g.map.robot )
 				choice++;
 			else if( c != 'W' ) // meaningless move
 				death ~= c;
 		}
 		return tuple(death, choice);
@@ -54,20 +54,20 @@
 	Tuple!(Pos, int)[] log;
 	bool[][] forbidden_cell;
 
 	char act(const(Game) g, string death, int breath)
 	{
-		const Pos    ro = g.robot;
-		const Pos    li = g.lift;
-		Pos[] la = g.lambdas();
+		const Pos    ro = g.map.robot;
+		const Pos    li = g.map.lift;
+		Pos[] la = g.map.lambdas();
 		sort!((Pos a,Pos b){
 			int ad=abs(a.y-li.y)+abs(a.x-li.x);
 			int bd=abs(b.y-li.y)+abs(b.x-li.x);
 			return ad>bd;;
 		})(la);
-		Pos[] ra = g.razors();
-		const(Pos)[] hi = g.higes();
+		Pos[] ra = g.map.razors();
+		const(Pos)[] hi = g.map.objects('W');
 
 		Tuple!(char,int)[] cand;
 		char c = 'W';
 		if( la.empty ) {
 			cand = search(g, ro, [li], death);
@@ -74,28 +74,28 @@
 		} else {
 			cand ~= search(g, ro, la~ra, death);
 		}
 
 		// 'higesori' mode
-		if( !hi.empty && g.num_razor>0 ) {
+		if( !hi.empty && g.map.razor>0 ) {
 			int his = 0;
 			for(int dy=-1; dy<=+1; ++dy)
 			for(int dx=-1; dx<=+1; ++dx)
-				if(g[ro.y+dy,ro.x+dx] == 'W')
+				if(g.map[ro.y+dy,ro.x+dx] == 'W')
 					his++;
 
 			if(his>=2 || his==hi.length)
 				cand = [tuple('S',int.max)];
 			if(cand.empty) {
 				const(Pos)[] tgt;
-				for(int y=1; y<=g.H; ++y)
-				for(int x=1; x<=g.W; ++x)
-					if(g[y,x]=='.'||g[y,x]==' ') {
+				for(int y=1; y<=g.map.H; ++y)
+				for(int x=1; x<=g.map.W; ++x)
+					if(g.map[y,x]=='.'||g.map[y,x]==' ') {
 						his = 0;
 						for(int dy=-1; dy<=+1; ++dy)
 						for(int dx=-1; dx<=+1; ++dx)
-							if(g[y+dy,x+dx] == 'W')
+							if(g.map[y+dy,x+dx] == 'W')
 								his++;
 						if(his>=2)
 							tgt ~= new Pos(y,x);
 					}
 				cand ~= search(g, ro, tgt, death, true);
@@ -103,15 +103,15 @@
 		}
 
 		// 'dig' mode
 		if(cand.empty) {
 			const(Pos)[] tgt;
-			for(int y=1; y<=g.H; ++y)
-			for(int x=1; x<=g.W; ++x)
-				if(g[y,x]=='.')
-					if(g[y+1,x]=='*'||g[y+1,x-1]=='*'||g[y+1,x+1]=='*'
-					 ||g[y,x+1]=='*'||g[y,x-1]=='*')
+			for(int y=1; y<=g.map.H; ++y)
+			for(int x=1; x<=g.map.W; ++x)
+				if(g.map[y,x]=='.')
+					if(g.map[y+1,x]=='*'||g.map[y+1,x-1]=='*'||g.map[y+1,x+1]=='*'
+					 ||g.map[y,x+1]=='*'||g.map[y,x-1]=='*')
 						tgt ~= new Pos(y,x);
 			cand ~= search(g, ro, tgt, death, true);
 		}
 
 		if(cand.empty) {
@@ -135,11 +135,11 @@
 
 		if(c == 'W')
 			wait_count++;
 		else
 			wait_count = 0;
-		if(choke_count >= g.H)
+		if(choke_count >= g.map.H)
 			c = 'A';
 
 		bool[char] choice;
 		foreach(t; cand)
 			choice[t[0]] = true;
@@ -159,21 +159,21 @@
 
 	Tuple!(char,int)[] search(in Game g, in Pos s, in Pos[] gs, string death, bool danger_ok=false)
 	{
 		bool danger(int y, int x)
 		{
-			if(g[y,x] == ' ' || g[y,x] == 'R')
+			if(g.map[y,x] == ' ' || g.map[y,x] == 'R')
 				return false;
-			if(g[y+1,x] == '*')
+			if(g.map[y+1,x] == '*')
+				return true;
+			if(g.map[y+1,x-1]=='*' && (g.map[y,x-1]=='\\'||g.map[y,x-1]=='*') && (g.map[y+1,x]==' '||g.map[y+1,x]=='R'))
 				return true;
-			if(g[y+1,x-1]=='*' && (g[y,x-1]=='\\'||g[y,x-1]=='*') && (g[y+1,x]==' '||g[y+1,x]=='R'))
+			if(g.map[y+1,x+1]=='*' && (g.map[y,x+1]=='*') && (g.map[y+1,x]==' '||g.map[y+1,x]=='R'))
 				return true;
-			if(g[y+1,x+1]=='*' && (g[y,x+1]=='*') && (g[y+1,x]==' '||g[y+1,x]=='R'))
+			if(g.map[y,x-1]=='*' && (g.map[y-1,x-1]=='\\'||g.map[y-1,x-1]=='*') && (g.map[y-1,x]==' '||g.map[y-1,x]=='R'))
 				return true;
-			if(g[y,x-1]=='*' && (g[y-1,x-1]=='\\'||g[y-1,x-1]=='*') && (g[y-1,x]==' '||g[y-1,x]=='R'))
-				return true;
-			if(g[y,x+1]=='*' && (g[y-1,x+1]=='*') && (g[y-1,x]==' '||g[y-1,x]=='R'))
+			if(g.map[y,x+1]=='*' && (g.map[y-1,x+1]=='*') && (g.map[y-1,x]==' '||g.map[y-1,x]=='R'))
 				return true;
 			return false;
 		}
 
 		// avoid directly below '*'
@@ -180,22 +180,22 @@
 		Tuple!(char,int)[] tryA() {
 			const(Pos)[] q;
 			foreach(p; gs)
 				if(!danger(p.y,p.x))
 					q ~= p;
-			bool[][] v = new bool[][](g.H+2, g.W+2);
+			bool[][] v = new bool[][](g.map.H+2, g.map.W+2);
 			foreach(p; q) v[p.y][p.x]=true;
 			for(int step=1; q.length; ++step) {
 				Pos[] q2;
 				foreach(p; q) {
 					int[] yyy=[p.y-1,p.y+1,p.y,p.y];
 					int[] xxx=[p.x,p.x,p.x-1,p.x+1];
 					for(int i=0; i<yyy.length; ++i) {
 						int y = yyy[i];
 						int x = xxx[i];
-						if('1'<=g[y,x]&&g[y,x]<='9') {
-							foreach(ppp; g.trampoline_rev(g[y,x])) {
+						if('1'<=g.map[y,x]&&g.map[y,x]<='9') {
+							foreach(ppp; g.map.tr_source[g.map[y,x]]) {
 								yyy ~= ppp.y;
 								xxx ~= ppp.x;
 							}
 							continue;
 						}
@@ -203,11 +203,11 @@
 						if(y==s.y && x==s.x && i<4) {
 							char c = "UDRL"[i];
 							if( death.count(c) == 0 )
 								return [tuple(c,step)];
 						} else if(forbidden_cell[y][x]){
-						} else if(g[y,x]==' '||g[y,x]=='\\'||g[y,x]=='.'||g[y,x]=='!'||i>=4) {
+						} else if(g.map[y,x]==' '||g.map[y,x]=='\\'||g.map[y,x]=='.'||g.map[y,x]=='!'||i>=4) {
 							if(danger(y,x))
 								continue;
 							q2 ~= new Pos(y,x);
 							v[y][x]=true;
 						}
@@ -220,22 +220,22 @@
 
 		// any empty space is my ground
 		Tuple!(char,int)[] tryB() {
 			const(Pos)[] q;
 			foreach(p; gs) q ~= p;
-			bool[][] v = new bool[][](g.H+2, g.W+2);
+			bool[][] v = new bool[][](g.map.H+2, g.map.W+2);
 			foreach(p; q) v[p.y][p.x]=true;
 			for(int step=10; q.length; ++step) {
 				Pos[] q2;
 				foreach(p; q) {
 					int[] yyy=[p.y-1,p.y+1,p.y,p.y];
 					int[] xxx=[p.x,p.x,p.x-1,p.x+1];
 					for(int i=0; i<yyy.length; ++i) {
 						int y = yyy[i];
 						int x = xxx[i];
-						if('1'<=g[y,x]&&g[y,x]<='9') {
-							foreach(ppp; g.trampoline_rev(g[y,x])) {
+						if('1'<=g.map[y,x]&&g.map[y,x]<='9') {
+							foreach(ppp; g.map.tr_source[g.map[y,x]]) {
 								yyy ~= ppp.y;
 								xxx ~= ppp.x;
 							}
 							continue;
 						}
@@ -243,11 +243,11 @@
 						if(y==s.y && x==s.x && i<4) {
 							char c = "UDRL"[i];
 							if( death.count(c) == 0 )
 								return [tuple(c,step)];
 						} else if(forbidden_cell[y][x]){
-						} else if(g[y,x]==' '||g[y,x]=='\\'||g[y,x]=='.'||g[y,x]=='!'||i>=4) {
+						} else if(g.map[y,x]==' '||g.map[y,x]=='\\'||g.map[y,x]=='.'||g.map[y,x]=='!'||i>=4) {
 							q2 ~= new Pos(y,x);
 							v[y][x]=true;
 						}
 					}
 				}
@@ -258,27 +258,27 @@
 
 		// push rocks!
 		Tuple!(char,int)[] tryC() {
 			const(Pos)[] q;
 			foreach(p; gs) q ~= p;
-			bool[][] v = new bool[][](g.H+2, g.W+2);
+			bool[][] v = new bool[][](g.map.H+2, g.map.W+2);
 			foreach(p; q) v[p.y][p.x]=true;
 			for(int step=20; q.length; ++step) {
 				Pos[] q2;
 				foreach(p; q) {
 					int[] yyy=[p.y-1,p.y+1,p.y,p.y];
 					int[] xxx=[p.x,p.x,p.x-1,p.x+1];
 					for(int i=0; i<yyy.length; ++i) {
 						int y = yyy[i];
 						int x = xxx[i];
-						if(g[p] == '*') {
+						if(g.map[p] == '*') {
 							if(i>=4)continue;
 							if(y!=p.y)continue;
-							if(g[y,p.x+(p.x-x)]!=' '&&g[y,p.x+(p.x-x)]!='R')continue;
+							if(g.map[y,p.x+(p.x-x)]!=' '&&g.map[y,p.x+(p.x-x)]!='R')continue;
 						}
-						if('1'<=g[y,x]&&g[y,x]<='9') {
-							foreach(ppp; g.trampoline_rev(g[y,x])) {
+						if('1'<=g.map[y,x]&&g.map[y,x]<='9') {
+							foreach(ppp; g.map.tr_source[g.map[y,x]]) {
 								yyy ~= ppp.y;
 								xxx ~= ppp.x;
 							}
 							continue;
 						}
@@ -286,11 +286,11 @@
 						if(y==s.y && x==s.x && i<4) {
 							char c = "UDRL"[i];
 							if( death.count(c) == 0 )
 								return [tuple(c,step)];
 						} else if(forbidden_cell[y][x]){
-						} else if(g[y,x]==' '||g[y,x]=='\\'||g[y,x]=='.'||g[y,x]=='*'||g[y,x]=='!'||i>=4) {
+						} else if(g.map[y,x]==' '||g.map[y,x]=='\\'||g.map[y,x]=='.'||g.map[y,x]=='*'||g.map[y,x]=='!'||i>=4) {
 							q2 ~= new Pos(y,x);
 							v[y][x]=true;
 						}
 					}
 				}
@@ -316,11 +316,11 @@
 
 	Tuple!(Solver,string) run_sub_solver(in Game g)
 	{
 		string log;
 		auto s = new Solver(g);
-		while(!g.cleared && !g.dead && plan.length<=g.H*g.W) {
+		while(!g.cleared && !g.dead && plan.length<=g.map.H*g.map.W) {
 			char c = s.single_step();
 			if( c == 'A' )
 				break;
 			log ~= c;
 		}

Index: src/util.d
==================================================================
--- src/util.d
+++ src/util.d
@@ -6,18 +6,10 @@
 public import std.string;
 public import std.typecons;
 public import std.math;
 import std.c.stdlib;
 
-T[] erase(T,V)(T[] xs, V y)
-{
-	foreach(i,x; xs)
-		if(x == y)
-			return xs[0..i]~xs[i+1..$];
-	return xs;
-}
-
 // To avoide the following ICE:
 //   src\phobos\std\algorithm.d(4552):
 //     Error: function std.algorithm.count!("a == b",string,char).count
 //     compiler error, parameter 'value', bugzilla 2962?
 //     Assertion failure: '0' on line 717 in file 'glue.c'