Merge pull request #16 from Eauix/finish-the-update

data/images/tiles.strf

@@ -19,7 +19,7 @@
     (source "autotiles.satc")
   )
 
-  ;; next-id: 7486
+  ;; next-id: 7497
   ;; free/skipped ids (please use before any other): 101
   ;; 2080-2084 are empty tiles, 4619-4660, 4719-4722, 5037-5092, 5205, 5268-5283, 5433-5527, 6962-6977, 7002 7005 7007 7008 7173
   ;; No group ids are currently skipped! Delete this line if any are and replace it with said ids...
@@ -48,13 +48,7 @@
       20   23   23   20
 
       3055 204  0    0
-      205  214  0    0
-
-      5538 5539 5540 0
-      5544 5545 5546 5553
-      5550 5551 5552 5554
-      5541 5542 5543 5549
-      5547 5548 5536 5537
+      205  214  5536 5537
 
       2121 2123 5530 5531
       2131 2133 5534 5535
@@ -319,6 +313,12 @@
       2182 2183 2184 2179
       2190 2191 2192 2201
       2198 2199 2200 2202
+
+      5538 5539 5540 0
+      5544 5545 5546 5553
+      5550 5551 5552 5554
+      5541 5542 5543 5549
+      5547 5548 0    0
 
       3541 3542 3543 3544
       3545 3546 3547 3548
@@ -572,12 +572,6 @@
       5584 0    0    0
       5585 0    0    0
 
-      7055 7056 7057 0
-      7061 7062 7063 0
-      7067 7068 7069 0
-      7058 7059 7070 7071
-      7064 7065 7060 7066
-
     ;; Underground Forest
 
       1860 1861 1862 1863
@@ -680,7 +674,13 @@
       5691 5654 5692 5683
       5693 5694 5671 5672
       5651 5662 0    0
-
+
+      7055 7056 7057 0
+      7061 7062 7063 0
+      7067 7068 7069 0
+      7058 7059 7070 7071
+      7064 7065 7060 7066
+
       1900 1901 1902 1903
       1904 1905 1906 1907
       1908 1909 1910 1911
@@ -718,6 +718,11 @@
       5996 5997 5998 5999
       6000 6001 6002 6003
 
+      0    5117 0    0
+      5118 5119 5120 0
+      5121 5122 5124 0
+      5125 5126 5127 0
+
       2460 2470 2471 2631
       2634 2515 2516 2517
       2518 4153 4154 4155
@@ -941,12 +946,6 @@
       6130 0    0    0
       6137 0    0    0
 
-      6410 6411 6412 0
-      6416 6417 6418 0
-      6422 6423 6424 0
-      6413 6414 6425 6415
-      6419 6420 6426 6421
-
     ;; Underground Corrupted Forest
 
       6808 6809 6810 6811
@@ -1072,6 +1071,12 @@
       6190 6191 6168 6169
       6148 6159 0    0
 
+      6410 6411 6412 0
+      6416 6417 6418 0
+      6422 6423 6424 0
+      6413 6414 6425 6415
+      6419 6420 6426 6421
+
       6346 6347 6348 6349
       6354 6355 6356 6357
       6362 6363 6364 6365
@@ -1093,7 +1098,12 @@
       6607 6608 0    0
       6611 0    0    6614
       6615 6616 6617 6618
-
+
+      0    7302 0    0
+      7303 7304 7305 0
+      7306 7307 7308 0
+      7309 7310 7311 0
+
       0    0    2471 2631
       2634 2515 2516 2517
       2518 4153 4154 4155
@@ -1344,23 +1354,25 @@
       7405 7406 7411 7412
       7471 7413 7414 7415 
       7472 0    0    0    
-      7473 0    0    0    
+      7473 0    7486 7487
 
       1348 1720 1719 1718
       79   80   1347 1722
-      1349 1717 1721 0
+      1349 1717 1721 7488
       2001 2002 2149 2150
       2003 2004 2151 2152
       2999 3000 3001 3002
       3003 3004 3005 3006
       3007 3008 3009 3010
       3011 3012 3013 3014
+      7489 7490 7491 7494
+      7492 7493 0    0
       3015 3016 3017 3018
       3019 3020 3021 3022
       3023 3024 3025 3026
       3027 3028 3029 3030
       3031 3032 3033 3034
-      3035 3036 0    0
+      3035 3036 7491 7494
     )
   )
 
@@ -1603,6 +1615,7 @@
       130  4970 2047 3927
       129  4969 2048 3928
       4967 4968 2049 3929
+      7495 7496 0    0
 
       85   86   87   88
       89   90   91   92
@@ -1624,15 +1637,6 @@
       2523 2524 0    0
       2525 2526 0    0
       2527 2528 0    0
-
-      0    5117 0    0
-      5118 5119 5120 0
-      5121 5122 5124 0
-      5125 5126 5127 0
-      0    7302 0    0
-      7303 7304 7305 0
-      7306 7307 7308 0
-      7309 7310 7311 0
     )
   )
 
@@ -2469,6 +2473,25 @@
     )
     (fps 10)
   )
+
+  (tile
+    (id 7495)
+    (images
+      "tiles/goal/goal4-1.png"
+      "tiles/goal/goal4-2.png"
+      "tiles/goal/goal4-2.png"
+      "tiles/goal/goal4-3.png"
+      "tiles/goal/goal4-4.png"
+      "tiles/goal/goal4-5.png"
+      "tiles/goal/goal4-4.png"
+      "tiles/goal/goal4-3.png"
+      "tiles/goal/goal4-2.png"
+      "tiles/goal/goal4-2.png"
+      "tiles/goal/goal4-1.png"
+      "tiles/goal/goal4-1.png"
+    )
+    (fps 10)
+  )
 
   (tile
     (id 4968)
@@ -2527,6 +2550,25 @@
     (fps 10)
   )
 
+  (tile
+    (id 7496)
+    (images
+      "tiles/goal/goal4-1_secret.png"
+      "tiles/goal/goal4-2_secret.png"
+      "tiles/goal/goal4-2_secret.png"
+      "tiles/goal/goal4-3_secret.png"
+      "tiles/goal/goal4-4_secret.png"
+      "tiles/goal/goal4-5_secret.png"
+      "tiles/goal/goal4-4_secret.png"
+      "tiles/goal/goal4-3_secret.png"
+      "tiles/goal/goal4-2_secret.png"
+      "tiles/goal/goal4-2_secret.png"
+      "tiles/goal/goal4-1_secret.png"
+      "tiles/goal/goal4-1_secret.png"
+    )
+    (fps 10)
+  )
+
   (tile
     (id 131)
     (deprecated #t)
@@ -6859,7 +6901,7 @@
       80   1717 1718 1719 1720 1721
       1349 2001 2002 2149 2150 0
       79   2003 2004 2151 2152 0
-      1348 1722 0    0    0    0
+      1348 1722 7486 7487 7488 0
       1347 0    0    0    0    0
     )
     (images "tiles/pole/pole.png")
@@ -8431,6 +8473,17 @@
     )
   )
 
+  (tiles
+  (width 3)(height 2)
+    (ids
+      7489 7490 7491
+      7492 7493 7494
+    )
+    (images
+    "tiles/pole/diagonal_ends.png"
+    )
+  )
+
 
 
   ;; Additional attributes