Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remodel Many Autotilesets as Autotileset-Corners #3094

Merged
merged 19 commits into from
Dec 27, 2024
Merged

Remodel Many Autotilesets as Autotileset-Corners #3094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
46a909a
add new image files part 1
Eauix Nov 5, 2024
1aced83
Merge pull request #10 from Eauix/Add-new-image-files-part-1
Eauix Nov 5, 2024
5c2f857
Add new tiles and rewrite the snow autotileset
Eauix Nov 5, 2024
6276a32
crlf.
Eauix Nov 5, 2024
3a86b61
Merge pull request #11 from Eauix/add-new-tiles-part-1
Eauix Nov 6, 2024
0b93e8c
update ground merge tiles
Eauix Nov 6, 2024
d48a478
Merge pull request #12 from Eauix/add-new-tile-images-part-2
Eauix Nov 6, 2024
68b0c93
update level strf
Eauix Nov 6, 2024
1b111ce
Merge pull request #13 from Eauix/add-new-tiles-part-2
Eauix Nov 6, 2024
5d2cec9
add lightmaps for worldmaps and make many worldmap autotilesets as co…
Eauix Nov 6, 2024
516ac60
Merge pull request #14 from Eauix/add-new-tiles-part-3
Eauix Nov 6, 2024
f0f9471
autotiles for forest embellishment
Eauix Nov 7, 2024
3a4c0eb
Merge pull request #15 from Eauix/autotiles-for-forest-embellishment-…
Eauix Nov 7, 2024
dc82129
finish the updste
Eauix Nov 8, 2024
0e4b071
Merge pull request #16 from Eauix/finish-the-update
Eauix Nov 8, 2024
aa91fa8
Merge branch 'SuperTux:master' into Remodel-Many-Autotilesets-As-Corners
Eauix Nov 8, 2024
b030376
the infamous crlf attacks again
Eauix Nov 8, 2024
9356e54
turn holes into autotileset-corners & remove debug tile from diagonal…
Eauix Nov 11, 2024
6e49c5b
Merge pull request #17 from Eauix/last-corners
Eauix Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,217 changes: 1,594 additions & 623 deletions data/images/autotiles.satc
View file
Open in desktop

Large diffs are not rendered by default.

3,699 changes: 2,280 additions & 1,419 deletions data/images/autotiles_ice_world.satc
View file
Open in desktop

Large diffs are not rendered by default.

196 changes: 148 additions & 48 deletions data/images/ice_world.strf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
(source "autotiles_ice_world.satc")
)

;; ice tiles- next id: 554, 555 (corrupted roots), 865, 866, 867, 868, 934 (latest)
;; worldmap tiles - next id: 1021

(tilegroup
(name (_ "Snow"))
Expand All @@ -14,19 +14,21 @@
107 108 109 129
110 111 114 115
112 113 123 116
554 555 867 868
117 118 119 0
120 121 122 135
124 125 126 134
132 131 130 133
249 250 253 254
251 252 255 256

447 448 449 468
450 451 452 469
447 448 449 934
450 451 452 935
453 454 455 0
456 457 462 463
458 459 464 465
460 461 466 467
0 0 468 469
)
)
(tiles
Expand Down Expand Up @@ -63,37 +65,37 @@
648 649 650 0
651 652 653 0
654 655 656 0
657 658 0 0
659 660 0 0
657 658 940 0
659 660 941 0
661 662 663 0
664 665 666 0
667 668 669 0
670 671 0 0
672 673 0 0
670 671 942 0
672 673 943 0
674 675 0 0
676 677 678 0
679 680 681 0
682 683 684 0
685 686 687 0
688 689 690 0
691 692 693 0
694 695 0 0
696 697 0 0
694 695 946 0
696 697 947 0

698 699 700 0
701 702 703 0

704 709 710 0
705 707 711 0
706 708 712 0
713 714 717 0
715 716 718 0
713 714 717 473
715 716 718 474

234 235 236 470
237 238 239 471
240 241 242 472
243 244 245 473
246 247 248 474
243 244 245 944
246 247 248 945
)
)
(tiles
Expand Down Expand Up @@ -172,8 +174,8 @@
139 140 141 0
142 143 144 0

145 146 0 0
147 148 0 0
145 146 865 0
147 148 866 0

170 181 184 187
171 182 185 188
Expand All @@ -186,14 +188,14 @@
204 205 206 0
207 208 209 0
210 211 212 0
213 214 217 0
215 216 218 0
213 214 217 936
215 216 218 937

219 220 221 0
222 689 224 223
225 226 227 0
228 229 230 0
231 232 233 0
228 229 230 938
231 232 233 939
)
)
(tiles
Expand Down Expand Up @@ -261,6 +263,7 @@
266 267 285 286
268 269 287 288
363 364 289 290
948 949 952 953
279 280 281 0
282 283 284 0
297 298 299 0
Expand All @@ -274,15 +277,16 @@
309 310 322 323
311 312 324 325
0 0 326 327
950 951 954 955
334 335 336 0
337 338 339 0
340 341 342 0

559 560 561 0
562 0 563 0
564 565 566 0
567 568 0 0
569 570 0 0
567 568 956 0
569 570 957 0
571 572 575 576
573 574 577 578
719 722 0 0
Expand Down Expand Up @@ -347,21 +351,23 @@
588 589 610 611
590 591 612 613
0 0 614 615
958 959 962 963
601 602 603 616
604 605 606 617
607 608 609 618
620 621 622 619
623 624 625 0
626 627 628 0
629 630 0 0
631 632 0 0
629 630 966 0
631 632 967 0

725 726 727 763
728 729 730 764
731 732 733 765
738 739 740 766
741 742 743 767
744 745 746 768
960 961 964 965
734 735 747 748
736 737 749 750
0 0 751 752
Expand All @@ -371,8 +377,8 @@
769 770 771 762
772 773 774 0
775 776 777 0
778 779 0 0
780 781 0 0
778 779 968 0
780 781 969 0
)
)
(tiles
Expand Down Expand Up @@ -428,16 +434,16 @@
348 349 354 355
547 548 549 550
551 552 553 557
0 0 556 558
0 797 556 558

782 785 788 797
783 786 789 798
784 787 790 799
791 792 795 800
793 794 796 0
782 785 788 1017
783 786 789 1018
784 787 790 798
791 792 795 799
793 794 796 800

869 872 875 0
870 873 876 0
869 872 875 1019
870 873 876 1020
871 874 877 0
878 879 882 0
880 881 883 0
Expand Down Expand Up @@ -471,11 +477,11 @@
(width 8)(height 5)
(images "worldmap/forest/cave_rocks.png")
(ids
782 785 788 356 543 869 872 875
783 786 789 797 0 870 873 876
784 787 790 798 0 871 874 877
791 792 795 799 0 878 879 882
793 794 796 800 0 880 881 883
782 785 788 356 543 869 872 875
783 786 789 797 1017 870 873 876
784 787 790 798 1018 871 874 877
791 792 795 799 1019 878 879 882
793 794 796 800 1020 880 881 883
)
)

Expand All @@ -496,23 +502,23 @@
475 476 478 0
479 480 482 0
485 486 488 0
489 490 0 0
491 492 0 0
489 490 976 0
491 492 977 0

884 885 888 889
886 887 890 891

509 510 511 0
512 513 514 0
515 516 517 0
518 519 0 0
520 521 0 0
518 519 974 0
520 521 975 0

522 523 524 0
525 526 527 0
528 529 530 0
531 532 535 0
533 534 0 0
531 532 970 535
533 534 971 0
)
)
(tiles
Expand All @@ -534,7 +540,7 @@
(ids
475 476 478 489 490
479 480 482 491 492
485 486 488 0 0
485 486 488 976 977
)
(image "worldmap/halloween/tiles.png")
)
Expand Down Expand Up @@ -568,7 +574,7 @@
(ids
509 510 511 518 519
512 513 514 520 521
515 516 517 0 0
515 516 517 974 975
)
(image "worldmap/halloween/darkness.png")
)
Expand Down Expand Up @@ -880,10 +886,29 @@
69 70 71 0
72 73 74 0
75 76 77 0
78 79 82 0
80 81 83 0
78 79 82 972
80 81 83 973
)
)

(tilegroup
(name (_ "Lightmap"))
(tiles
978 979 980 981
982 983 0 984
985 0 0 986
981 987 988 978
989 990 991 992
993 978 994 995
996 997 998 999
0 1000 1001 1002
1003 1004 1005 1006
1007 981 1008 1009
1010 1011 1012 1013
0 1014 1015 1016
)
)

(tile
(id 1)
(images "worldmap/shared/water_01.png"
Expand Down Expand Up @@ -929,4 +954,79 @@
80 81 83
)
)

(tiles
(width 4)(height 5)
(images "worldmap/ice/ice_world_special.png")
(ids
554 555 865 866
867 868 934 935
936 937 938 939
940 941 942 943
944 945 946 947
)
)

(tiles
(width 4)(height 6)
(images "worldmap/forest/forest_world_special.png")
(ids
948 949 950 951
952 953 954 955
956 957 0 0
958 959 960 961
962 963 964 965
966 967 968 969
)
)

(tiles
(width 2)(height 1)
(images "worldmap/christmas/woodspecial.png")
(ids
970 971
)
)

(tiles
(width 2)(height 1)
(images "worldmap/shared/shallow_water_special.png")
(ids
972 973
)
)

(tiles
(width 4)(height 4)
(images "tiles/lightmap/lightmap-bw.png")
(ids
978 979 980 981
982 983 0 984
985 0 0 986
0 987 988 0
)
)

(tiles
(width 4)(height 4)
(images "tiles/lightmap/lightmap-white.png")
(ids
989 990 991 992
993 0 994 995
996 997 998 999
0 1000 1001 1002
)
)

(tiles
(width 4)(height 4)
(images "tiles/lightmap/lightmap-black.png")
(ids
1003 1004 1005 1006
1007 0 1008 1009
1010 1011 1012 1013
0 1014 1015 1016
)
)

)
Loading
Loading