super-tux-commit Mailing List for Super Tux (Page 38)
Brought to you by:
wkendrick
Menu
▾
▴
super-tux-commit — Messages about commits to the sourcecode.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
(94) |
Apr
(500) |
May
(531) |
Jun
(196) |
Jul
(224) |
Aug
(193) |
Sep
(117) |
Oct
(115) |
Nov
(319) |
Dec
(97) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(19) |
Feb
|
Mar
(105) |
Apr
(41) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(6) |
| 2007 |
Jan
(1) |
Feb
(2) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
(2) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
(4) |
Jul
|
Aug
|
Sep
(7) |
Oct
(12) |
Nov
(26) |
Dec
(39) |
| 2009 |
Jan
(6) |
Feb
(15) |
Mar
(10) |
Apr
(25) |
May
(29) |
Jun
(21) |
Jul
(26) |
Aug
(8) |
Sep
(3) |
Oct
|
Nov
|
Dec
(10) |
| 2010 |
Jan
(5) |
Feb
(5) |
Mar
(2) |
Apr
|
May
(5) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
(2) |
Oct
(2) |
Nov
|
Dec
|
Update of /cvsroot/super-tux/supertux/data/images/tilesets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16703/data/images/tilesets Modified Files: supertux.stgt waterfall0-0-1.png waterfall0-0-2.png waterfall0-1-1.png waterfall0-1-2.png waterfall0-2-1.png waterfall0-2-2.png waterfall1-0-1.png waterfall1-0-2.png waterfall1-1-1.png waterfall1-1-2.png waterfall1-1-3.png waterfall1-1-4.png waterfall1-2-1.png waterfall1-2-2.png waterfall1-2-3.png waterfall1-2-4.png waterfall1-3-1.png waterfall1-3-2.png waterfall1-3-3.png waterfall1-3-4.png waterfall1-4-1.png waterfall1-4-2.png waterfall1-4-3.png waterfall1-4-4.png waterfall1-5-1.png waterfall1-5-2.png Added Files: water-trans.png waterfall-trans1-1-1.png waterfall-trans1-1-2.png waterfall-trans1-1-3.png waterfall-trans1-1-4.png waterfall-trans1-2-1.png waterfall-trans1-2-2.png waterfall-trans1-2-3.png waterfall-trans1-2-4.png waterfall-trans1-3-1.png waterfall-trans1-3-2.png waterfall-trans1-3-3.png waterfall-trans1-3-4.png waterfall-trans1-4-1.png waterfall-trans1-4-2.png waterfall-trans1-4-3.png waterfall-trans1-4-4.png waterfall-trans2-1-1.png waterfall-trans2-1-2.png waterfall-trans2-1-3.png waterfall-trans2-1-4.png waterfall-trans2-2-1.png waterfall-trans2-2-2.png waterfall-trans2-2-3.png waterfall-trans2-2-4.png waterfall-trans2-3-1.png waterfall-trans2-3-2.png waterfall-trans2-3-3.png waterfall-trans2-3-4.png waterfall-trans2-4-1.png waterfall-trans2-4-2.png waterfall-trans2-4-3.png waterfall-trans2-4-4.png waterfall-trans3-1-1.png waterfall-trans3-1-2.png waterfall-trans3-1-3.png waterfall-trans3-1-4.png waterfall-trans3-2-1.png waterfall-trans3-2-2.png waterfall-trans3-2-3.png waterfall-trans3-2-4.png waterfall-trans3-3-1.png waterfall-trans3-3-2.png waterfall-trans3-3-3.png waterfall-trans3-3-4.png waterfall-trans3-4-1.png waterfall-trans3-4-2.png waterfall-trans3-4-3.png waterfall-trans3-4-4.png waterfall-trans4-1-1.png waterfall-trans4-1-2.png waterfall-trans4-1-3.png waterfall-trans4-1-4.png waterfall-trans4-2-1.png waterfall-trans4-2-2.png waterfall-trans4-2-3.png waterfall-trans4-2-4.png waterfall-trans4-3-1.png waterfall-trans4-3-2.png waterfall-trans4-3-3.png waterfall-trans4-3-4.png waterfall-trans4-4-1.png waterfall-trans4-4-2.png waterfall-trans4-4-3.png waterfall-trans4-4-4.png waterfall-trans5-1-1.png waterfall-trans5-1-2.png waterfall-trans5-1-3.png waterfall-trans5-1-4.png waterfall-trans5-2-1.png waterfall-trans5-2-2.png waterfall-trans5-2-3.png waterfall-trans5-2-4.png waterfall-trans5-3-1.png waterfall-trans5-3-2.png waterfall-trans5-3-3.png waterfall-trans5-3-4.png waterfall-trans5-4-1.png waterfall-trans5-4-2.png waterfall-trans5-4-3.png waterfall-trans5-4-4.png waterfall0-0-3.png waterfall0-0-4.png waterfall0-1-3.png waterfall0-1-4.png waterfall0-2-3.png waterfall0-2-4.png waterfall1-0-3.png waterfall1-0-4.png waterfall1-5-3.png waterfall1-5-4.png waves-trans-0.png waves-trans-1.png waves-trans-2.png Log Message: added new waterfall and transparent water tiles by unDEFER, used it in levels 5,24,25 Index: waterfall1-5-2.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-5-2.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvsBf7sPk and /tmp/cvsicA7kn differ Index: waterfall1-4-3.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-4-3.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvsqzhkPr and /tmp/cvsX8bBpu differ --- NEW FILE: waterfall-trans3-4-4.png --- (This appears to be a binary file; contents omitted.) Index: waterfall1-3-1.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-3-1.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvs265goF and /tmp/cvstigF7H differ --- NEW FILE: waterfall-trans3-1-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans3-3-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans2-1-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans4-3-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans2-4-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans2-2-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans5-1-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans5-3-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans5-4-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans2-2-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans1-1-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans1-1-4.png --- (This appears to be a binary file; contents omitted.) Index: waterfall0-0-2.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall0-0-2.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvsdVdw80 and /tmp/cvs2S3N53 differ --- NEW FILE: water-trans.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans2-1-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans5-2-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans3-3-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans2-4-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans2-1-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans5-1-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans1-4-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans3-2-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans3-2-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans1-2-4.png --- (This appears to be a binary file; contents omitted.) Index: supertux.stgt =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/supertux.stgt,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- supertux.stgt 8 Aug 2004 10:34:33 -0000 1.45 +++ supertux.stgt 16 Aug 2004 17:02:50 -0000 1.46 @@ -12,14 +12,16 @@ (tilegroup (name "Classic-Bg") (tiles 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101)) (tilegroup (name "Points") (tiles 132 133)) (tilegroup (name "Bonus") (tiles 44 83 84 102 140 103 104 105 112 128)) - (tilegroup (name "Misc") (tiles 75 76 79 80 126 127 129 130 134 135 81 200 173 174)) + (tilegroup (name "Misc") (tiles 75 76 200 201 79 80 126 127 129 130 134 135 81 300 173 174)) (tilegroup (name "Pipe") (tiles 53 54 55 56 57 58 59 60)) (tilegroup (name "Grey") (tiles 64 65 66 67 68 69)) (tilegroup (name "Signs") (tiles 136 137 138 139 141 142 143 144)) (tilegroup (name "Grasslands") (tiles 145 146 147 148)) (tilegroup (name "Jungle") (tiles 301 302 303 304 305 306 307 308 309 310 311 312)) (tilegroup (name "Slopes") (tiles 400 401)) - (tilegroup (name "Waterfall") (tiles 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199)) + (tilegroup (name "Waterfall-trans") (tiles 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194)) + (tilegroup (name "Waterfall") (tiles 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294)) + (tilegroup (name "Waterfall-edgecloud") (tile 195 196 197 198 199)) (tile (id 0) (images "notile.png")) @@ -601,114 +603,214 @@ (water #t) (anim-speed 120)) - ;; WaterFall + ;; WaterFall (tile (id 175) - (images "waterfall1-1-1.png" "waterfall1-1-2.png" "waterfall1-1-3.png" "waterfall1-1-4.png") + (images "waterfall-trans1-1-1.png" "waterfall-trans1-1-2.png" "waterfall-trans1-1-3.png" "waterfall-trans1-1-4.png") (water #t) (anim-speed 45)) (tile (id 176) - (images "waterfall1-2-1.png" "waterfall1-2-2.png" "waterfall1-2-3.png" "waterfall1-2-4.png") + (images "waterfall-trans1-2-1.png" "waterfall-trans1-2-2.png" "waterfall-trans1-2-3.png" "waterfall-trans1-2-4.png") (water #t) (anim-speed 45)) (tile (id 177) - (images "waterfall1-3-1.png" "waterfall1-3-2.png" "waterfall1-3-3.png" "waterfall1-3-4.png") + (images "waterfall-trans1-3-1.png" "waterfall-trans1-3-2.png" "waterfall-trans1-3-3.png" "waterfall-trans1-3-4.png") (water #t) (anim-speed 45)) (tile (id 178) - (images "waterfall1-4-1.png" "waterfall1-4-2.png" "waterfall1-4-3.png" "waterfall1-4-4.png") + (images "waterfall-trans1-4-1.png" "waterfall-trans1-4-2.png" "waterfall-trans1-4-3.png" "waterfall-trans1-4-4.png") (water #t) (anim-speed 45)) (tile (id 179) - (images "waterfall2-1-1.png" "waterfall2-1-2.png" "waterfall2-1-3.png" "waterfall2-1-4.png") + (images "waterfall-trans2-1-1.png" "waterfall-trans2-1-2.png" "waterfall-trans2-1-3.png" "waterfall-trans2-1-4.png") (water #t) (anim-speed 45)) (tile (id 180) - (images "waterfall2-2-1.png" "waterfall2-2-2.png" "waterfall2-2-3.png" "waterfall2-2-4.png") + (images "waterfall-trans2-2-1.png" "waterfall-trans2-2-2.png" "waterfall-trans2-2-3.png" "waterfall-trans2-2-4.png") (water #t) (anim-speed 45)) (tile (id 181) - (images "waterfall2-3-1.png" "waterfall2-3-2.png" "waterfall2-3-3.png" "waterfall2-3-4.png") + (images "waterfall-trans2-3-1.png" "waterfall-trans2-3-2.png" "waterfall-trans2-3-3.png" "waterfall-trans2-3-4.png") (water #t) (anim-speed 45)) (tile (id 182) - (images "waterfall2-4-1.png" "waterfall2-4-2.png" "waterfall2-4-3.png" "waterfall2-4-4.png") + (images "waterfall-trans2-4-1.png" "waterfall-trans2-4-2.png" "waterfall-trans2-4-3.png" "waterfall-trans2-4-4.png") (water #t) (anim-speed 45)) (tile (id 183) - (images "waterfall3-1-1.png" "waterfall3-1-2.png" "waterfall3-1-3.png" "waterfall3-1-4.png") + (images "waterfall-trans3-1-1.png" "waterfall-trans3-1-2.png" "waterfall-trans3-1-3.png" "waterfall-trans3-1-4.png") (water #t) (anim-speed 45)) (tile (id 184) - (images "waterfall3-2-1.png" "waterfall3-2-2.png" "waterfall3-2-3.png" "waterfall3-2-4.png") + (images "waterfall-trans3-2-1.png" "waterfall-trans3-2-2.png" "waterfall-trans3-2-3.png" "waterfall-trans3-2-4.png") (water #t) (anim-speed 45)) (tile (id 185) - (images "waterfall3-3-1.png" "waterfall3-3-2.png" "waterfall3-3-3.png" "waterfall3-3-4.png") + (images "waterfall-trans3-3-1.png" "waterfall-trans3-3-2.png" "waterfall-trans3-3-3.png" "waterfall-trans3-3-4.png") (water #t) (anim-speed 45)) (tile (id 186) - (images "waterfall3-4-1.png" "waterfall3-4-2.png" "waterfall3-4-3.png" "waterfall3-4-4.png") + (images "waterfall-trans3-4-1.png" "waterfall-trans3-4-2.png" "waterfall-trans3-4-3.png" "waterfall-trans3-4-4.png") (water #t) (anim-speed 45)) (tile (id 187) - (images "waterfall4-1-1.png" "waterfall4-1-2.png" "waterfall4-1-3.png" "waterfall4-1-4.png") + (images "waterfall-trans4-1-1.png" "waterfall-trans4-1-2.png" "waterfall-trans4-1-3.png" "waterfall-trans4-1-4.png") (water #t) (anim-speed 45)) (tile (id 188) - (images "waterfall4-2-1.png" "waterfall4-2-2.png" "waterfall4-2-3.png" "waterfall4-2-4.png") + (images "waterfall-trans4-2-1.png" "waterfall-trans4-2-2.png" "waterfall-trans4-2-3.png" "waterfall-trans4-2-4.png") (water #t) (anim-speed 45)) (tile (id 189) - (images "waterfall4-3-1.png" "waterfall4-3-2.png" "waterfall4-3-3.png" "waterfall4-3-4.png") + (images "waterfall-trans4-3-1.png" "waterfall-trans4-3-2.png" "waterfall-trans4-3-3.png" "waterfall-trans4-3-4.png") (water #t) (anim-speed 45)) (tile (id 190) - (images "waterfall4-4-1.png" "waterfall4-4-2.png" "waterfall4-4-3.png" "waterfall4-4-4.png") + (images "waterfall-trans4-4-1.png" "waterfall-trans4-4-2.png" "waterfall-trans4-4-3.png" "waterfall-trans4-4-4.png") (water #t) (anim-speed 45)) (tile (id 191) - (images "waterfall5-1-1.png" "waterfall5-1-2.png" "waterfall5-1-3.png" "waterfall5-1-4.png") + (images "waterfall-trans5-1-1.png" "waterfall-trans5-1-2.png" "waterfall-trans5-1-3.png" "waterfall-trans5-1-4.png") (water #t) (anim-speed 45)) (tile (id 192) - (images "waterfall5-2-1.png" "waterfall5-2-2.png" "waterfall5-2-3.png" "waterfall5-2-4.png") + (images "waterfall-trans5-2-1.png" "waterfall-trans5-2-2.png" "waterfall-trans5-2-3.png" "waterfall-trans5-2-4.png") (water #t) (anim-speed 45)) (tile (id 193) - (images "waterfall5-3-1.png" "waterfall5-3-2.png" "waterfall5-3-3.png" "waterfall5-3-4.png") + (images "waterfall-trans5-3-1.png" "waterfall-trans5-3-2.png" "waterfall-trans5-3-3.png" "waterfall-trans5-3-4.png") (water #t) (anim-speed 45)) (tile (id 194) - (images "waterfall5-4-1.png" "waterfall5-4-2.png" "waterfall5-4-3.png" "waterfall5-4-4.png") + (images "waterfall-trans5-4-1.png" "waterfall-trans5-4-2.png" "waterfall-trans5-4-3.png" "waterfall-trans5-4-4.png") (water #t) (anim-speed 45)) (tile (id 195) - (images "waterfall1-0-0.png" "waterfall1-0-1.png" "waterfall1-0-2.png") + (images "waterfall1-0-1.png" "waterfall1-0-2.png" "waterfall1-0-3.png" "waterfall1-0-4.png") (water #t) - (anim-speed 50)) + (anim-speed 45)) (tile (id 196) - (images "waterfall1-5-0.png" "waterfall1-5-1.png" "waterfall1-5-2.png") + (images "waterfall1-5-1.png" "waterfall1-5-2.png" "waterfall1-5-3.png" "waterfall1-5-4.png") (water #t) - (anim-speed 50)) + (anim-speed 45)) (tile (id 197) - (images "waterfall0-0-0.png" "waterfall0-0-1.png" "waterfall0-0-2.png") + (images "waterfall0-0-1.png" "waterfall0-0-2.png" "waterfall0-0-3.png" "waterfall0-0-4.png") (water #t) - (anim-speed 50)) + (anim-speed 45)) (tile (id 198) - (images "waterfall0-1-0.png" "waterfall0-1-1.png" "waterfall0-1-2.png") + (images "waterfall0-1-1.png" "waterfall0-1-2.png" "waterfall0-1-3.png" "waterfall0-1-4.png") (water #t) - (anim-speed 50)) + (anim-speed 45)) (tile (id 199) - (images "waterfall0-2-0.png" "waterfall0-2-1.png" "waterfall0-2-2.png") + (images "waterfall0-2-1.png" "waterfall0-2-2.png" "waterfall0-2-3.png" "waterfall0-2-4.png") + (water #t) + (anim-speed 45)) + + (tile (id 200) + (images "water-trans.png") + (water #t)) + (tile (id 201) + (images "waves-trans-0.png" "waves-trans-1.png" "waves-trans-2.png") (water #t) (anim-speed 50)) + (tile (id 275) + (images "waterfall1-1-1.png" "waterfall1-1-2.png" "waterfall1-1-3.png" "waterfall1-1-4.png") + (water #t) + (anim-speed 45)) + (tile (id 276) + (images "waterfall1-2-1.png" "waterfall1-2-2.png" "waterfall1-2-3.png" "waterfall1-2-4.png") + (water #t) + (anim-speed 45)) + (tile (id 277) + (images "waterfall1-3-1.png" "waterfall1-3-2.png" "waterfall1-3-3.png" "waterfall1-3-4.png") + (water #t) + (anim-speed 45)) + (tile (id 278) + (images "waterfall1-4-1.png" "waterfall1-4-2.png" "waterfall1-4-3.png" "waterfall1-4-4.png") + (water #t) + (anim-speed 45)) + + (tile (id 279) + (images "waterfall2-1-1.png" "waterfall2-1-2.png" "waterfall2-1-3.png" "waterfall2-1-4.png") + (water #t) + (anim-speed 45)) + (tile (id 280) + (images "waterfall2-2-1.png" "waterfall2-2-2.png" "waterfall2-2-3.png" "waterfall2-2-4.png") + (water #t) + (anim-speed 45)) + (tile (id 281) + (images "waterfall2-3-1.png" "waterfall2-3-2.png" "waterfall2-3-3.png" "waterfall2-3-4.png") + (water #t) + (anim-speed 45)) + (tile (id 282) + (images "waterfall2-4-1.png" "waterfall2-4-2.png" "waterfall2-4-3.png" "waterfall2-4-4.png") + (water #t) + (anim-speed 45)) + + (tile (id 283) + (images "waterfall3-1-1.png" "waterfall3-1-2.png" "waterfall3-1-3.png" "waterfall3-1-4.png") + (water #t) + (anim-speed 45)) + (tile (id 284) + (images "waterfall3-2-1.png" "waterfall3-2-2.png" "waterfall3-2-3.png" "waterfall3-2-4.png") + (water #t) + (anim-speed 45)) + (tile (id 285) + (images "waterfall3-3-1.png" "waterfall3-3-2.png" "waterfall3-3-3.png" "waterfall3-3-4.png") + (water #t) + (anim-speed 45)) + (tile (id 286) + (images "waterfall3-4-1.png" "waterfall3-4-2.png" "waterfall3-4-3.png" "waterfall3-4-4.png") + (water #t) + (anim-speed 45)) + + (tile (id 287) + (images "waterfall4-1-1.png" "waterfall4-1-2.png" "waterfall4-1-3.png" "waterfall4-1-4.png") + (water #t) + (anim-speed 45)) + (tile (id 288) + (images "waterfall4-2-1.png" "waterfall4-2-2.png" "waterfall4-2-3.png" "waterfall4-2-4.png") + (water #t) + (anim-speed 45)) + (tile (id 289) + (images "waterfall4-3-1.png" "waterfall4-3-2.png" "waterfall4-3-3.png" "waterfall4-3-4.png") + (water #t) + (anim-speed 45)) + (tile (id 290) + (images "waterfall4-4-1.png" "waterfall4-4-2.png" "waterfall4-4-3.png" "waterfall4-4-4.png") + (water #t) + (anim-speed 45)) + + (tile (id 291) + (images "waterfall5-1-1.png" "waterfall5-1-2.png" "waterfall5-1-3.png" "waterfall5-1-4.png") + (water #t) + (anim-speed 45)) + (tile (id 292) + (images "waterfall5-2-1.png" "waterfall5-2-2.png" "waterfall5-2-3.png" "waterfall5-2-4.png") + (water #t) + (anim-speed 45)) + (tile (id 293) + (images "waterfall5-3-1.png" "waterfall5-3-2.png" "waterfall5-3-3.png" "waterfall5-3-4.png") + (water #t) + (anim-speed 45)) + (tile (id 294) + (images "waterfall5-4-1.png" "waterfall5-4-2.png" "waterfall5-4-3.png" "waterfall5-4-4.png") + (water #t) + (anim-speed 45)) + + ;; Spike + + (tile (id 300) + (spike #t) + (images "spike.png")) + + ;; Jungle (tile (id 301) @@ -760,11 +862,6 @@ "jungle12-3.png" "jungle12-2.png")) - ; Spike - (tile (id 200) - (spike #t) - (images "spike.png")) - ; Slopes (tile (id 400) --- NEW FILE: waterfall-trans1-2-1.png --- (This appears to be a binary file; contents omitted.) Index: waterfall1-3-4.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-3-4.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvsKRrYii and /tmp/cvsAkP2pl differ Index: waterfall1-1-1.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-1-1.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvszGAzDh and /tmp/cvsc8KkQk differ --- NEW FILE: waterfall-trans3-1-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall0-0-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans3-3-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans1-3-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall0-1-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans3-4-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans2-3-3.png --- (This appears to be a binary file; contents omitted.) Index: waterfall1-4-2.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-4-2.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvsSGjd6k and /tmp/cvs0daVmo differ --- NEW FILE: waterfall1-5-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans1-4-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans1-4-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans1-2-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans4-1-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans1-3-1.png --- (This appears to be a binary file; contents omitted.) Index: waterfall0-1-1.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall0-1-1.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvsDtDIku and /tmp/cvskRBiHx differ --- NEW FILE: waterfall0-2-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans4-4-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans3-2-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans4-4-4.png --- (This appears to be a binary file; contents omitted.) Index: waterfall1-3-3.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-3-3.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvsl1SLkC and /tmp/cvsyhQ3KF differ Index: waterfall1-3-2.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-3-2.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvslgNkjF and /tmp/cvs8LdALI differ Index: waterfall1-5-1.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-5-1.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvssfNXqM and /tmp/cvsqkpUXP differ --- NEW FILE: waterfall-trans4-3-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans2-3-1.png --- (This appears to be a binary file; contents omitted.) Index: waterfall1-0-1.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-0-1.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvsPfWJJP and /tmp/cvszZqkkT differ --- NEW FILE: waterfall-trans2-1-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans1-1-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans2-4-3.png --- (This appears to be a binary file; contents omitted.) Index: waterfall1-0-2.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-0-2.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvsmYPdQV and /tmp/cvs1lTetZ differ --- NEW FILE: waterfall-trans4-4-3.png --- (This appears to be a binary file; contents omitted.) Index: waterfall1-2-2.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-2-2.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvsjahGx2 and /tmp/cvsTMM4e6 differ --- NEW FILE: waterfall-trans2-2-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans5-4-1.png --- (This appears to be a binary file; contents omitted.) Index: waterfall1-2-3.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-2-3.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvsuFe0l5 and /tmp/cvsKJye58 differ Index: waterfall1-1-2.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-1-2.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvse7oAq9 and /tmp/cvsm6htcd differ --- NEW FILE: waterfall-trans3-1-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans5-2-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans4-1-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans1-3-2.png --- (This appears to be a binary file; contents omitted.) Index: waterfall0-1-2.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall0-1-2.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvsQrwuef and /tmp/cvse6cm4i differ --- NEW FILE: waterfall-trans3-3-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans4-1-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans5-1-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans4-2-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans2-4-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-5-3.png --- (This appears to be a binary file; contents omitted.) Index: waterfall1-2-4.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-2-4.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvsVVhRCi and /tmp/cvscmRhwm differ Index: waterfall1-4-4.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-4-4.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvsWBGHog and /tmp/cvsTJgolk differ --- NEW FILE: waterfall-trans4-4-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans3-2-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-0-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans3-4-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans5-4-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall0-0-4.png --- (This appears to be a binary file; contents omitted.) Index: waterfall1-1-3.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-1-3.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvsRGdSMg and /tmp/cvsADHlLk differ --- NEW FILE: waterfall-trans1-2-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall0-1-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans5-2-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans1-3-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans5-2-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans5-3-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans2-3-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans5-1-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans4-2-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans4-2-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waves-trans-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans2-3-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waves-trans-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans1-1-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-0-3.png --- (This appears to be a binary file; contents omitted.) Index: waterfall1-2-1.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-2-1.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvsJpILum and /tmp/cvsRJjrvq differ --- NEW FILE: waterfall-trans3-4-3.png --- (This appears to be a binary file; contents omitted.) Index: waterfall1-4-1.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-4-1.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvsbGrm9o and /tmp/cvswGZJbt differ --- NEW FILE: waterfall-trans3-1-4.png --- (This appears to be a binary file; contents omitted.) Index: waterfall1-1-4.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-1-4.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvsz7fd7p and /tmp/cvsPbVMbu differ Index: waterfall0-0-1.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall0-0-1.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvsSCAk7u and /tmp/cvsvCeafz differ --- NEW FILE: waterfall-trans1-4-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans5-4-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans4-1-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans4-3-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall0-2-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans4-3-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans5-3-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans4-2-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans2-2-4.png --- (This appears to be a binary file; contents omitted.) Index: waterfall0-2-2.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall0-2-2.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvsBv5h2A and /tmp/cvszIUtcF differ Index: waterfall0-2-1.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall0-2-1.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvsdUMSKD and /tmp/cvs4GoQWH differ --- NEW FILE: waves-trans-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans5-3-1.png --- (This appears to be a binary file; contents omitted.) |
|
From: Marek M. <wa...@us...> - 2004-08-16 16:14:59
|
Update of /cvsroot/super-tux/supertux/data/images/tilesets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7224/data/images/tilesets Modified Files: Tag: supertux_0_1_1_branch brick0.png brick1.png Log Message: added new box images Index: brick0.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/brick0.png,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -d -r1.2 -r1.2.2.1 Binary files /tmp/cvsO9YvKw and /tmp/cvs9R6O8a differ Index: brick1.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/brick1.png,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -d -r1.2 -r1.2.2.1 Binary files /tmp/cvsVH4BxP and /tmp/cvsIzyXfu differ |
|
From: Ricardo C. <rm...@us...> - 2004-08-16 13:40:15
|
Update of /cvsroot/super-tux/supertux/data/images/tilesets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9583/data/images/tilesets Modified Files: brick0.png brick1.png Log Message: Brick graphics improved by Florian Merz! Index: brick0.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/brick0.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvsOawRPD and /tmp/cvsnKo5Mh differ Index: brick1.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/brick1.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvsJod4SO and /tmp/cvs0QoTVs differ |
Update of /cvsroot/super-tux/supertux/data/images/shared/tux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3372/data/images/shared/tux Added Files: largetux-feet-default-stand-right-0.png largetux-feet-default-walk-left-0.png largetux-head-default-skid-left-0.png largetux-arms-default-stand-right-0.png largetux-feet-default-walk-left-2.png largetux-arms-default-walk-right-0.png largetux-feet-default-walk-right-2.png largetux-arms-default-skid-left-0.png largetux-feet-default-skid-right-0.png largetux-feet-default-buttjump-right-0.png largetux-feet-default-jump-right-0.png largetux-arms-default-walk-right-2.png largetux-arms-default-grab-right-0.png largetux-feet-default-kick-right-0.png largetux-head-blink-stand-right-0.png largetux-head-blink-stand-right-1.png largetux-arms-default-walk-left-5.png largetux-extra-default-whitestars-right-0.png largetux-feet-default-walk-left-3.png largetux-feet-default-jump-left-0.png largetux-head-firefighter-stand-right-0.png largetux-head-default-stand-right-0.png largetux-arms-default-walk-right-3.png largetux-arms-default-jump-right-0.png largetux-arms-default-skid-right-0.png largetux-arms-default-walk-left-0.png largetux-arms-default-walk-right-1.png largetux-head-blink-stand-left-0.png largetux-feet-default-stand-left-0.png largetux-feet-default-walk-left-1.png largetux-feet-default-kick-left-0.png largetux-feet-default-skid-left-0.png largetux-head-angry-stand-right-0.png largetux-head-cool-stand-right-0.png largetux-feet-default-walk-right-3.png largetux-arms-default-walk-right-5.png largetux-feet-default-walk-left-4.png largetux-head-cool-stand-left-0.png largetux-feet-default-walk-right-4.png largetux-body-default-skid-right-0.png largetux-head-default-stand-left-0.png largetux-head-blink-stand-left-1.png largetux-arms-default-stand-left-0.png largetux-body-default-stand-right-0.png largetux-body-default-skid-left-0.png largetux-arms-default-walk-left-3.png largetux-feet-default-walk-right-5.png largetux-feet-default-walk-left-5.png largetux-head-angry-stand-left-0.png largetux-feet-default-walk-right-0.png largetux-arms-default-walk-left-4.png largetux-feet-default-walk-right-1.png largetux-body-default-stand-left-0.png largetux-arms-default-walk-left-1.png largetux-extra-default-whitestars-left-2.png largetux-head-firefighter-stand-left-0.png largetux-arms-default-jump-left-0.png largetux-arms-default-walk-left-2.png largetux-extra-default-whitestars-left-1.png largetux-extra-default-whitestars-left-0.png largetux-head-default-skid-right-0.png largetux-arms-default-walk-right-4.png largetux-extra-default-whitestars-right-2.png largetux-extra-default-whitestars-right-1.png largetux-feet-default-buttjump-left-0.png largetux-arms-default-grab-left-0.png Log Message: To make the animation of the protagonist easier I've separated the steps of the large Tux's animation into different parts. (Added directory data/images/shared/tux/) 'Tux in action' can be put together by using the following layers: - extra (such as invincibility stars or a cape maybe) - arms - feet - head - body The names of the images I've provided might be confusing at first sight, but they may (or may not) make pretty much sense: <character-name>-<body-part>-<modification>-<action>-<direction>-<no.>.png --- NEW FILE: largetux-feet-default-walk-left-5.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-extra-default-whitestars-right-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-feet-default-walk-right-5.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-head-blink-stand-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-body-default-stand-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-feet-default-walk-right-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-body-default-skid-right-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-body-default-skid-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-arms-default-grab-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-extra-default-whitestars-left-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-arms-default-walk-right-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-feet-default-stand-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-arms-default-grab-right-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-arms-default-walk-right-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-arms-default-walk-left-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-feet-default-walk-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-arms-default-skid-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-head-default-stand-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-feet-default-skid-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-extra-default-whitestars-right-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-extra-default-whitestars-right-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-head-blink-stand-left-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-feet-default-walk-right-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-feet-default-walk-right-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-arms-default-stand-right-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-feet-default-buttjump-right-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-arms-default-skid-right-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-arms-default-walk-right-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-head-cool-stand-right-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-arms-default-walk-right-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-extra-default-whitestars-left-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-arms-default-walk-left-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-feet-default-jump-right-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-head-default-skid-right-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-feet-default-stand-right-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-arms-default-walk-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-arms-default-walk-left-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-feet-default-walk-left-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-feet-default-walk-right-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-head-blink-stand-right-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-feet-default-jump-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-head-default-stand-right-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-feet-default-buttjump-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-arms-default-jump-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-arms-default-walk-left-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-head-angry-stand-right-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-arms-default-walk-left-5.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-feet-default-walk-right-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-head-cool-stand-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-head-blink-stand-right-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-head-default-skid-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-head-firefighter-stand-right-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-feet-default-skid-right-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-feet-default-walk-left-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-feet-default-walk-left-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-feet-default-walk-left-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-head-firefighter-stand-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-arms-default-walk-right-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-extra-default-whitestars-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-head-angry-stand-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-arms-default-stand-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-feet-default-kick-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-body-default-stand-right-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-arms-default-walk-right-5.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-arms-default-jump-right-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-feet-default-kick-right-0.png --- (This appears to be a binary file; contents omitted.) |
|
From: Benjamin P. J. <lit...@us...> - 2004-08-16 13:08:56
|
Update of /cvsroot/super-tux/supertux/data/images/shared/tux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3342/data/images/shared/tux Log Message: Directory /cvsroot/super-tux/supertux/data/images/shared/tux added to the repository |
|
From: Ricardo C. <rm...@us...> - 2004-08-16 12:13:12
|
Update of /cvsroot/super-tux/supertux/lib/special In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26781/lib/special Modified Files: sprite.cpp Log Message: Just added more info to warning. Index: sprite.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/special/sprite.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- sprite.cpp 16 Aug 2004 11:53:34 -0000 1.11 +++ sprite.cpp 16 Aug 2004 12:13:00 -0000 1.12 @@ -185,7 +185,8 @@ if((int)frame >= get_frames() || (int)frame < 0) std::cerr << "Warning: frame out of range: " << (int)frame - << "/" << get_frames() << std::endl; + << "/" << get_frames() << " at sprite: " << get_name() + << "/" << get_action_name() << std::endl; else context.draw_surface(action->surfaces[(int)frame], pos - Vector(action->x_hotspot, action->y_hotspot), layer, drawing_effect); |
|
From: Ricardo C. <rm...@us...> - 2004-08-16 11:53:45
|
Update of /cvsroot/super-tux/supertux/lib/special In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23483/lib/special Modified Files: sprite.cpp Log Message: Changed variable name and fixed reverse animation. Index: sprite.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/special/sprite.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- sprite.cpp 14 Aug 2004 18:45:25 -0000 1.10 +++ sprite.cpp 16 Aug 2004 11:53:34 -0000 1.11 @@ -92,8 +92,7 @@ act->y_hotspot = 0; act->fps = 10; - animation_loops = -1; - last_tick = 0; + start_animation(-1); } void @@ -115,7 +114,7 @@ { frame = 0; last_tick = SDL_GetTicks(); -animation_reversed = false; +animation_reversed = true; } bool @@ -152,28 +151,28 @@ if(animation_reversed) { - float expedient = frame - 0; - if(expedient < 0) - { - frame = get_frames()-1; + float excedent = frame - 0; + if(excedent < 0 || excedent >= get_frames()) + { // last case can happen when not used reverse_animation() + frame = get_frames() - 1; if(animation_loops > 0) animation_loops--; - if(expedient > -get_frames()) - frame -= expedient; + if(fabsf(excedent) < get_frames()) + frame += excedent; } } else { - float expedient = frame - action->surfaces.size(); - if(expedient >= 0) + float excedent = frame - action->surfaces.size(); + if(excedent >= 0) { frame = 0; if(animation_loops > 0) animation_loops--; - if(expedient < get_frames()) - frame += expedient; + if(excedent < get_frames()) + frame += excedent; } } } @@ -185,7 +184,8 @@ update(); if((int)frame >= get_frames() || (int)frame < 0) - std::cerr << "Warning: frame higher than total frames or lower than 0!\n"; + std::cerr << "Warning: frame out of range: " << (int)frame + << "/" << get_frames() << std::endl; else context.draw_surface(action->surfaces[(int)frame], pos - Vector(action->x_hotspot, action->y_hotspot), layer, drawing_effect); |
|
From: Ricardo C. <rm...@us...> - 2004-08-14 18:45:34
|
Update of /cvsroot/super-tux/supertux/lib/special In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28247/lib/special Modified Files: sprite.cpp Log Message: We could been losting frames. Fixed. Index: sprite.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/special/sprite.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- sprite.cpp 14 Aug 2004 11:50:24 -0000 1.9 +++ sprite.cpp 14 Aug 2004 18:45:25 -0000 1.10 @@ -141,31 +141,39 @@ if(animation_loops == 0) return; -float inc_frame = (action->fps/1000) * (SDL_GetTicks() - last_tick); +float frame_inc = (action->fps/1000.0) * (SDL_GetTicks() - last_tick); if(animation_reversed) - frame -= inc_frame; + frame -= frame_inc; else - frame += inc_frame; + frame += frame_inc; last_tick = SDL_GetTicks(); if(animation_reversed) { - if((unsigned int)frame < 0) + float expedient = frame - 0; + if(expedient < 0) { frame = get_frames()-1; if(animation_loops > 0) animation_loops--; + + if(expedient > -get_frames()) + frame -= expedient; } } else { - if((unsigned int)frame >= action->surfaces.size()) + float expedient = frame - action->surfaces.size(); + if(expedient >= 0) { frame = 0; if(animation_loops > 0) animation_loops--; + + if(expedient < get_frames()) + frame += expedient; } } } |
|
From: Ricardo C. <rm...@us...> - 2004-08-14 12:01:07
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31710/src Modified Files: gameobjs.cpp Log Message: Trampoline image was not yet working cause: - forgot to disable animation; - made a mistake in the supertux.strt entries. :( Index: gameobjs.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameobjs.cpp,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- gameobjs.cpp 14 Aug 2004 11:33:52 -0000 1.46 +++ gameobjs.cpp 14 Aug 2004 12:00:58 -0000 1.47 @@ -440,6 +440,7 @@ void load_object_gfx() { img_trampoline = sprite_manager->load("trampoline"); + img_trampoline->start_animation(0); img_flying_platform = sprite_manager->load("flying_platform"); img_smoke_cloud = sprite_manager->load("stomp"); } |
|
From: Ricardo C. <rm...@us...> - 2004-08-14 12:01:07
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31710/data Modified Files: supertux.strf Log Message: Trampoline image was not yet working cause: - forgot to disable animation; - made a mistake in the supertux.strt entries. :( Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/supertux.strf,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- supertux.strf 13 Aug 2004 22:22:47 -0000 1.47 +++ supertux.strf 14 Aug 2004 12:00:58 -0000 1.48 @@ -750,26 +750,14 @@ (fps 20) (images "shared/icebullet-1.png"))) ; Trampoline - (sprite (name "trampoline-1") - (action - (x-hotspot 0) - (y-hotspot 0) - (images "shared/trampoline-1.png"))) - (sprite (name "trampoline-2") - (action - (x-hotspot 0) - (y-hotspot 0) - (images "shared/trampoline-2.png"))) - (sprite (name "trampoline-3") - (action - (x-hotspot 0) - (y-hotspot 0) - (images "shared/trampoline-3.png"))) - (sprite (name "trampoline-4") + (sprite (name "trampoline") (action (x-hotspot 0) (y-hotspot 0) - (images "shared/trampoline-4.png"))) + (images "shared/trampoline-1.png" + "shared/trampoline-2.png" + "shared/trampoline-3.png" + "shared/trampoline-4.png"))) ; Flying platform (sprite (name "flying_platform") |
|
From: Ricardo C. <rm...@us...> - 2004-08-14 11:51:16
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30373/src Modified Files: badguy.cpp Log Message: Changed Walking Tree direction change behavior. Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.113 retrieving revision 1.114 diff -u -d -r1.113 -r1.114 --- badguy.cpp 13 Aug 2004 13:39:18 -0000 1.113 +++ badguy.cpp 14 Aug 2004 11:50:58 -0000 1.114 @@ -818,29 +818,11 @@ void BadGuy::action_walkingtree(double elapsed_time) { - Player& tux = *Sector::current()->player; - Direction v_dir = physic.get_velocity_x() < 0 ? LEFT : RIGHT; - if (dying == DYING_NOT) check_horizontal_bump(); fall(); - if (mode == BGM_BIG && tux.dying == DYING_NOT) - { - if ((tux.base.x + tux.base.width/2 > base.x + base.width/2) && v_dir == LEFT) - { - dir = RIGHT; - physic.set_velocity_x(-physic.get_velocity_x()); - } - else if ((tux.base.x + tux.base.width/2 < base.x + base.width/2) && v_dir == RIGHT) - { - dir = LEFT; - physic.set_velocity_x(-physic.get_velocity_x()); - } - } - - physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity); if (dying != DYING_FALLING) collision_swept_object_map(&old_base,&base); @@ -1131,6 +1113,12 @@ { set_sprite(img_walkingtree_left_small, img_walkingtree_left_small); physic.set_velocity_x(physic.get_velocity_x() * 2.0f); + + /* Move to the player's direction */ + if(dir != Sector::current()->player->dir) + physic.set_velocity_x(-physic.get_velocity_x()); + dir = Sector::current()->player->dir; + // XXX magic number: 66 is BGM_BIG height player->bounce(this); |
|
From: Ricardo C. <rm...@us...> - 2004-08-14 11:50:35
|
Update of /cvsroot/super-tux/supertux/lib/special In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30319/lib/special Modified Files: sprite.cpp sprite.h Log Message: Improvements. Index: sprite.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/special/sprite.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- sprite.cpp 14 Aug 2004 11:32:50 -0000 1.8 +++ sprite.cpp 14 Aug 2004 11:50:24 -0000 1.9 @@ -150,20 +150,20 @@ last_tick = SDL_GetTicks(); -if(!animation_reversed) +if(animation_reversed) { - if((unsigned int)frame >= action->surfaces.size()) + if((unsigned int)frame < 0) { - frame = 0; + frame = get_frames()-1; if(animation_loops > 0) animation_loops--; } } else { - if((unsigned int)frame < 0) + if((unsigned int)frame >= action->surfaces.size()) { - frame = get_frames()-1; + frame = 0; if(animation_loops > 0) animation_loops--; } @@ -176,8 +176,8 @@ { update(); - if((int)frame >= get_frames()) - std::cerr << "Warning: frame higher than total frames!\n"; + if((int)frame >= get_frames() || (int)frame < 0) + std::cerr << "Warning: frame higher than total frames or lower than 0!\n"; else context.draw_surface(action->surfaces[(int)frame], pos - Vector(action->x_hotspot, action->y_hotspot), layer, drawing_effect); Index: sprite.h =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/special/sprite.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- sprite.h 14 Aug 2004 11:32:51 -0000 1.8 +++ sprite.h 14 Aug 2004 11:50:24 -0000 1.9 @@ -90,7 +90,7 @@ { return (int)frame; } /** Set current frame */ void set_frame(int frame_) - { frame = frame_; } + { if(frame_ > get_frames()) frame = 0; else frame = frame_; } Surface* get_frame(unsigned int frame) { if(frame < action->surfaces.size()) |
|
From: Ricardo C. <rm...@us...> - 2004-08-14 11:34:01
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27794/src Modified Files: gameobjs.cpp gameobjs.h Log Message: Removed trampoline sprites hack. Index: gameobjs.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameobjs.cpp,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- gameobjs.cpp 5 Aug 2004 13:49:20 -0000 1.45 +++ gameobjs.cpp 14 Aug 2004 11:33:52 -0000 1.46 @@ -137,7 +137,7 @@ /* Trampoline */ -Sprite *img_trampoline[TRAMPOLINE_FRAMES]; +Sprite *img_trampoline; Trampoline::Trampoline(LispReader& reader) { @@ -181,7 +181,8 @@ void Trampoline::draw(DrawingContext& context) { - img_trampoline[frame]->draw(context, base, LAYER_OBJECTS); + img_trampoline->set_frame(frame); + img_trampoline->draw(context, base, LAYER_OBJECTS); frame = 0; } @@ -438,15 +439,7 @@ void load_object_gfx() { - char sprite_name[16]; - - for (int i = 0; i < TRAMPOLINE_FRAMES; i++) - { - sprintf(sprite_name, "trampoline-%i", i+1); - img_trampoline[i] = sprite_manager->load(sprite_name); - } - + img_trampoline = sprite_manager->load("trampoline"); img_flying_platform = sprite_manager->load("flying_platform"); - img_smoke_cloud = sprite_manager->load("stomp"); } Index: gameobjs.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameobjs.h,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- gameobjs.h 5 Aug 2004 10:10:19 -0000 1.32 +++ gameobjs.h 14 Aug 2004 11:33:53 -0000 1.33 @@ -105,8 +105,7 @@ Timer timer; }; -#define TRAMPOLINE_FRAMES 4 -extern Sprite *img_trampoline[TRAMPOLINE_FRAMES]; +extern Sprite *img_trampoline; class Trampoline : public MovingObject, public Serializable { |
|
From: Ricardo C. <rm...@us...> - 2004-08-14 11:32:59
|
Update of /cvsroot/super-tux/supertux/lib/special In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27688/lib/special Modified Files: sprite.cpp sprite.h Log Message: Improved Sprites animations. Index: sprite.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/special/sprite.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- sprite.cpp 13 Aug 2004 22:32:42 -0000 1.7 +++ sprite.cpp 14 Aug 2004 11:32:50 -0000 1.8 @@ -92,7 +92,7 @@ act->y_hotspot = 0; act->fps = 10; - act->animation_loops = 0; + animation_loops = -1; last_tick = 0; } @@ -106,7 +106,7 @@ void Sprite::start_animation(int loops) { -action->animation_loops = loops; +animation_loops = loops; reset(); } @@ -115,25 +115,58 @@ { frame = 0; last_tick = SDL_GetTicks(); +animation_reversed = false; } bool Sprite::check_animation() { -return action->animation_loops; +return animation_loops; +} + +void +Sprite::reverse_animation() +{ +animation_reversed = !animation_reversed; + +if(animation_reversed) + frame = get_frames()-1; +else + frame = 0; } void Sprite::update() { -frame += (action->fps/1000) * (SDL_GetTicks() - last_tick); +if(animation_loops == 0) + return; + +float inc_frame = (action->fps/1000) * (SDL_GetTicks() - last_tick); + +if(animation_reversed) + frame -= inc_frame; +else + frame += inc_frame; + last_tick = SDL_GetTicks(); -if((unsigned int)frame >= action->surfaces.size()) +if(!animation_reversed) { - frame = 0; - if(action->animation_loops > 0) - action->animation_loops--; + if((unsigned int)frame >= action->surfaces.size()) + { + frame = 0; + if(animation_loops > 0) + animation_loops--; + } + } +else + { + if((unsigned int)frame < 0) + { + frame = get_frames()-1; + if(animation_loops > 0) + animation_loops--; + } } } @@ -143,8 +176,11 @@ { update(); - context.draw_surface(action->surfaces[(int)frame], - pos - Vector(action->x_hotspot, action->y_hotspot), layer, drawing_effect); + if((int)frame >= get_frames()) + std::cerr << "Warning: frame higher than total frames!\n"; + else + context.draw_surface(action->surfaces[(int)frame], + pos - Vector(action->x_hotspot, action->y_hotspot), layer, drawing_effect); } #if 0 @@ -162,13 +198,13 @@ int Sprite::get_width() { - return action->surfaces[get_current_frame()]->w; + return action->surfaces[get_frame()]->w; } int Sprite::get_height() { - return action->surfaces[get_current_frame()]->h; + return action->surfaces[get_frame()]->h; } /* EOF */ Index: sprite.h =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/special/sprite.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- sprite.h 13 Aug 2004 22:32:42 -0000 1.7 +++ sprite.h 14 Aug 2004 11:32:51 -0000 1.8 @@ -45,8 +45,6 @@ /** Frames per second */ float fps; - int animation_loops; - std::vector<Surface*> surfaces; }; @@ -63,21 +61,36 @@ /** Set action (or state) */ void set_action(std::string act); - /* Handling animations */ + /* Start an animation + -1 - for infinite + 0 - stopped + 1,2,3 - one, two, three times... */ void start_animation(int loops); + /** Check if animation is stopped or not */ bool check_animation(); + /** Reverse the animation */ + void reverse_animation(); float get_fps() { return action->fps; } + /** Get current action total frames */ int get_frames() { return action->surfaces.size(); } + /** Get sprite's name */ std::string get_name() const { return name; } + /** Get current action name */ + std::string get_action_name() const + { return action->name; } int get_width(); int get_height(); - int get_current_frame() + /** Get current frame */ + int get_frame() { return (int)frame; } + /** Set current frame */ + void set_frame(int frame_) + { frame = frame_; } Surface* get_frame(unsigned int frame) { if(frame < action->surfaces.size()) @@ -95,6 +108,8 @@ std::string name; float frame; + int animation_loops; + bool animation_reversed; float last_tick; typedef std::map <std::string, Action*> Actions; |
|
From: Marek M. <wa...@us...> - 2004-08-14 10:07:26
|
Update of /cvsroot/super-tux/supertux/data/levels/bonus1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17080/data/levels/bonus1 Modified Files: Tag: supertux_0_1_1_branch bonus-level1.stl Log Message: small change to "Bonus Dias!" Index: bonus-level1.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/bonus1/Attic/bonus-level1.stl,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -d -r1.1.2.5 -r1.1.2.6 --- bonus-level1.stl 10 Aug 2004 19:04:35 -0000 1.1.2.5 +++ bonus-level1.stl 14 Aug 2004 10:07:16 -0000 1.1.2.6 @@ -26,15 +26,15 @@ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 44 44 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 12 44 44 44 44 0 0 16 17 17 18 0 0 0 0 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 12 0 83 83 0 10 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 0 16 31 12 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 12 44 44 44 0 0 0 0 0 0 0 0 16 31 11 11 30 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 44 44 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 21 8 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 12 0 0 44 44 0 0 10 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 12 0 0 0 0 16 17 31 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 12 0 0 102 0 0 0 0 0 16 18 0 0 0 0 0 0 10 11 11 12 112 0 0 0 0 0 10 11 11 21 8 8 8 8 8 8 22 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 12 44 44 44 0 0 0 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 44 44 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 20 14 14 14 15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 17 17 18 0 44 0 0 44 0 10 11 11 12 0 0 0 0 0 0 0 0 0 0 16 17 17 18 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 12 0 0 83 102 0 0 10 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 21 8 8 8 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 10 11 11 20 14 14 14 14 14 14 23 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 21 8 8 8 8 8 9 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 44 44 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 17 17 17 31 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 17 17 18 0 0 0 0 0 0 0 0 0 0 16 17 17 18 0 0 0 0 0 0 16 17 17 18 0 0 0 0 0 0 0 0 0 0 10 11 11 20 14 14 14 14 14 15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 17 17 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 17 17 18 0 0 0 0 0 112 10 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 20 14 14 14 14 14 15 0 0 0 0 0 0 16 31 30 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 0 - 7 8 8 8 8 8 8 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 17 17 18 0 0 7 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 17 17 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 17 17 17 17 17 31 11 11 12 112 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 78 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 17 17 17 17 17 17 17 17 17 17 17 17 18 0 0 0 0 0 0 0 0 0 0 16 17 17 17 17 17 31 11 11 12 0 0 0 0 0 0 0 16 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 44 44 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 17 17 17 31 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 0 0 0 0 16 17 17 18 0 0 0 0 0 0 16 17 17 18 0 0 0 0 0 0 0 0 0 0 10 11 11 20 14 14 14 14 14 15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 17 17 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 17 17 18 0 0 0 0 0 112 10 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 20 14 14 14 14 14 15 0 0 0 0 0 0 16 31 30 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 0 + 7 8 8 8 8 8 8 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 17 17 18 0 0 7 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 17 17 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 17 17 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 17 17 17 17 17 31 11 11 12 112 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 78 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 17 17 17 17 17 17 17 17 17 17 17 17 18 0 0 0 0 0 0 0 0 0 0 16 17 17 17 17 17 31 11 11 12 0 0 0 0 0 0 0 16 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 0 13 14 14 14 14 14 14 14 14 113 8 8 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 14 14 15 0 0 0 0 0 0 0 0 0 0 7 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 8 9 0 78 78 105 78 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 17 17 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 77 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 17 17 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 0 - 10 11 11 11 11 11 11 11 11 20 14 14 14 14 113 8 8 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 26 26 102 26 26 0 0 0 0 0 0 0 7 8 8 9 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 0 0 0 0 13 14 14 15 0 0 0 0 0 0 0 0 0 0 0 0 0 27 28 28 29 0 0 0 13 14 14 15 0 0 0 0 0 0 7 8 8 9 0 0 0 0 0 0 0 0 0 0 7 8 8 9 0 78 78 78 78 0 7 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 44 44 44 44 0 0 0 0 0 0 0 0 0 0 0 0 0 44 44 44 44 0 0 0 0 7 8 8 9 0 0 78 78 77 0 0 0 7 9 0 0 0 0 0 0 7 8 102 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 44 44 44 0 0 0 0 0 44 44 44 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 0 - 10 11 11 11 11 11 11 11 11 11 11 11 11 11 20 14 14 14 14 113 8 8 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 14 14 15 0 0 0 0 0 0 10 11 11 12 0 0 0 27 28 28 29 0 0 0 10 11 11 12 0 0 0 0 0 0 7 8 8 9 0 0 0 0 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 13 14 14 15 0 0 0 0 0 0 0 0 0 0 13 14 14 15 0 0 0 0 0 0 13 14 14 15 0 0 0 0 0 0 0 0 0 0 0 0 44 44 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 14 14 15 0 0 0 0 0 0 0 7 114 15 0 0 0 0 0 0 13 14 14 15 0 0 0 0 0 0 7 8 8 9 0 0 0 0 0 0 7 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 0 - 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 20 14 14 14 14 113 8 8 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 7 22 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 13 14 14 15 0 0 0 0 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 44 44 44 0 7 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 7 114 23 12 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 13 14 14 15 0 0 0 0 0 0 13 14 14 15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 8 9 0 0 0 0 0 0 7 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 0 - 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 20 14 14 14 14 113 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 22 11 11 21 8 8 8 8 8 114 23 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 21 8 8 8 8 8 8 22 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 21 8 8 8 8 8 8 22 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 21 8 8 8 8 8 8 22 11 11 12 0 0 0 0 0 0 0 0 0 0 7 8 8 8 8 8 114 14 14 113 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 22 11 11 21 8 8 8 8 8 8 114 23 11 12 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 10 11 11 21 8 8 8 8 8 8 22 11 11 12 0 0 0 0 0 0 0 0 0 0 7 8 8 8 8 8 114 14 14 15 0 0 0 0 0 0 13 14 14 113 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 133 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 132 132 8 8 8 8 8 9 - 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 20 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 23 11 11 20 14 14 14 14 14 23 11 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 20 14 14 14 14 14 14 23 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 20 14 14 14 14 14 14 23 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 20 14 14 14 14 14 14 23 11 11 12 0 0 0 0 0 0 0 0 0 0 13 14 14 14 14 14 23 11 11 20 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 23 11 11 20 14 14 14 14 14 14 23 11 11 12 0 0 0 0 0 0 10 11 11 12 0 27 28 28 29 0 10 11 11 20 14 14 14 14 14 14 23 11 11 12 0 0 0 0 0 0 0 0 0 0 13 14 14 14 14 14 23 11 11 12 0 0 0 0 0 0 10 11 11 20 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 15 - 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 + 10 11 11 11 11 11 11 11 11 20 14 14 14 14 113 8 8 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 26 26 102 26 26 0 0 0 0 0 0 0 7 8 8 9 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 0 0 0 0 13 14 14 15 0 0 0 0 0 0 0 0 0 0 0 0 0 27 28 28 29 0 0 0 13 14 14 15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 8 9 0 78 78 78 78 0 7 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 44 44 44 44 0 0 0 0 0 0 0 0 0 0 0 0 0 44 44 44 44 0 0 0 0 7 8 8 9 0 0 78 78 77 0 0 0 7 9 0 0 0 0 0 0 7 8 102 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 44 44 44 0 0 0 0 0 44 44 44 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 0 + 10 11 11 11 11 11 11 11 11 11 11 11 11 11 20 14 14 14 14 113 8 8 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 14 14 15 0 0 0 0 0 0 10 11 11 12 0 0 0 27 28 28 29 0 0 0 10 11 11 12 0 0 0 0 0 0 7 8 8 9 0 0 0 0 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 7 8 8 9 0 0 0 0 0 0 0 0 0 0 13 14 14 15 0 0 0 0 0 0 13 14 14 15 0 0 0 0 0 0 0 0 0 0 0 0 44 44 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 14 14 15 0 0 0 0 0 0 0 7 114 15 0 0 0 0 0 0 13 14 14 15 0 0 0 0 0 0 7 8 8 9 0 0 0 0 0 0 7 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 0 + 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 20 14 14 14 14 113 8 8 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 7 22 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 13 14 14 15 0 0 0 0 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 13 14 14 15 0 0 0 0 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 44 44 44 0 7 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 7 114 23 12 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 13 14 14 15 0 0 0 0 0 0 13 14 14 15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 8 9 0 0 0 0 0 0 7 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 0 + 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 20 14 14 14 14 113 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 22 11 11 21 8 8 8 8 8 114 23 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 21 8 8 8 8 8 8 22 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 21 8 8 8 8 8 8 22 11 11 12 0 0 0 0 0 0 0 0 0 0 7 8 8 8 8 8 114 14 14 113 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 22 11 11 21 8 8 8 8 8 8 114 23 11 12 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 10 11 11 21 8 8 8 8 8 8 22 11 11 12 0 0 0 0 0 0 0 0 0 0 7 8 8 8 8 8 114 14 14 15 0 0 0 0 0 0 13 14 14 113 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 133 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 132 132 8 8 8 8 8 9 + 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 20 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 23 11 11 20 14 14 14 14 14 23 11 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 20 14 14 14 14 14 14 23 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 12 0 27 28 28 29 0 10 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 20 14 14 14 14 14 14 23 11 11 12 0 0 0 0 0 0 0 0 0 0 13 14 14 14 14 14 23 11 11 20 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 23 11 11 20 14 14 14 14 14 14 23 11 11 12 0 0 0 0 0 0 10 11 11 12 0 27 28 28 29 0 10 11 11 20 14 14 14 14 14 14 23 11 11 12 0 0 0 0 0 0 0 0 0 0 13 14 14 14 14 14 23 11 11 12 0 0 0 0 0 0 10 11 11 20 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 15 + 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 ) (background-tm @@ -82,7 +82,6 @@ (snowball (x 1469) (y 372)) (snowball (x 1401) (y 371)) (snowball (x 1276) (y 371)) - (snowball (x 3353) (y 370)) (bouncingsnowball (x 5385) (y 294)) (bouncingsnowball (x 5272) (y 302)) (flyingsnowball (x 4367) (y 275)) @@ -103,6 +102,7 @@ (spiky (x 8675) (y 368)) (snowball (x 7123) (y 115)) (money (x 7847) (y 127)) + (mrbomb (x 3333) (y 361)) ) ) |
|
From: Marek M. <wa...@us...> - 2004-08-14 09:55:51
|
Update of /cvsroot/super-tux/supertux/data/levels/bonus1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15991/data/levels/bonus1 Modified Files: Tag: supertux_0_1_1_branch matr1x-level2.stl Log Message: fixed "visible invisible blocks" in Something Fishy Index: matr1x-level2.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/bonus1/matr1x-level2.stl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -d -r1.1.2.3 -r1.1.2.4 --- matr1x-level2.stl 10 Aug 2004 16:21:42 -0000 1.1.2.3 +++ matr1x-level2.stl 14 Aug 2004 09:55:40 -0000 1.1.2.4 @@ -48,9 +48,9 @@ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 76 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 76 0 0 0 76 76 76 76 76 0 0 0 0 76 0 0 0 0 0 76 0 0 0 0 0 76 76 76 0 0 0 0 76 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 76 0 0 76 0 0 76 76 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 0 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 75 75 75 75 75 75 75 75 75 75 75 76 0 0 0 76 0 0 0 0 76 0 0 0 0 76 0 0 0 0 76 0 0 0 0 76 0 0 0 0 76 0 0 0 0 76 76 76 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 76 76 76 0 0 0 76 0 0 0 76 0 0 0 76 0 0 0 76 0 0 0 76 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 75 0 75 0 0 0 0 0 75 0 0 0 0 0 75 0 0 0 0 0 75 0 75 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 0 0 75 75 75 75 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 0 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 75 75 75 75 75 75 75 75 75 75 75 75 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 75 75 0 0 0 0 0 0 0 0 0 76 0 0 0 76 76 76 76 0 0 0 0 76 0 0 0 76 76 76 0 0 0 0 0 76 0 76 76 75 75 75 75 75 76 76 0 0 76 76 76 76 76 76 76 76 76 76 76 76 76 76 76 76 76 0 0 0 76 0 0 0 0 76 0 0 0 0 76 0 0 0 0 76 0 0 0 0 76 0 0 0 0 0 0 0 76 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 75 75 75 0 0 0 75 0 0 0 75 0 0 0 75 0 0 0 75 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 75 0 75 0 0 0 0 0 75 0 0 0 0 0 75 0 0 0 0 0 75 0 75 0 0 0 0 75 75 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 75 75 75 75 75 75 75 75 76 0 0 0 76 0 76 0 0 76 0 76 0 0 0 76 76 76 76 76 0 0 0 76 76 0 0 0 76 0 0 0 76 75 75 75 75 75 75 75 75 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 76 0 0 0 0 0 76 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 0 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 76 0 0 0 76 0 0 76 0 0 0 0 0 0 0 76 0 0 76 0 0 76 0 0 0 76 0 0 0 0 0 76 0 0 76 0 0 0 76 76 75 75 75 75 75 75 75 75 75 75 75 75 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 75 75 0 0 0 0 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 75 0 0 75 0 0 0 0 0 75 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 75 0 75 0 0 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 75 75 75 0 0 0 75 0 0 0 75 0 0 0 75 0 0 0 75 0 0 0 75 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 75 0 75 0 0 0 0 0 75 0 0 0 0 0 75 0 0 0 0 0 75 0 75 0 0 0 0 75 75 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 75 75 75 75 75 75 75 75 75 0 0 0 75 0 75 0 0 75 0 75 0 0 0 0 75 0 75 0 0 0 0 75 75 0 0 0 75 0 0 0 75 75 75 75 75 75 75 75 75 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 75 75 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 0 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 0 0 0 75 0 0 75 0 0 0 0 0 0 0 75 0 0 75 0 0 75 0 0 0 75 0 0 0 0 0 75 0 0 75 0 0 0 75 75 75 75 75 75 75 75 75 75 75 75 75 75 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 75 75 0 0 0 0 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 75 0 0 75 0 0 0 0 0 75 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 75 75 75 0 0 0 75 0 0 0 75 0 0 0 75 0 0 0 75 0 0 0 75 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 75 0 75 0 0 0 0 0 75 0 0 0 0 0 75 0 0 0 0 0 75 0 75 0 0 0 0 75 75 75 75 75 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 75 75 75 75 75 75 75 75 75 0 0 0 75 0 75 0 0 75 0 75 0 0 0 0 75 0 75 0 0 0 0 75 75 0 0 0 75 0 0 0 75 75 75 75 75 75 75 75 75 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 75 75 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 0 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 0 0 0 75 0 0 75 0 0 0 0 0 0 0 75 0 0 75 0 0 75 0 0 0 75 0 0 0 0 0 75 0 0 75 0 0 0 75 75 75 75 75 75 75 75 75 75 75 75 75 75 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 75 75 0 0 0 0 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 75 0 0 75 0 0 0 0 0 75 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 76 0 0 0 76 0 0 0 76 0 0 0 76 0 0 0 76 0 0 0 76 0 0 0 76 0 0 0 0 76 0 0 76 0 76 75 75 75 75 0 0 0 75 0 0 0 75 0 0 0 75 0 0 0 75 0 0 0 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 0 0 0 0 75 0 75 0 0 0 0 0 75 0 0 0 0 0 75 0 0 0 0 0 75 0 75 0 0 0 0 75 75 75 75 75 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 75 75 75 75 75 75 75 75 75 0 0 0 75 0 75 0 0 75 0 75 0 0 0 0 75 0 75 0 0 0 0 75 75 0 0 0 75 0 0 0 75 75 75 75 75 75 75 75 75 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 76 0 0 0 0 0 76 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 0 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 76 0 0 0 76 0 0 76 0 0 0 0 0 0 0 76 0 0 76 0 0 76 0 0 0 76 0 0 0 0 0 76 0 0 76 76 76 76 76 76 75 75 75 75 75 75 75 75 75 75 75 75 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 75 75 0 0 0 0 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 75 0 0 75 0 0 0 0 0 75 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 75 0 75 0 0 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 75 75 75 0 0 0 75 0 0 0 75 0 0 0 75 0 0 0 75 0 0 0 75 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 75 0 75 0 0 0 0 0 75 0 0 0 0 0 75 0 0 0 0 0 75 0 75 0 0 0 0 75 75 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 75 75 75 75 75 75 75 75 75 0 0 0 75 0 75 0 0 75 0 75 0 0 0 0 75 0 75 0 0 0 0 75 75 0 0 0 75 0 0 0 75 75 75 75 75 75 75 75 75 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 75 75 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 0 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 0 0 0 75 0 0 75 0 0 0 0 0 0 0 75 0 0 75 0 0 75 0 0 0 75 0 0 0 0 0 75 0 0 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 75 75 0 0 0 0 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 75 0 0 75 0 0 0 0 0 75 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 75 75 75 0 0 0 75 0 0 0 75 0 0 0 75 0 0 0 75 0 0 0 75 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 75 0 75 0 0 0 0 0 75 0 0 0 0 0 75 0 0 0 0 0 75 0 75 0 0 0 0 75 75 75 75 75 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 75 75 75 75 75 75 75 75 75 0 0 0 75 0 75 0 0 75 0 75 0 0 0 0 75 0 75 0 0 0 0 75 75 0 0 0 75 0 0 0 75 75 75 75 75 75 75 75 75 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 75 75 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 0 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 0 0 0 75 0 0 75 0 0 0 0 0 0 0 75 0 0 75 0 0 75 0 0 0 75 0 0 0 0 0 75 0 0 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 75 75 0 0 0 0 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 75 0 0 75 0 0 0 0 0 75 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 76 0 0 0 76 0 0 0 76 0 0 0 76 0 0 0 76 0 0 0 76 0 0 0 76 0 0 0 0 76 0 0 76 0 76 75 75 75 75 0 0 0 75 0 0 0 75 0 0 0 75 0 0 0 75 0 0 0 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 0 0 0 0 75 0 75 0 0 0 0 0 75 0 0 0 0 0 75 0 0 0 0 0 75 0 75 0 0 0 0 75 75 75 75 75 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 75 75 75 75 75 75 75 75 75 0 0 0 75 0 75 0 0 75 0 75 0 0 0 0 75 0 75 0 0 0 0 75 75 0 0 0 75 0 0 0 75 75 75 75 75 75 75 75 75 0 0 0 0 0 0 0 75 75 75 75 75 75 75 75 75 75 0 0 0 0 0 75 75 75 0 0 0 0 0 0 79 0 0 0 79 0 0 0 0 0 0 0 0 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 0 0 0 75 0 0 75 0 0 0 0 0 0 0 75 0 0 75 0 0 75 0 0 0 75 0 0 0 0 0 75 0 0 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 75 75 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 75 0 0 75 0 0 0 0 0 75 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 75 0 0 0 0 0 75 75 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 75 0 0 0 75 0 0 0 75 0 0 0 75 0 0 0 75 0 0 0 75 0 0 0 75 0 0 0 0 75 0 0 75 0 75 75 75 75 75 0 0 0 75 0 0 0 75 0 0 0 75 0 0 0 75 0 0 0 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 0 0 0 0 75 0 75 0 0 0 0 0 75 0 0 0 0 0 75 0 0 0 0 0 75 0 75 0 0 0 0 75 75 75 75 75 75 75 75 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 75 75 75 75 75 75 75 75 75 0 0 0 75 0 75 0 0 75 0 75 0 0 0 0 75 0 75 0 0 0 0 75 75 0 0 0 75 0 0 0 75 75 75 75 75 75 75 75 75 0 0 0 0 0 0 0 75 75 75 75 75 75 75 75 75 75 0 0 0 0 0 75 75 75 0 0 0 0 0 75 75 75 75 75 75 75 75 0 0 0 0 0 0 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 0 0 0 75 0 0 75 0 0 0 0 0 0 0 75 0 0 75 0 0 75 0 0 0 75 0 0 0 0 0 75 0 0 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 75 0 0 75 0 0 0 0 0 75 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 0 0 0 0 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 0 75 0 0 0 75 0 0 0 75 0 0 0 75 0 0 0 75 0 0 0 75 0 0 0 0 75 0 0 75 0 75 75 75 0 75 0 0 0 75 0 0 0 75 0 0 0 75 0 0 0 75 0 0 0 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 0 0 0 0 75 0 75 0 0 0 0 0 75 0 0 0 0 0 75 0 0 0 0 0 75 0 75 0 0 0 0 75 75 75 75 75 75 75 75 0 0 0 0 76 0 0 76 0 0 0 76 0 0 76 0 0 76 0 0 76 0 0 76 0 0 76 0 0 76 0 0 76 0 0 76 0 0 0 76 0 0 76 0 0 0 76 0 0 76 0 0 76 0 0 76 0 76 0 76 76 0 0 0 76 75 75 75 75 75 75 75 75 75 0 0 0 75 0 75 0 0 75 0 75 0 0 0 0 75 0 75 0 0 0 0 75 75 0 0 0 75 0 0 0 75 75 75 75 75 75 75 75 75 0 0 0 0 0 0 0 ) @@ -66,9 +66,9 @@ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 201 201 201 201 201 201 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 201 201 201 201 201 201 201 201 201 201 201 201 201 201 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 - 0 0 0 0 0 0 0 0 0 0 201 201 201 201 201 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 75 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 - 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 - 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 + 0 0 0 0 0 0 0 0 0 0 201 201 201 201 201 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 76 201 201 201 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 75 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 + 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 75 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 + 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 75 75 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 0 0 0 201 201 201 201 201 201 0 0 0 0 0 0 0 0 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 53 55 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 0 0 0 200 200 200 200 200 200 0 0 0 0 0 0 0 0 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 54 56 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 0 0 0 0 0 0 0 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 201 0 0 0 0 0 0 0 0 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 0 0 200 200 200 200 200 200 200 200 200 200 200 200 200 200 ) |
|
From: Ricardo C. <rm...@us...> - 2004-08-13 22:32:51
|
Update of /cvsroot/super-tux/supertux/lib/special In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29237/lib/special Modified Files: sprite.cpp sprite.h Log Message: Added support for one time animations to Sprite. I'll port the one-time animations hacks - if nobody else does - later. Index: sprite.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/special/sprite.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- sprite.cpp 12 Aug 2004 22:03:04 -0000 1.6 +++ sprite.cpp 13 Aug 2004 22:32:42 -0000 1.7 @@ -82,8 +82,6 @@ new Surface(datadir + "/images/" + images[i], true)); } - action->frame_delay = 1000.0f/action->fps; - actions[action->name] = action; } @@ -93,8 +91,9 @@ act->x_hotspot = 0; act->y_hotspot = 0; act->fps = 10; - act->frame_delay = 1000.0f/act->fps; - time = 0; + + act->animation_loops = 0; + last_tick = 0; } void @@ -105,27 +104,49 @@ } void -Sprite::update(float /*delta*/) +Sprite::start_animation(int loops) { - //time += 10*delta; - //std::cout << "Delta: " << delta << std::endl; +action->animation_loops = loops; +reset(); } void -Sprite::draw(DrawingContext& context, const Vector& pos, int layer, - Uint32 drawing_effect) +Sprite::reset() { - time = SDL_GetTicks(); - unsigned int frame = get_current_frame(); +frame = 0; +last_tick = SDL_GetTicks(); +} - if (frame < action->surfaces.size()) +bool +Sprite::check_animation() +{ +return action->animation_loops; +} + +void +Sprite::update() +{ +frame += (action->fps/1000) * (SDL_GetTicks() - last_tick); +last_tick = SDL_GetTicks(); + +if((unsigned int)frame >= action->surfaces.size()) { - Surface* surface = action->surfaces[frame]; - - context.draw_surface(surface, pos - Vector(action->x_hotspot, action->y_hotspot), layer, drawing_effect); + frame = 0; + if(action->animation_loops > 0) + action->animation_loops--; } } +void +Sprite::draw(DrawingContext& context, const Vector& pos, int layer, + Uint32 drawing_effect) +{ + update(); + + context.draw_surface(action->surfaces[(int)frame], + pos - Vector(action->x_hotspot, action->y_hotspot), layer, drawing_effect); +} + #if 0 void Sprite::draw_part(float sx, float sy, float x, float y, float w, float h) @@ -138,27 +159,14 @@ } #endif -void -Sprite::reset() -{ - time = 0; -} - int -Sprite::get_current_frame() const -{ - unsigned int frame = static_cast<int>(fmodf(time, action->surfaces.size()*action->frame_delay)/action->frame_delay); - return frame % action->surfaces.size(); -} - -int -Sprite::get_width() const +Sprite::get_width() { return action->surfaces[get_current_frame()]->w; } int -Sprite::get_height() const +Sprite::get_height() { return action->surfaces[get_current_frame()]->h; } Index: sprite.h =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/special/sprite.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- sprite.h 12 Aug 2004 22:03:05 -0000 1.6 +++ sprite.h 13 Aug 2004 22:32:42 -0000 1.7 @@ -45,9 +45,7 @@ /** Frames per second */ float fps; - /** Number of seconds that a frame is displayed until it is switched - to the next frame */ - float frame_delay; + int animation_loops; std::vector<Surface*> surfaces; }; @@ -58,33 +56,28 @@ Sprite(lisp_object_t* cur); ~Sprite(); - void reset(); - - /** Update the sprite and process to the next frame */ - void update(float delta); + /** Draw sprite, automatically calculates next frame */ void draw(DrawingContext& context, const Vector& pos, int layer, Uint32 drawing_effect = NONE_EFFECT); - int get_current_frame() const; /** Set action (or state) */ void set_action(std::string act); + /* Handling animations */ + void start_animation(int loops); + bool check_animation(); + float get_fps() - { - return action->fps; - } ; + { return action->fps; } int get_frames() - { - return action->surfaces.size(); - } ; - + { return action->surfaces.size(); } std::string get_name() const - { - return name; - } - int get_width() const; - int get_height() const; + { return name; } + int get_width(); + int get_height(); + int get_current_frame() + { return (int)frame; } Surface* get_frame(unsigned int frame) { if(frame < action->surfaces.size()) @@ -96,9 +89,13 @@ void init_defaults(Action* act); void parse_action(LispReader& lispreader); + void update(); + void reset(); + std::string name; - float time; + float frame; + float last_tick; typedef std::map <std::string, Action*> Actions; Actions actions; |
|
From: Ricardo C. <rm...@us...> - 2004-08-13 22:22:58
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27300/src Modified Files: player.cpp Log Message: Should fix arm crash. Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.150 retrieving revision 1.151 diff -u -d -r1.150 -r1.151 --- player.cpp 12 Aug 2004 22:05:24 -0000 1.150 +++ player.cpp 13 Aug 2004 22:22:47 -0000 1.151 @@ -787,9 +787,9 @@ if ((holding_something && physic.get_velocity_y() == 0) || shooting_timer.check() && !duck) { if (dir == RIGHT) - tux_arm->set_action("walk-right"); + tux_arm->set_action("grab-right"); else - tux_arm->set_action("walk-left"); + tux_arm->set_action("grab-left"); tux_arm->draw(context, pos, LAYER_OBJECTS + 1); } |
|
From: Ricardo C. <rm...@us...> - 2004-08-13 22:22:58
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27300/data Modified Files: supertux.strf Log Message: Should fix arm crash. Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/supertux.strf,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- supertux.strf 13 Aug 2004 14:03:32 -0000 1.46 +++ supertux.strf 13 Aug 2004 22:22:47 -0000 1.47 @@ -88,14 +88,15 @@ (y-hotspot 9) (images "shared/smalltux-kick-right-0.png"))) - (sprite (name "arm-grab-left") + (sprite (name "tux-arm") (action + (name "grab-left") (x-hotspot 5) (y-hotspot 9) - (images "shared/smalltux-grab-left-0.png"))) + (images "shared/smalltux-grab-left-0.png")) - (sprite (name "smalltux-grab-right") - (action + (action + (name "grab-right") (x-hotspot 5) (y-hotspot 9) (images "shared/smalltux-grab-right-0.png"))) |
|
From: Ricardo C. <rm...@us...> - 2004-08-13 14:03:40
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31724/data Modified Files: supertux.strf Log Message: Commented unncessary sprites - there might be others. Don't add entries of not used sprites, since they will be loaded into memory! Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/supertux.strf,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- supertux.strf 12 Aug 2004 22:06:13 -0000 1.45 +++ supertux.strf 13 Aug 2004 14:03:32 -0000 1.46 @@ -222,32 +222,32 @@ "shared/largetux-star-2.png" ))) - ;; Growing Tux animation - (sprite (name "tux-grow-left") - (action - (fps 4.0) - (x-hotspot 6) - (y-hotspot 2) - (images "shared/tux-grow-left-1.png" - "shared/tux-grow-left-2.png" - "shared/tux-grow-left-3.png" - "shared/tux-grow-left-4.png" - "shared/tux-grow-left-5.png" - "shared/tux-grow-left-6.png" - "shared/tux-grow-left-7.png"))) - - (sprite (name "tux-grow-right") - (action - (fps 4.0) - (x-hotspot 6) - (y-hotspot 2) - (images "shared/tux-grow-right-1.png" - "shared/tux-grow-right-2.png" - "shared/tux-grow-right-3.png" - "shared/tux-grow-right-4.png" - "shared/tux-grow-right-5.png" - "shared/tux-grow-right-6.png" - "shared/tux-grow-right-7.png"))) +; ;; Growing Tux animation +; (sprite (name "tux-grow-left") +; (action +; (fps 4.0) +; (x-hotspot 6) +; (y-hotspot 2) +; (images "shared/tux-grow-left-1.png" +; "shared/tux-grow-left-2.png" +; "shared/tux-grow-left-3.png" +; "shared/tux-grow-left-4.png" +; "shared/tux-grow-left-5.png" +; "shared/tux-grow-left-6.png" +; "shared/tux-grow-left-7.png"))) +; +; (sprite (name "tux-grow-right") +; (action +; (fps 4.0) +; (x-hotspot 6) +; (y-hotspot 2) +; (images "shared/tux-grow-right-1.png" +; "shared/tux-grow-right-2.png" +; "shared/tux-grow-right-3.png" +; "shared/tux-grow-right-4.png" +; "shared/tux-grow-right-5.png" +; "shared/tux-grow-right-6.png" +; "shared/tux-grow-right-7.png"))) ;; Icetux (sprite (name "ice-tux") @@ -806,27 +806,27 @@ (y-hotspot 64) (images "shared/door-1.png") )) - (sprite (name "openingdoor") - (action - (x-hotspot 0) - (y-hotspot 64) - (images "shared/door-1.png" - "shared/door-2.png" - "shared/door-3.png" - "shared/door-4.png" - "shared/door-5.png" - "shared/door-6.png" - "shared/door-7.png" - "shared/door-8.png" - "shared/door-8.png" - "shared/door-7.png" - "shared/door-6.png" - "shared/door-5.png" - "shared/door-4.png" - "shared/door-3.png" - "shared/door-2.png" - "shared/door-1.png") - )) +; (sprite (name "openingdoor") +; (action +; (x-hotspot 0) +; (y-hotspot 64) +; (images "shared/door-1.png" +; "shared/door-2.png" +; "shared/door-3.png" +; "shared/door-4.png" +; "shared/door-5.png" +; "shared/door-6.png" +; "shared/door-7.png" +; "shared/door-8.png" +; "shared/door-8.png" +; "shared/door-7.png" +; "shared/door-6.png" +; "shared/door-5.png" +; "shared/door-4.png" +; "shared/door-3.png" +; "shared/door-2.png" +; "shared/door-1.png") +; )) ; Stomp (sprite (name "stomp") |
|
From: Ricardo C. <rm...@us...> - 2004-08-13 14:02:29
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31527/src Modified Files: resources.cpp Log Message: Using wrong name for sprite. Index: resources.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- resources.cpp 12 Aug 2004 22:05:24 -0000 1.48 +++ resources.cpp 13 Aug 2004 14:02:20 -0000 1.49 @@ -118,7 +118,7 @@ /* Tuxes: */ smalltux_star = sprite_manager->load("smalltux-star"); - largetux_star = sprite_manager->load("largetux-star"); + largetux_star = sprite_manager->load("bigtux-star"); smalltux_gameover = sprite_manager->load("smalltux-gameover"); char img_name[1024]; |
|
From: Ricardo C. <rm...@us...> - 2004-08-13 13:39:27
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26699/src Modified Files: badguy.cpp Log Message: Check if this fixes the jamming. Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.112 retrieving revision 1.113 diff -u -d -r1.112 -r1.113 --- badguy.cpp 26 Jul 2004 18:09:13 -0000 1.112 +++ badguy.cpp 13 Aug 2004 13:39:18 -0000 1.113 @@ -1314,9 +1314,9 @@ dir = RIGHT; physic.set_velocity_x(fabsf(physic.get_velocity_x())); - // in case badguys get "jammed" - if (physic.get_velocity_x() != 0) - base.x = pbad_c->base.x + pbad_c->base.width; + // Put bad guys a part (or they get jammed) + // only needed to do to one of them + base.x = pbad_c->base.x + pbad_c->base.width + 1; } else if (dir == RIGHT) { |
|
From: Ricardo C. <rm...@us...> - 2004-08-13 11:43:26
|
Update of /cvsroot/super-tux/supertux/lib/app In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7466/lib/app Modified Files: setup.cpp Log Message: File not being closed. Index: setup.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/app/setup.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- setup.cpp 10 Aug 2004 11:34:54 -0000 1.14 +++ setup.cpp 13 Aug 2004 11:43:15 -0000 1.15 @@ -90,6 +90,7 @@ { return false; } + fclose(fi); return true; } |
|
From: Ricardo C. <rm...@us...> - 2004-08-13 11:38:33
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6774/src Modified Files: Tag: supertux_0_1_1_branch setup.cpp Log Message: Yet another file not being closed. Whoever that did the setup file related calls, certanely deserves a few slaps! Index: setup.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/Attic/setup.cpp,v retrieving revision 1.79.2.2 retrieving revision 1.79.2.3 diff -u -d -r1.79.2.2 -r1.79.2.3 --- setup.cpp 18 Jul 2004 11:58:15 -0000 1.79.2.2 +++ setup.cpp 13 Aug 2004 11:38:18 -0000 1.79.2.3 @@ -98,6 +98,7 @@ { return false; } + fclose(fi); return true; } |
|
From: Marek M. <wa...@us...> - 2004-08-13 11:19:26
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3749 Modified Files: Tag: supertux_0_1_1_branch LEVELDESIGN NEWS Log Message: looked through text files, fixed a typo, put today's date into NEWS as 0.1.2 release date Index: NEWS =================================================================== RCS file: /cvsroot/super-tux/supertux/NEWS,v retrieving revision 1.9.2.7 retrieving revision 1.9.2.8 diff -u -d -r1.9.2.7 -r1.9.2.8 --- NEWS 13 Aug 2004 10:10:48 -0000 1.9.2.7 +++ NEWS 13 Aug 2004 11:19:17 -0000 1.9.2.8 @@ -1,4 +1,4 @@ -Super Tux 0.1.2 (upcoming release) +Super Tux 0.1.2 (13 August 04) ===================== * a brand new island containing 22 contributed and "official" levels! * a "new" enemy: The Fish Index: LEVELDESIGN =================================================================== RCS file: /cvsroot/super-tux/supertux/LEVELDESIGN,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -u -d -r1.9 -r1.9.2.1 --- LEVELDESIGN 10 May 2004 23:20:40 -0000 1.9 +++ LEVELDESIGN 13 Aug 2004 11:19:17 -0000 1.9.2.1 @@ -123,7 +123,7 @@ Its webpage is located at: http://pingus.seul.org/~grumbel/flexlay/ -It needs ClanLib and a few odd libraries... Anyway, it worths +It needs ClanLib and a few odd libraries... Anyway, it's worth it ;) The only cons it has is that you have to have an accelerated |
248 messages has been excluded from this view by a project administrator.
