X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=data%2Fimages%2Fworldmap.strf;h=9ebdfa81794ea7d1154531942271d3904fc7eaa3;hb=e5efd34f1f8a286a33972b7e5de0e83faef0c475;hp=5416f763f00fb7eaf7304d6c9eb2a4025c862702;hpb=9bc1e444b1961c5399ab9ce06542c4de7c7a0ec5;p=supertux.git

diff --git a/data/images/worldmap.strf b/data/images/worldmap.strf
index 5416f763f..9ebdfa817 100644
--- a/data/images/worldmap.strf
+++ b/data/images/worldmap.strf
@@ -89,6 +89,41 @@
     )
 )
 
+(tilegroup
+    (name "Water-Paths")
+    (tiles
+      80 81 78 79
+      84 85 82 83
+      9  9  87 86
+    )
+)
+
+(tilegroup
+    (name "Snow")
+    (tiles
+      11  16  12  9
+      15  19  17  8
+      14  18  13  9
+      20  21  35  36
+      23  22  34  33
+      24  25  26  9
+      31  32  27  9
+      30  29  28  9
+      62  63  64  9
+      37  38  39  40
+      41  42  43  44
+      45  46  47  48
+      61  65  66  67
+      68  68  69  70
+      71  72  77  76
+      49  50  51  58
+      52  53  54  59
+      55  56  57  60
+      73  74  75  9
+      914 915 916 9
+    )
+)
+
  (tile (id 8)
        (images "worldmap/antarctica/ground.png")
        (north #f)
@@ -759,389 +794,38 @@
 (tile(id 557)(images
 (region "worldmap/forest/cropcircle.png" 64 32 32 32))
 (solid #t))
-(tile(id 558)(images
-(region "worldmap/forest/ghostforest.png" 0 0 32 32))
-(solid #t))
-(tile(id 559)(images
-(region "worldmap/forest/ghostforest.png" 32 0 32 32))
-(solid #t))
-(tile(id 560)(images
-(region "worldmap/forest/ghostforest.png" 64 0 32 32))
-(solid #t))
-(tile(id 561)(images
-(region "worldmap/forest/ghostforest.png" 96 0 32 32))
-(solid #t))
-(tile(id 562)(images
-(region "worldmap/forest/ghostforest.png" 128 0 32 32))
-(solid #t))
-(tile(id 563)(images
-(region "worldmap/forest/ghostforest.png" 160 0 32 32))
-(solid #t))
-(tile(id 564)(images
-(region "worldmap/forest/ghostforest.png" 192 0 32 32))
-(solid #t))
-(tile(id 565)(images
-(region "worldmap/forest/ghostforest.png" 224 0 32 32))
-(solid #t))
-(tile(id 566)(images
-(region "worldmap/forest/ghostforest.png" 256 0 32 32))
-(solid #t))
-(tile(id 567)(images
-(region "worldmap/forest/ghostforest.png" 0 32 32 32))
-(solid #t))
-(tile(id 568)(images
-(region "worldmap/forest/ghostforest.png" 32 32 32 32))
-(solid #t))
-(tile(id 569)(images
-(region "worldmap/forest/ghostforest.png" 64 32 32 32))
-(solid #t))
-(tile(id 570)(images
-(region "worldmap/forest/ghostforest.png" 96 32 32 32))
-(solid #t))
-(tile(id 571)(images
-(region "worldmap/forest/ghostforest.png" 128 32 32 32))
-(solid #t))
-(tile(id 572)(images
-(region "worldmap/forest/ghostforest.png" 160 32 32 32))
-(solid #t))
-(tile(id 573)(images
-(region "worldmap/forest/ghostforest.png" 192 32 32 32))
-(solid #t))
-(tile(id 574)(images
-(region "worldmap/forest/ghostforest.png" 224 32 32 32))
-(solid #t))
-(tile(id 575)(images
-(region "worldmap/forest/ghostforest.png" 256 32 32 32))
-(solid #t))
-(tile(id 576)(images
-(region "worldmap/forest/ghostforest.png" 0 64 32 32))
-(solid #t))
-(tile(id 577)(images
-(region "worldmap/forest/ghostforest.png" 32 64 32 32))
-(solid #t))
-(tile(id 578)(images
-(region "worldmap/forest/ghostforest.png" 64 64 32 32))
-(solid #t))
-(tile(id 579)(images
-(region "worldmap/forest/ghostforest.png" 96 64 32 32))
-(solid #t))
-(tile(id 580)(images
-(region "worldmap/forest/ghostforest.png" 128 64 32 32))
-(solid #t))
-(tile(id 581)(images
-(region "worldmap/forest/ghostforest.png" 160 64 32 32))
-(solid #t))
-(tile(id 582)(images
-(region "worldmap/forest/ghostforest.png" 192 64 32 32))
-(solid #t))
-(tile(id 583)(images
-(region "worldmap/forest/ghostforest.png" 224 64 32 32))
-(solid #t))
-(tile(id 584)(images
-(region "worldmap/forest/ghostforest.png" 256 64 32 32))
-(solid #t))
-(tile(id 585)(images
-(region "worldmap/forest/ghostforest.png" 0 96 32 32))
-(solid #t))
-(tile(id 586)(images
-(region "worldmap/forest/ghostforest.png" 32 96 32 32))
-(solid #t))
-(tile(id 587)(images
-(region "worldmap/forest/ghostforest.png" 64 96 32 32))
-(solid #t))
-(tile(id 588)(images
-(region "worldmap/forest/ghostforest.png" 96 96 32 32))
-(solid #t))
-(tile(id 589)(images
-(region "worldmap/forest/ghostforest.png" 128 96 32 32))
-(solid #t))
-(tile(id 590)(images
-(region "worldmap/forest/ghostforest.png" 160 96 32 32))
-(solid #t))
-(tile(id 591)(images
-(region "worldmap/forest/ghostforest.png" 192 96 32 32))
-(solid #t))
-(tile(id 592)(images
-(region "worldmap/forest/ghostforest.png" 224 96 32 32))
-(solid #t))
-(tile(id 593)(images
-(region "worldmap/forest/ghostforest.png" 256 96 32 32))
-(solid #t))
-(tile(id 594)(images
-(region "worldmap/forest/ghostforest.png" 0 128 32 32))
-(solid #t))
-(tile(id 595)(images
-(region "worldmap/forest/ghostforest.png" 32 128 32 32))
-(solid #t))
-(tile(id 596)(images
-(region "worldmap/forest/ghostforest.png" 64 128 32 32))
-(solid #t))
-(tile(id 597)(images
-(region "worldmap/forest/ghostforest.png" 96 128 32 32))
-(solid #t))
-(tile(id 598)(images
-(region "worldmap/forest/ghostforest.png" 128 128 32 32))
-(solid #t))
-(tile(id 599)(images
-(region "worldmap/forest/ghostforest.png" 160 128 32 32))
-(solid #t))
-(tile(id 600)(images
-(region "worldmap/forest/ghostforest.png" 192 128 32 32))
-(solid #t))
-(tile(id 601)(images
-(region "worldmap/forest/ghostforest.png" 256 128 32 32))
-(solid #t))
-(tile(id 602)(images
-(region "worldmap/forest/ghostforest.png" 0 160 32 32))
-(solid #t))
-(tile(id 603)(images
-(region "worldmap/forest/ghostforest.png" 32 160 32 32))
-(solid #t))
-(tile(id 604)(images
-(region "worldmap/forest/ghostforest.png" 64 160 32 32))
-(solid #t))
-(tile(id 605)(images
-(region "worldmap/forest/ghostforest.png" 96 160 32 32))
-(solid #t))
-(tile(id 606)(images
-(region "worldmap/forest/ghostforest.png" 128 160 32 32))
-(solid #t))
-(tile(id 607)(images
-(region "worldmap/forest/ghostforest.png" 160 160 32 32))
-(solid #t))
-(tile(id 608)(images
-(region "worldmap/forest/ghostforest.png" 192 160 32 32))
-(solid #t))
-(tile(id 609)(images
-(region "worldmap/forest/ghostforest.png" 224 160 32 32))
-(solid #t))
-(tile(id 610)(images
-(region "worldmap/forest/ghostforest.png" 256 160 32 32))
-(solid #t))
-(tile(id 611)(images
-(region "worldmap/forest/ghostforest.png" 0 192 32 32))
-(solid #t))
-(tile(id 612)(images
-(region "worldmap/forest/ghostforest.png" 32 192 32 32))
-(solid #t))
-(tile(id 613)(images
-(region "worldmap/forest/ghostforest.png" 64 192 32 32))
-(solid #t))
-(tile(id 614)(images
-(region "worldmap/forest/ghostforest.png" 96 192 32 32))
-(solid #t))
-(tile(id 615)(images
-(region "worldmap/forest/ghostforest.png" 128 192 32 32))
-(solid #t))
-(tile(id 616)(images
-(region "worldmap/forest/ghostforest.png" 160 192 32 32))
-(solid #t))
-(tile(id 617)(images
-(region "worldmap/forest/ghostforest.png" 192 192 32 32))
-(solid #t))
-(tile(id 618)(images
-(region "worldmap/forest/ghostforest.png" 224 192 32 32))
-(solid #t))
-(tile(id 619)(images
-(region "worldmap/forest/ghostforest.png" 256 192 32 32))
-(solid #t))
-(tile(id 620)(images
-(region "worldmap/forest/ghostforest.png" 0 224 32 32))
-  (stop #f)
-     (north #f)
-     (south #f)
-     (west  #t)
-     (east  #t))
-(tile(id 621)(images
-(region "worldmap/forest/ghostforest.png" 32 224 32 32))
-  (stop #f)
-     (north #f)
-     (south #f)
-     (west  #t)
-     (east  #t))
-(tile(id 622)(images
-(region "worldmap/forest/ghostforest.png" 64 224 32 32))
-(solid #t))
-(tile(id 623)(images
-(region "worldmap/forest/ghostforest.png" 96 224 32 32))
-(solid #t))
-(tile(id 624)(images
-(region "worldmap/forest/ghostforest.png" 128 224 32 32))
-(solid #t))
-(tile(id 625)(images
-(region "worldmap/forest/ghostforest.png" 160 224 32 32))
-(solid #t))
-(tile(id 626)(images
-(region "worldmap/forest/ghostforest.png" 192 224 32 32))
-(solid #t))
-(tile(id 627)(images
-(region "worldmap/forest/ghostforest.png" 224 224 32 32))
-(solid #t))
-(tile(id 628)(images
-(region "worldmap/forest/ghostforest.png" 256 224 32 32))
-(solid #t))
-(tile(id 629)(images
-(region "worldmap/forest/ghostforest.png" 0 256 32 32))
-(solid #t))
-(tile(id 630)(images
-(region "worldmap/forest/ghostforest.png" 32 256 32 32))
-(solid #t))
-(tile(id 631)(images
-(region "worldmap/forest/ghostforest.png" 64 256 32 32))
-(solid #t))
-(tile(id 632)(images
-(region "worldmap/forest/ghostforest.png" 96 256 32 32))
-(solid #t))
-(tile(id 633)(images
-(region "worldmap/forest/ghostforest.png" 128 256 32 32))
-(solid #t))
-(tile(id 634)(images
-(region "worldmap/forest/ghostforest.png" 160 256 32 32))
-(solid #t))
-(tile(id 635)(images
-(region "worldmap/forest/ghostforest.png" 192 256 32 32))
-(solid #t))
-(tile(id 636)(images
-(region "worldmap/forest/ghostforest.png" 224 256 32 32))
-(solid #t))
-(tile(id 637)(images
-(region "worldmap/forest/ghostforest.png" 256 256 32 32))
-(solid #t))
-(tile(id 638)(images
-(region "worldmap/forest/ghostforest.png" 0 288 32 32))
-(solid #t))
-(tile(id 639)(images
-(region "worldmap/forest/ghostforest.png" 32 288 32 32))
-(solid #t))
-(tile(id 640)(images
-(region "worldmap/forest/ghostforest.png" 64 288 32 32))
-(solid #t))
-(tile(id 641)(images
-(region "worldmap/forest/ghostforest.png" 96 288 32 32))
-(solid #t))
-(tile(id 642)(images
-(region "worldmap/forest/ghostforest.png" 128 288 32 32))
-(solid #t))
-(tile(id 643)(images
-(region "worldmap/forest/ghostforest.png" 160 288 32 32))
-(solid #t))
-(tile(id 644)(images
-(region "worldmap/forest/ghostforest.png" 192 288 32 32))
-(solid #t))
-(tile(id 645)(images
-(region "worldmap/forest/ghostforest.png" 224 288 32 32))
-(solid #t))
-(tile(id 646)(images
-(region "worldmap/forest/ghostforest.png" 256 288 32 32))
-(solid #t))
-(tile(id 647)(images
-(region "worldmap/forest/ghostforest.png" 0 320 32 32))
-(solid #t))
-(tile(id 648)(images
-(region "worldmap/forest/ghostforest.png" 32 320 32 32))
-(solid #t))
-(tile(id 649)(images
-(region "worldmap/forest/ghostforest.png" 64 320 32 32))
-(solid #t))
-(tile(id 650)(images
-(region "worldmap/forest/ghostforest.png" 96 320 32 32))
-(solid #t))
-(tile(id 651)(images
-(region "worldmap/forest/ghostforest.png" 128 320 32 32))
-(solid #t))
-(tile(id 652)(images
-(region "worldmap/forest/ghostforest.png" 160 320 32 32))
-(solid #t))
-(tile(id 653)(images
-(region "worldmap/forest/ghostforest.png" 192 320 32 32))
-(solid #t))
-(tile(id 654)(images
-(region "worldmap/forest/ghostforest.png" 224 320 32 32))
-(solid #t))
-(tile(id 655)(images
-(region "worldmap/forest/ghostforest.png" 256 320 32 32))
-(solid #t))
-(tile(id 656)(images
-(region "worldmap/forest/ghostforest.png" 0 352 32 32))
-(solid #t))
-(tile(id 657)(images
-(region "worldmap/forest/ghostforest.png" 32 352 32 32))
-(solid #t))
-(tile(id 658)(images
-(region "worldmap/forest/ghostforest.png" 64 352 32 32))
-(solid #t))
-(tile(id 659)(images
-(region "worldmap/forest/ghostforest.png" 96 352 32 32))
-(solid #t))
-(tile(id 660)(images
-(region "worldmap/forest/ghostforest.png" 128 352 32 32))
-(solid #t))
-(tile(id 661)(images
-(region "worldmap/forest/ghostforest.png" 160 352 32 32))
-(solid #t))
-(tile(id 662)(images
-(region "worldmap/forest/ghostforest.png" 192 352 32 32))
-(solid #t))
-(tile(id 663)(images
-(region "worldmap/forest/ghostforest.png" 224 352 32 32))
-(solid #t))
-(tile(id 664)(images
-(region "worldmap/forest/ghostforest.png" 256 352 32 32))
-(solid #t))
-(tile(id 665)(images
-(region "worldmap/forest/ghostforest.png" 0 384 32 32))
-(solid #t))
-(tile(id 666)(images
-(region "worldmap/forest/ghostforest.png" 32 384 32 32))
-(solid #t))
-(tile(id 667)(images
-(region "worldmap/forest/ghostforest.png" 64 384 32 32))
-(solid #t))
-(tile(id 668)(images
-(region "worldmap/forest/ghostforest.png" 96 384 32 32))
-(solid #t))
-(tile(id 669)(images
-(region "worldmap/forest/ghostforest.png" 128 384 32 32))
-(solid #t))
-(tile(id 670)(images
-(region "worldmap/forest/ghostforest.png" 160 384 32 32))
-(solid #t))
-(tile(id 671)(images
-(region "worldmap/forest/ghostforest.png" 192 384 32 32))
-(solid #t))
-(tile(id 672)(images
-(region "worldmap/forest/ghostforest.png" 224 384 32 32))
-(solid #t))
-(tile(id 673)(images
-(region "worldmap/forest/ghostforest.png" 256 384 32 32))
-(solid #t))
-(tile(id 674)(images
-(region "worldmap/forest/ghostforest.png" 0 416 32 32))
-(solid #t))
-(tile(id 675)(images
-(region "worldmap/forest/ghostforest.png" 32 416 32 32))
-(solid #t))
-(tile(id 676)(images
-(region "worldmap/forest/ghostforest.png" 64 416 32 32))
-(solid #t))
-(tile(id 677)(images
-(region "worldmap/forest/ghostforest.png" 96 416 32 32))
-(solid #t))
-(tile(id 678)(images
-(region "worldmap/forest/ghostforest.png" 128 416 32 32))
-(solid #t))
-(tile(id 679)(images
-(region "worldmap/forest/ghostforest.png" 160 416 32 32))
-(solid #t))
-(tile(id 680)(images
-(region "worldmap/forest/ghostforest.png" 192 416 32 32))
-(solid #t))
-(tile(id 681)(images
-(region "worldmap/forest/ghostforest.png" 224 416 32 32))
-(solid #t))
-(tile(id 682)(images
-(region "worldmap/forest/ghostforest.png" 256 416 32 32))
-(solid #t))
+
+(tiles
+    (width 9)
+    (height 11)
+    (ids 
+558 559 560 561 562 563 564 565 566
+567 568 569 570 571 572 573 574 575
+576 577 578 579 580 581 582 583 584
+585 586 587 588 589 590 591 592 593
+594 595 596 597 598 599 600 601 602 
+603 604 605 606 607 608 609 610 611
+612 613 614 615 616 617 618 619 620
+621 622 623 624 625 626 628 628 629
+630 631 632 633 634 635 636 637 638
+639 640 641 642 643 644 645 646 647
+648 649 650 651 652 653 654 655 656
+)
+   (attributes 
+0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0
+)
+   (image "worldmap/forest/ghostforest.png"))
+
 (tile(id 683)(images
 (region "worldmap/forest/stream.png" 0 0 32 32))
 (solid #t))
@@ -1216,7 +900,11 @@
 (stop  #f))
 (tile(id 702)(images
 (region "worldmap/forest/stream.png" 128 96 32 32))
-(solid #t))
+(north #f)
+(south #f)
+(east  #t)
+(west  #t)
+(stop  #f))
 
 (tile(id 703)(images
 (region "worldmap/forest/stream.png" 0 128 32 32))
@@ -2031,16 +1719,6 @@
        (south #f)
        (west  #t)
        (east  #t))
- (tiles
-    (width 3)
-    (height 3)
-    (ids 917 918 919 920 921 923 924 925 926)
-   (attributes 1 1 1 
-              1 1 1 
-	      1 1 1 )
-   (image "worldmap/forest/dock.png")
- )
-
 (tiles
     (width 13)
     (height 18)
@@ -2121,7 +1799,7 @@
 (tile (id 1739)
     (images
       (region "worldmap/forest/castlemap.png" 96 192 32 32))         
-     (stop #t)
+     (stop #f)
      (north #f)
      (south #t)
      (west  #f)
@@ -2274,7 +1952,7 @@
 (tile (id 1758)
     (images
       (region "worldmap/forest/castlemap.png" 192 320 32 32))         
-     (stop #f)
+     (stop #t)
      (north #t)
      (south #f)
      (west  #f)
@@ -2436,4 +2114,35 @@
 
 )
    (image "worldmap/forest/darker_forest.png"))
+(tiles
+    (width 8)
+    (height 11)
+    (ids 
+1930 1931 1932 1933 1934 1935 1936 1937
+1938 1939 1940 1941 1942 1943 1944 1945
+1946 1947 1948 1949 1950 1951 1952 1953
+1954 1955 1956 1957 1958 1959 1960 1961
+1962 1963 1964 1965 1966 1967 1968 1969
+1970 1971 1972 1973 1974 1975 1976 1977
+1978 1979 1980 1981 1982 1983 1984 1985
+1886 1987 1988 1989 1990 1991 1992 1993
+1994 1995 1996 1997 1998 1999 2000 2001
+2002 2003 2004 2005 2006 2007 2008 2009
+2010 2011 2012 2013 2014 2015 2016 2017
+)
+(attributes 
+0 0 0 0 0 0 0 0  
+0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 
+)
+(image "worldmap/forest/castlemap_overlay.png")
+)
 )