From 5c58bb8c195d4534e6232b0459240c91d0e87d70 Mon Sep 17 00:00:00 2001 From: Thomas Perl Date: Mon, 25 May 2009 15:52:47 +0200 Subject: [PATCH] New levels, re-structuring for testing --- data/L00_title.nph | 4 +- data/L01_tutorial.nph | 4 +- ...L05_plane_sailing.nph => L02_plane_sailing.nph} | 4 +- data/L03-MT-kaktus.nph | 50 ++++++++++++++++++++++ data/{swing.nph => L04-swing.nph} | 0 data/{kugelbahn.nph => L05-kugelbahn.nph} | 0 data/{drop.nph => L06-drop.nph} | 0 data/L07-viceversa.nph | 16 +++++++ data/stonehenge.nph | 26 +++++++++++ 9 files changed, 98 insertions(+), 6 deletions(-) rename data/{L05_plane_sailing.nph => L02_plane_sailing.nph} (91%) create mode 100644 data/L03-MT-kaktus.nph rename data/{swing.nph => L04-swing.nph} (100%) rename data/{kugelbahn.nph => L05-kugelbahn.nph} (100%) rename data/{drop.nph => L06-drop.nph} (100%) create mode 100644 data/L07-viceversa.nph create mode 100644 data/stonehenge.nph diff --git a/data/L00_title.nph b/data/L00_title.nph index 9d36cba..8b6397d 100644 --- a/data/L00_title.nph +++ b/data/L00_title.nph @@ -1,5 +1,5 @@ -Title: -Author: test +Title: Welcome +Author: Tim Edmonds Background: Sgs: 598,412 607,391 606,400 609,410 625,411 621,413 617,420 615,420 619,430 614,428 613,429 614,428 616,430 618,436 608,423 606,423 600,431 598,431 596,434 595,433 593,426 595,420 589,418 584,412 593,409 600,409 Ss3: 255,235 265,173 267,177 268,182 270,183 272,189 274,190 278,198 280,204 282,194 284,170 287,161 292,170 294,180 293,237 289,239 283,233 281,228 279,220 269,201 257,233 diff --git a/data/L01_tutorial.nph b/data/L01_tutorial.nph index 2cb13a6..8ee6cda 100644 --- a/data/L01_tutorial.nph +++ b/data/L01_tutorial.nph @@ -1,5 +1,5 @@ -Title: -Author: test +Title: A short tutorial +Author: Tim Edmonds Background: Sgs: 596,391 605,370 604,379 607,389 623,390 619,392 615,399 613,399 617,409 612,407 611,408 612,407 614,409 616,415 606,402 604,402 598,410 596,410 594,413 593,412 591,405 593,399 587,397 582,391 591,388 598,388 Sf4: 123,447 126,404 127,312 125,258 122,251 125,251 141,254 155,253 210,259 355,264 357,267 367,273 381,287 385,288 392,297 396,298 402,304 405,305 440,338 446,342 452,350 460,354 461,357 468,361 475,369 482,374 484,378 503,391 510,399 513,399 524,404 548,409 557,413 565,414 571,417 597,418 623,422 671,421 680,419 685,414 691,402 698,381 694,301 697,299 721,298 725,319 728,388 734,403 742,441 746,448 diff --git a/data/L05_plane_sailing.nph b/data/L02_plane_sailing.nph similarity index 91% rename from data/L05_plane_sailing.nph rename to data/L02_plane_sailing.nph index 2725975..90d0df0 100644 --- a/data/L05_plane_sailing.nph +++ b/data/L02_plane_sailing.nph @@ -1,5 +1,5 @@ -Title: -Author: test +Title: Plane Sailing +Author: Tim Edmonds Background: Sf2: 5,450 795,450 Sgs: 596,391 605,370 604,379 607,389 623,390 619,392 615,399 613,399 617,409 612,407 611,408 612,407 614,409 616,415 606,402 604,402 599,407 598,410 596,410 594,413 593,412 591,405 593,399 587,397 582,391 591,388 598,388 diff --git a/data/L03-MT-kaktus.nph b/data/L03-MT-kaktus.nph new file mode 100644 index 0000000..bad809b --- /dev/null +++ b/data/L03-MT-kaktus.nph @@ -0,0 +1,50 @@ +Title: Kaktus Challenge +Author: thp +Background: +Sf2: 5,450 795,450 +Sgs1: 386,368 389,364 393,362 398,351 399,361 404,374 429,377 424,378 415,389 405,391 407,395 409,395 411,398 413,408 412,410 404,397 400,395 390,395 383,397 373,401 370,405 373,396 380,384 370,354 365,346 375,367 386,372 +Sf3: 71,448 68,439 70,417 75,389 80,385 100,385 107,389 109,393 103,452 +Sf3: 108,393 111,371 117,357 119,345 121,344 123,338 138,321 146,320 149,323 151,329 149,380 146,406 147,438 146,450 +Sf3: 147,417 149,417 150,415 228,415 242,427 243,448 +Sf3: 238,422 246,394 249,370 252,365 260,366 272,371 277,377 279,377 281,391 278,451 +Sf3: 72,395 61,397 45,397 41,395 21,394 18,418 20,425 17,450 +Sf3: 280,418 317,420 336,416 335,422 337,450 +Sf3: 336,418 338,407 342,398 363,398 366,411 371,419 369,451 +Sf3: 371,419 454,415 457,428 458,451 +Sf3: 454,415 452,413 451,372 455,328 469,309 482,309 491,314 494,321 497,323 495,412 490,445 492,447 491,451 +Sf3: 495,401 527,402 536,410 539,411 566,412 569,416 568,430 570,447 568,450 +Sf3: 554,408 557,393 566,373 569,362 573,362 576,359 585,355 610,354 613,359 623,369 630,380 633,448 +Sf3: 632,401 691,401 719,399 722,400 716,422 717,426 +Sf3: 716,424 718,442 717,450 715,450 +Sf3: 720,399 721,398 720,386 717,366 724,346 729,322 733,315 738,311 747,311 759,320 761,324 765,327 773,341 774,357 776,360 775,385 773,392 774,410 776,415 774,448 +Sf5: 117,118 112,115 107,115 92,116 88,118 74,120 71,129 74,134 78,137 83,138 133,138 139,132 132,120 127,118 114,117 +Sf5: 701,119 671,121 668,125 669,133 678,136 692,136 704,139 726,140 734,132 733,127 731,125 720,119 698,120 +Sd11: 44,154 45,156 49,157 47,191 43,193 +Sd11: 41,152 61,150 65,153 64,168 56,172 49,173 +Sd11: 67,170 66,179 67,196 78,196 +Sd11: 86,170 81,176 78,189 +Sd11: 85,172 87,196 89,197 +Sd11: 80,180 81,183 85,185 +Sd11: 94,172 98,184 104,177 97,187 93,196 +Sd11: 107,171 103,199 104,202 120,200 +Sd11: 104,185 107,187 119,187 +Sd11: 107,172 118,173 +Sd11: 123,171 122,172 123,194 126,195 +Sd11: 124,178 123,176 124,175 132,177 131,185 128,188 120,188 122,191 132,192 140,199 +Sd11: 149,160 141,175 143,179 151,179 154,177 156,178 154,189 157,200 160,203 167,199 166,160 151,161 +Sd11: 634,158 636,193 634,205 628,213 +Sd11: 635,157 649,157 655,168 652,180 647,183 637,185 +Sd11: 652,187 648,208 649,213 664,214 +Sd11: 662,203 667,190 675,181 677,196 675,220 +Sd11: 666,196 668,200 675,203 +Sd11: 681,181 686,199 690,199 698,193 702,184 697,197 692,205 689,217 687,219 +Sd11: 706,186 701,200 702,212 714,211 +Sd11: 702,199 714,197 +Sd11: 705,186 716,185 +Sd11: 720,187 718,217 +Sd11: 719,191 720,188 725,190 736,191 737,193 733,199 720,201 727,209 736,212 +Sd11: 750,178 744,183 734,183 731,180 732,174 736,166 743,162 755,162 761,165 763,168 762,181 759,189 758,198 755,201 757,204 773,203 770,210 746,212 743,209 744,199 750,193 755,181 754,173 747,174 746,176 +Sf5: 89,118 83,112 66,87 59,85 57,83 43,83 37,95 39,106 45,112 54,117 58,122 68,123 72,127 +Sf5: 720,118 725,105 736,88 741,83 747,79 752,78 769,78 774,81 771,99 765,111 749,115 747,118 737,124 733,129 +St0: 94,95 89,95 90,109 97,113 104,112 110,108 111,104 110,93 102,92 94,96 91,95 +ST0: 698,98 691,98 690,101 691,111 694,114 698,116 707,116 710,114 714,109 712,101 710,98 695,98 diff --git a/data/swing.nph b/data/L04-swing.nph similarity index 100% rename from data/swing.nph rename to data/L04-swing.nph diff --git a/data/kugelbahn.nph b/data/L05-kugelbahn.nph similarity index 100% rename from data/kugelbahn.nph rename to data/L05-kugelbahn.nph diff --git a/data/drop.nph b/data/L06-drop.nph similarity index 100% rename from data/drop.nph rename to data/L06-drop.nph diff --git a/data/L07-viceversa.nph b/data/L07-viceversa.nph new file mode 100644 index 0000000..a66604c --- /dev/null +++ b/data/L07-viceversa.nph @@ -0,0 +1,16 @@ +Title: Vice Versa +Author: NP-MT Team +Background: +Sf4: 134,361 137,392 135,411 134,456 132,466 133,478 +Sf4: 136,362 141,364 152,365 194,365 191,383 188,420 189,472 +Sf4: 563,365 559,381 558,404 555,421 556,478 +Sf4: 565,368 595,371 625,371 618,422 619,472 +Sf4: 619,471 618,477 +Sd11: 291,89 293,96 302,106 326,142 363,179 395,202 403,210 420,219 431,229 450,240 454,245 467,254 477,258 486,258 491,266 497,269 509,279 516,280 537,294 545,298 549,298 552,302 550,297 549,285 546,278 +Sd11: 551,302 549,304 526,306 524,310 +Sd11: 446,80 443,87 429,97 423,104 408,116 386,139 385,142 376,152 333,186 305,215 289,236 275,269 269,278 261,286 251,301 242,305 234,316 226,321 223,326 219,328 221,301 +Sd11: 221,328 232,336 244,348 +St0: 285,24 276,27 264,40 265,46 272,52 282,56 287,56 296,51 299,47 301,40 299,29 296,23 292,20 284,21 278,24 +ST0: 462,23 454,24 446,30 445,32 446,40 455,51 462,54 476,52 481,47 483,42 484,37 482,29 476,24 467,20 457,21 +SG1: 146,362 181,335 183,352 181,362 146,362 +Sg1: 577,339 578,345 577,367 613,368 591,339 576,338 diff --git a/data/stonehenge.nph b/data/stonehenge.nph new file mode 100644 index 0000000..a2bd771 --- /dev/null +++ b/data/stonehenge.nph @@ -0,0 +1,26 @@ +Title: Stonehenge +Author: thp +Background: +Sf2: 1,446 13,445 27,438 30,435 61,428 141,428 164,418 193,416 239,416 244,420 260,426 266,430 296,433 374,433 390,432 400,429 404,423 415,418 441,417 458,414 505,413 509,415 514,421 520,424 519,425 563,426 584,425 589,418 604,412 610,412 614,410 651,410 663,413 671,413 682,419 690,419 705,424 735,423 752,419 754,416 765,412 778,412 780,410 799,410 +Sgs1: 710,362 719,351 723,342 727,339 729,348 731,348 730,361 731,366 751,366 757,369 751,374 742,374 727,379 731,380 736,387 739,394 740,403 739,404 723,397 718,391 713,393 712,396 709,396 704,401 698,401 696,403 699,391 704,386 702,377 699,372 695,372 687,367 686,363 687,354 696,357 701,357 709,362 +Sf2: 2,56 14,57 24,64 75,78 87,84 103,96 117,104 147,113 153,117 154,120 162,127 169,130 178,138 185,146 193,162 235,163 245,164 246,166 252,166 274,188 294,188 295,190 304,192 315,198 321,197 323,201 329,206 330,209 338,211 340,215 351,219 354,223 374,223 391,220 403,216 408,216 436,206 432,204 434,202 443,202 446,199 514,170 541,154 576,144 579,141 586,139 589,135 597,135 606,128 611,126 627,113 643,105 653,105 655,103 660,103 665,100 672,99 687,87 703,85 723,78 729,78 753,65 765,53 771,51 774,48 781,47 784,43 786,43 793,36 797,35 799,32 +Sf5: 214,310 167,308 153,310 151,314 153,320 158,324 164,325 165,327 226,328 229,330 241,330 244,319 240,311 225,311 221,309 212,311 +Sd11: 65,250 67,252 66,268 65,279 63,281 61,276 65,265 72,260 73,255 78,256 73,268 64,271 +Sd11: 83,260 79,277 74,281 94,285 +Sd11: 105,281 102,281 101,283 102,286 108,282 105,281 104,283 +Sd11: 122,267 123,268 135,261 130,271 128,285 +Sd11: 61,364 63,370 68,374 70,382 74,384 78,389 +Sd11: 60,365 75,359 82,359 84,361 85,363 82,371 70,379 +Sd11: 89,363 87,381 84,387 86,389 97,389 +Sd11: 102,384 107,388 106,385 102,383 +Sd11: 113,373 124,373 131,375 133,377 132,381 124,388 120,394 113,396 141,398 +St0: 191,287 189,281 176,281 173,282 169,290 175,306 188,306 193,299 194,291 191,282 +St0: 199,394 190,402 192,410 196,414 205,413 210,410 214,403 210,394 206,392 198,393 196,394 +S2: 325,379 312,379 302,384 299,390 302,404 302,420 307,427 313,430 349,430 355,424 358,418 335,384 325,379 323,379 +S2: 391,287 365,287 349,302 348,305 349,309 359,322 363,324 365,331 395,332 409,323 414,314 413,299 410,293 403,289 401,286 381,285 +S2: 414,240 395,240 391,243 389,249 385,254 391,260 396,261 398,265 413,268 439,267 450,260 448,249 446,247 424,243 420,241 412,241 +S2: 477,286 468,284 447,284 433,286 425,289 423,292 432,319 445,332 471,337 490,337 493,335 498,327 496,315 489,308 479,294 473,292 471,285 458,285 +S2: 421,357 403,358 391,364 382,373 383,390 390,397 397,402 430,403 443,400 454,393 456,389 459,388 458,359 453,355 437,348 419,348 414,351 411,358 +S2: 527,352 515,349 502,349 493,352 491,357 490,377 495,390 521,396 530,399 536,403 543,403 541,369 538,366 535,354 528,353 525,350 504,351 +S2: 303,272 285,275 275,288 267,331 278,347 285,354 309,356 327,350 335,340 337,322 329,294 317,281 312,279 277,279 +S2: 557,222 548,220 525,225 505,238 498,254 500,262 499,276 504,282 510,284 544,287 563,287 573,284 575,282 574,249 571,247 567,239 565,231 559,224 554,222 -- 2.11.4.GIT