@@ -296,5 +296,81 @@
 		return (danger_ok ? [] : tryA()) ~ tryB() ~ tryC();
 	}
 }
 
-alias Solver_1 MainSolver;
+class Solver_2(Solver)
+{
+	string plan;
+
+	Game g;
+	this(in Game g)
+	{
+		this.g = g.clone();
+		make_plan(g);
+	}
+
+	Tuple!(Solver,string) run_sub_solver(in Game g)
+	{
+		string log;
+		auto s = new Solver(g);
+		while(!g.cleared && !g.dead && plan.length<=g.map.H*g.map.W) {
+			char c = s.single_step();
+			if( c == 'A' )
+				break;
+			log ~= c;
+		}
+		while(log.length>0 && log[$-1]=='W')
+			log.length--;
+		return tuple(s, log);
+	}
+
+	void make_plan(in Game g) {
+		Tuple!(Solver,string) x = run_sub_solver(g);
+		plan = x[1];
+		if(x[0].g.cleared)
+			return;
+		modify_plan(g, x[0].g.score);
+	}
+
+	void modify_plan(in Game ini, long unmod)
+	{
+		int bp = max(0, (cast(int)plan.length)-10);
+		Game g = ini.clone();
+		for(int i=0; i<bp; ++i) g.command(plan[i]);
+
+		Tuple!(string,long) cand = tuple(plan, unmod);
+		for(int i=bp; i<plan.length; ++i) {
+			foreach(char c; "UDLR")
+				if(c != plan[i]) {
+					Tuple!(string,long) zz = try_plan(c, g);
+					if(cand[1]<zz[1])
+						cand = tuple(plan[0..i]~c~zz[0], zz[1]);
+				}
+			g.command(plan[i]);
+		}
+		plan = cand[0];
+	}
+
+	Tuple!(string,long) try_plan(char c, in Game g)
+	{
+		Game gg = g.clone();
+		gg.command(c);
+		Tuple!(Solver, string) x = run_sub_solver(gg);
+		return tuple(x[1], x[0].g.score);
+	}
+
+	char single_step() {
+		if(plan.empty)
+			return 'A';
+		char c = plan[0];
+		plan = plan[1..$];
+		g.command(c);
+		return c;
+	}
+
+	void force(char c) {
+		g.command(c);
+		make_plan(g);
+	}
+}
+
+alias Solver_2!(Solver_1) MainSolver;