Check-in [68b686ff6d]
Not logged in
Overview
SHA1 Hash:68b686ff6d3760b7f9d399d1a4695f56b2409beb
Date: 2012-07-15 22:58:47
User: kinaba
Comment:memo
Timelines: family | ancestors | descendants | both | trunk
Diffs: redesign
Downloads: Tarball | ZIP archive
Other Links: files | file ages | manifest
Tags And Properties
Changes

Modified score_memo.txt from [845f96be529f982d] to [0e695941ab7be6d2].

1 1 contest1 212! 2 2 contest2 280? 3 3 contest3 275! 4 4 contest4 561? 5 5 contest5 1281? 6 -contest6 737 6 +contest6 737 // 一度通り過ぎるとふさがってしまう曲がり道 7 7 contest7 867? 8 -contest8 1245 8 +contest8 1245 // 無理ゲー 9 9 contest9 3042? 10 -contest10 2076 11 -flood1 569 10 +contest10 2076 // "λの上に岩" トラップが複数 11 +flood1 569 // 崩すの怖がりすぎ & 一直線に並んでるのに真ん中から取るのはどうなの 12 12 flood2 280? 13 -flood3 802 14 -flood4 970 13 +flood3 802 // 溺死 14 +flood4 970 // むずかしい岩崩し 15 15 flood5 561? 16 -trampoline1 291 16 +trampoline1 291 // むずかしい岩崩し 17 17 trampoline2 1728? 18 -trampoline3 698 18 +trampoline3 698 // "上に岩" ワープゾーン版 19 19 beard1 856? 20 -beard2 2792 21 -beard3 811 22 -beard4 677 23 -beard5 665 20 +beard2 2792 // 崩すの怖がりすぎて間に合わなくなって溺死 21 +beard3 811 // 無理ゲー:速攻で髭刈らないといけない 22 +beard4 677 // 岩が落ちてきてデッドエンド 23 +beard5 665 // これクリアできるの 24 24 horock1 333 25 25 horock2 235 26 26 horock3 1542

Modified src/Makefile from [00843a9ae2199a17] to [de085b8055253640].

1 1 # To build, the following packages are needed. 2 -# wget http://ftp.digitalmars.com/dmd_2.059-0_i386.deb 3 -# sudo apt-get install gcc gcc-multilib 4 -# sudo pkg -i dmd_2.059-0_i386.deb 2 +# $ wget http://ftp.digitalmars.com/dmd_2.059-0_i386.deb 3 +# $ sudo apt-get install gcc gcc-multilib 4 +# $ sudo pkg -i dmd_2.059-0_i386.deb 5 +# 6 +# Optional GUI is Windows only. Need to install DFL (http://github.com/Rayerd/dfl). 5 7 6 -all: 8 +cui: 7 9 dmd -O -release -inline -oflifter main.d driver.d game.d output.d solver.d util.d 8 10 9 11 gui: 10 - dmd -O -release -inline -ofgui_lifter gui_main.d driver.d game.d output.d solver.d util.d 12 + dmd -O -release -inline -ofgui gui_main.d gui.d driver.d game.d output.d solver.d util.d 13 + 14 +clean: 15 + rm *.obj *.o *.exe *.deps

Modified src/gui.d from [a1f9b7cabb9073dd] to [a6dfca9cc307c324].

55 55 this.font = new Font("MS Gothic", cell-2, GraphicsUnit.PIXEL); 56 56 this.backColor = Color(255,255,255); 57 57 this.colors['#'] = 58 58 this.colors['.'] = Color(255,191,127); 59 59 this.colors['*'] = 60 60 this.colors['@'] = Color(255,127,127); 61 61 this.colors['R'] = Color(128,128,0); 62 + this.colors['r'] = Color(100,128,255); 62 63 this.colors['d'] = Color(255,0,0); 63 64 this.colors['\\'] = 64 65 this.colors['L'] = 65 66 this.colors['O'] = Color(127,255,127); 66 67 this.colors['w'] = Color(204,229,255); 67 68 this.colors['W'] = 68 69 this.colors['!'] = Color(159,159,159); ................................................................................ 70 71 foreach(char c; '1'..':') this.colors[c] = Color(255,142,255); 71 72 this.render['#'] = "■"; 72 73 this.render['*'] = "✹"; 73 74 this.render['@'] = "❁"; 74 75 this.render['.'] = "♒"; 75 76 this.render['\\'] = "λ"; 76 77 this.render['R'] = "☃"; 78 + this.render['r'] = "☃"; 77 79 this.render['d'] = "☠"; 78 80 this.render['L'] = "☒"; 79 81 this.render['O'] = "☐"; 80 82 this.render['W'] = "ꔣ"; 81 83 this.render['!'] = "✄"; 82 84 foreach(c,tp; g.map.tr_target) this.render[c] = [cast(dchar)('☢'+g.map[tp]-'1')].to!string(); 83 85 foreach(char c; '1'..':') this.render[c] = [cast(dchar)('☢'+c-'1')].to!string(); ................................................................................ 100 102 101 103 // Paint map. 102 104 for(int y=1; y<=g.map.H; ++y) 103 105 for(int x=1; x<=g.map.W; ++x) { 104 106 Rect r = Rect(cell*(x-1), scrH-cell*y, cell, cell); 105 107 char c = g.map[y,x]; 106 108 if( c != ' ' ) { 107 - if( c == 'R' && g.dead ) 108 - c = 'd'; 109 + if( c == 'R' ) 110 + c = (g.dead ? 'd' : g.cleared ? 'r' : 'R'); 109 111 graphicContext.drawText(this.render[c], font, this.colors[c], r); 110 112 } 111 113 } 112 114 113 115 // Update textual info. 114 116 this.text = .text( 115 117 "Score: ", g.score,