diff --git a/assets/fonts/arial.ttf b/assets/fonts/arial.ttf new file mode 100644 index 0000000..ad7d8ea Binary files /dev/null and b/assets/fonts/arial.ttf differ diff --git a/assets/images/entities/enemies/sand_monster.png b/assets/images/entities/enemies/sand_monster.png new file mode 100644 index 0000000..53ea3a0 Binary files /dev/null and b/assets/images/entities/enemies/sand_monster.png differ diff --git a/assets/images/tiles/jungle/0.png b/assets/images/tiles/jungle/0.png new file mode 100644 index 0000000..f564a3b Binary files /dev/null and b/assets/images/tiles/jungle/0.png differ diff --git a/assets/images/tiles/jungle/1.png b/assets/images/tiles/jungle/1.png new file mode 100644 index 0000000..a90adfd Binary files /dev/null and b/assets/images/tiles/jungle/1.png differ diff --git a/assets/images/tiles/jungle/10.png b/assets/images/tiles/jungle/10.png new file mode 100644 index 0000000..5d1e214 Binary files /dev/null and b/assets/images/tiles/jungle/10.png differ diff --git a/assets/images/tiles/jungle/11.png b/assets/images/tiles/jungle/11.png new file mode 100644 index 0000000..4bc3e13 Binary files /dev/null and b/assets/images/tiles/jungle/11.png differ diff --git a/assets/images/tiles/jungle/2.png b/assets/images/tiles/jungle/2.png new file mode 100644 index 0000000..57a3864 Binary files /dev/null and b/assets/images/tiles/jungle/2.png differ diff --git a/assets/images/tiles/jungle/3.png b/assets/images/tiles/jungle/3.png new file mode 100644 index 0000000..d05532c Binary files /dev/null and b/assets/images/tiles/jungle/3.png differ diff --git a/assets/images/tiles/jungle/4.png b/assets/images/tiles/jungle/4.png new file mode 100644 index 0000000..056237c Binary files /dev/null and b/assets/images/tiles/jungle/4.png differ diff --git a/assets/images/tiles/jungle/5.png b/assets/images/tiles/jungle/5.png new file mode 100644 index 0000000..dd8837b Binary files /dev/null and b/assets/images/tiles/jungle/5.png differ diff --git a/assets/images/tiles/jungle/6.png b/assets/images/tiles/jungle/6.png new file mode 100644 index 0000000..b3bfc7b Binary files /dev/null and b/assets/images/tiles/jungle/6.png differ diff --git a/assets/images/tiles/jungle/7.png b/assets/images/tiles/jungle/7.png new file mode 100644 index 0000000..c852d67 Binary files /dev/null and b/assets/images/tiles/jungle/7.png differ diff --git a/assets/images/tiles/jungle/8.png b/assets/images/tiles/jungle/8.png new file mode 100644 index 0000000..a8d0110 Binary files /dev/null and b/assets/images/tiles/jungle/8.png differ diff --git a/assets/images/tiles/jungle/9.png b/assets/images/tiles/jungle/9.png new file mode 100644 index 0000000..5904073 Binary files /dev/null and b/assets/images/tiles/jungle/9.png differ diff --git a/assets/maps/test.json b/assets/maps/test.json index 97939a9..66e3960 100644 --- a/assets/maps/test.json +++ b/assets/maps/test.json @@ -1 +1 @@ -{"tilemap": {"7;5": {"type": "base", "variant": 0, "pos": [7, 5]}, "7;6": {"type": "base", "variant": 0, "pos": [7, 6]}, "8;6": {"type": "base", "variant": 0, "pos": [8, 6]}}, "tile_size": 16} \ No newline at end of file +{"tilemap": {"7;5": {"type": "jungle", "variant": 0, "pos": [7, 5]}, "7;6": {"type": "jungle", "variant": 0, "pos": [7, 6]}, "8;6": {"type": "jungle", "variant": 0, "pos": [8, 6]}, "0;0": {"type": "jungle", "variant": 0, "pos": [0, 0]}, "0;1": {"type": "jungle", "variant": 0, "pos": [0, 1]}, "0;2": {"type": "jungle", "variant": 0, "pos": [0, 2]}, "0;3": {"type": "jungle", "variant": 0, "pos": [0, 3]}, "0;4": {"type": "jungle", "variant": 0, "pos": [0, 4]}, "0;5": {"type": "jungle", "variant": 0, "pos": [0, 5]}, "0;6": {"type": "jungle", "variant": 0, "pos": [0, 6]}, "0;7": {"type": "jungle", "variant": 0, "pos": [0, 7]}, "0;8": {"type": "jungle", "variant": 0, "pos": [0, 8]}, "0;9": {"type": "jungle", "variant": 0, "pos": [0, 9]}, "0;10": {"type": "jungle", "variant": 0, "pos": [0, 10]}, "0;11": {"type": "jungle", "variant": 0, "pos": [0, 11]}, "0;12": {"type": "jungle", "variant": 0, "pos": [0, 12]}, "0;13": {"type": "jungle", "variant": 3, "pos": [0, 13]}, "0;14": {"type": "jungle", "variant": 0, "pos": [0, 14]}, "1;14": {"type": "jungle", "variant": 0, "pos": [1, 14]}, "2;14": {"type": "jungle", "variant": 0, "pos": [2, 14]}, "3;14": {"type": "jungle", "variant": 0, "pos": [3, 14]}, "4;14": {"type": "jungle", "variant": 0, "pos": [4, 14]}, "4;13": {"type": "jungle", "variant": 1, "pos": [4, 13]}, "5;13": {"type": "jungle", "variant": 1, "pos": [5, 13]}, "5;14": {"type": "jungle", "variant": 0, "pos": [5, 14]}, "6;14": {"type": "jungle", "variant": 0, "pos": [6, 14]}, "7;14": {"type": "jungle", "variant": 0, "pos": [7, 14]}, "8;14": {"type": "jungle", "variant": 0, "pos": [8, 14]}, "9;14": {"type": "jungle", "variant": 0, "pos": [9, 14]}, "10;14": {"type": "jungle", "variant": 0, "pos": [10, 14]}, "11;14": {"type": "jungle", "variant": 0, "pos": [11, 14]}, "12;14": {"type": "jungle", "variant": 4, "pos": [12, 14]}, "13;14": {"type": "jungle", "variant": 4, "pos": [13, 14]}, "14;14": {"type": "jungle", "variant": 0, "pos": [14, 14]}, "15;14": {"type": "jungle", "variant": 2, "pos": [15, 14]}, "16;14": {"type": "jungle", "variant": 2, "pos": [16, 14]}, "17;14": {"type": "jungle", "variant": 2, "pos": [17, 14]}, "18;14": {"type": "jungle", "variant": 2, "pos": [18, 14]}, "19;14": {"type": "jungle", "variant": 2, "pos": [19, 14]}, "19;13": {"type": "jungle", "variant": 2, "pos": [19, 13]}, "19;12": {"type": "jungle", "variant": 0, "pos": [19, 12]}, "19;11": {"type": "jungle", "variant": 0, "pos": [19, 11]}, "18;11": {"type": "jungle", "variant": 0, "pos": [18, 11]}, "18;10": {"type": "jungle", "variant": 0, "pos": [18, 10]}, "1;0": {"type": "jungle", "variant": 0, "pos": [1, 0]}, "2;0": {"type": "jungle", "variant": 0, "pos": [2, 0]}, "3;0": {"type": "jungle", "variant": 0, "pos": [3, 0]}, "4;0": {"type": "jungle", "variant": 0, "pos": [4, 0]}, "2;1": {"type": "jungle", "variant": 0, "pos": [2, 1]}, "1;1": {"type": "jungle", "variant": 0, "pos": [1, 1]}, "1;2": {"type": "jungle", "variant": 0, "pos": [1, 2]}, "2;2": {"type": "jungle", "variant": 0, "pos": [2, 2]}, "3;2": {"type": "jungle", "variant": 0, "pos": [3, 2]}, "4;2": {"type": "jungle", "variant": 0, "pos": [4, 2]}, "4;1": {"type": "jungle", "variant": 0, "pos": [4, 1]}, "5;0": {"type": "jungle", "variant": 0, "pos": [5, 0]}, "6;0": {"type": "jungle", "variant": 0, "pos": [6, 0]}, "7;0": {"type": "jungle", "variant": 0, "pos": [7, 0]}, "8;0": {"type": "jungle", "variant": 4, "pos": [8, 0]}, "9;0": {"type": "jungle", "variant": 4, "pos": [9, 0]}, "10;0": {"type": "jungle", "variant": 4, "pos": [10, 0]}, "11;0": {"type": "jungle", "variant": 4, "pos": [11, 0]}, "12;0": {"type": "jungle", "variant": 0, "pos": [12, 0]}, "13;0": {"type": "jungle", "variant": 0, "pos": [13, 0]}, "14;0": {"type": "jungle", "variant": 0, "pos": [14, 0]}, "15;0": {"type": "jungle", "variant": 0, "pos": [15, 0]}, "16;0": {"type": "jungle", "variant": 0, "pos": [16, 0]}, "17;0": {"type": "jungle", "variant": 0, "pos": [17, 0]}, "18;0": {"type": "jungle", "variant": 0, "pos": [18, 0]}, "19;0": {"type": "jungle", "variant": 0, "pos": [19, 0]}, "19;1": {"type": "jungle", "variant": 0, "pos": [19, 1]}, "19;2": {"type": "jungle", "variant": 0, "pos": [19, 2]}, "19;3": {"type": "jungle", "variant": 0, "pos": [19, 3]}, "19;4": {"type": "jungle", "variant": 0, "pos": [19, 4]}, "19;5": {"type": "jungle", "variant": 0, "pos": [19, 5]}, "19;6": {"type": "jungle", "variant": 0, "pos": [19, 6]}, "19;7": {"type": "jungle", "variant": 0, "pos": [19, 7]}, "19;8": {"type": "jungle", "variant": 0, "pos": [19, 8]}, "19;9": {"type": "jungle", "variant": 0, "pos": [19, 9]}, "19;10": {"type": "jungle", "variant": 0, "pos": [19, 10]}, "18;9": {"type": "jungle", "variant": 0, "pos": [18, 9]}, "15;9": {"type": "jungle", "variant": 0, "pos": [15, 9]}, "14;9": {"type": "jungle", "variant": 0, "pos": [14, 9]}, "13;9": {"type": "jungle", "variant": 0, "pos": [13, 9]}, "12;9": {"type": "jungle", "variant": 4, "pos": [12, 9]}, "11;9": {"type": "jungle", "variant": 4, "pos": [11, 9]}, "10;9": {"type": "jungle", "variant": 4, "pos": [10, 9]}, "9;9": {"type": "jungle", "variant": 0, "pos": [9, 9]}, "8;9": {"type": "jungle", "variant": 0, "pos": [8, 9]}, "7;9": {"type": "jungle", "variant": 0, "pos": [7, 9]}, "6;9": {"type": "jungle", "variant": 0, "pos": [6, 9]}, "5;9": {"type": "jungle", "variant": 0, "pos": [5, 9]}, "4;9": {"type": "jungle", "variant": 0, "pos": [4, 9]}, "3;9": {"type": "jungle", "variant": 0, "pos": [3, 9]}, "2;9": {"type": "jungle", "variant": 0, "pos": [2, 9]}, "1;9": {"type": "jungle", "variant": 1, "pos": [1, 9]}, "1;8": {"type": "jungle", "variant": 1, "pos": [1, 8]}, "1;7": {"type": "jungle", "variant": 1, "pos": [1, 7]}, "1;6": {"type": "jungle", "variant": 1, "pos": [1, 6]}, "1;5": {"type": "jungle", "variant": 1, "pos": [1, 5]}, "1;4": {"type": "jungle", "variant": 1, "pos": [1, 4]}, "1;3": {"type": "jungle", "variant": 1, "pos": [1, 3]}, "2;3": {"type": "jungle", "variant": 1, "pos": [2, 3]}, "3;1": {"type": "jungle", "variant": 0, "pos": [3, 1]}, "2;5": {"type": "jungle", "variant": 0, "pos": [2, 5]}, "2;4": {"type": "jungle", "variant": 0, "pos": [2, 4]}, "3;5": {"type": "jungle", "variant": 0, "pos": [3, 5]}, "3;6": {"type": "jungle", "variant": 0, "pos": [3, 6]}, "3;7": {"type": "jungle", "variant": 0, "pos": [3, 7]}, "3;8": {"type": "jungle", "variant": 0, "pos": [3, 8]}, "2;8": {"type": "jungle", "variant": 0, "pos": [2, 8]}, "2;7": {"type": "jungle", "variant": 0, "pos": [2, 7]}, "2;6": {"type": "jungle", "variant": 0, "pos": [2, 6]}, "2;10": {"type": "jungle", "variant": 1, "pos": [2, 10]}, "1;11": {"type": "jungle", "variant": 0, "pos": [1, 11]}, "1;12": {"type": "jungle", "variant": 0, "pos": [1, 12]}, "1;10": {"type": "jungle", "variant": 1, "pos": [1, 10]}, "1;13": {"type": "jungle", "variant": 1, "pos": [1, 13]}, "2;13": {"type": "jungle", "variant": 1, "pos": [2, 13]}, "3;13": {"type": "jungle", "variant": 1, "pos": [3, 13]}, "2;12": {"type": "jungle", "variant": 0, "pos": [2, 12]}, "2;11": {"type": "jungle", "variant": 0, "pos": [2, 11]}, "3;10": {"type": "jungle", "variant": 1, "pos": [3, 10]}, "3;11": {"type": "jungle", "variant": 0, "pos": [3, 11]}, "4;11": {"type": "jungle", "variant": 0, "pos": [4, 11]}, "4;12": {"type": "jungle", "variant": 0, "pos": [4, 12]}, "3;12": {"type": "jungle", "variant": 0, "pos": [3, 12]}, "6;12": {"type": "jungle", "variant": 0, "pos": [6, 12]}, "6;13": {"type": "jungle", "variant": 1, "pos": [6, 13]}, "8;13": {"type": "jungle", "variant": 1, "pos": [8, 13]}, "9;13": {"type": "jungle", "variant": 0, "pos": [9, 13]}, "10;13": {"type": "jungle", "variant": 0, "pos": [10, 13]}, "11;13": {"type": "jungle", "variant": 0, "pos": [11, 13]}, "12;13": {"type": "jungle", "variant": 4, "pos": [12, 13]}, "13;13": {"type": "jungle", "variant": 4, "pos": [13, 13]}, "14;13": {"type": "jungle", "variant": 0, "pos": [14, 13]}, "15;13": {"type": "jungle", "variant": 2, "pos": [15, 13]}, "16;13": {"type": "jungle", "variant": 2, "pos": [16, 13]}, "17;13": {"type": "jungle", "variant": 2, "pos": [17, 13]}, "18;13": {"type": "jungle", "variant": 2, "pos": [18, 13]}, "18;12": {"type": "jungle", "variant": 0, "pos": [18, 12]}, "17;11": {"type": "jungle", "variant": 1, "pos": [17, 11]}, "15;10": {"type": "jungle", "variant": 0, "pos": [15, 10]}, "14;10": {"type": "jungle", "variant": 0, "pos": [14, 10]}, "13;10": {"type": "jungle", "variant": 0, "pos": [13, 10]}, "12;10": {"type": "jungle", "variant": 4, "pos": [12, 10]}, "10;10": {"type": "jungle", "variant": 0, "pos": [10, 10]}, "9;10": {"type": "jungle", "variant": 0, "pos": [9, 10]}, "8;10": {"type": "jungle", "variant": 1, "pos": [8, 10]}, "7;10": {"type": "jungle", "variant": 1, "pos": [7, 10]}, "6;10": {"type": "jungle", "variant": 1, "pos": [6, 10]}, "5;10": {"type": "jungle", "variant": 1, "pos": [5, 10]}, "4;10": {"type": "jungle", "variant": 1, "pos": [4, 10]}, "6;11": {"type": "jungle", "variant": 0, "pos": [6, 11]}, "7;11": {"type": "jungle", "variant": 0, "pos": [7, 11]}, "8;11": {"type": "jungle", "variant": 1, "pos": [8, 11]}, "8;12": {"type": "jungle", "variant": 1, "pos": [8, 12]}, "7;12": {"type": "jungle", "variant": 0, "pos": [7, 12]}, "7;13": {"type": "jungle", "variant": 1, "pos": [7, 13]}, "9;11": {"type": "jungle", "variant": 0, "pos": [9, 11]}, "10;11": {"type": "jungle", "variant": 0, "pos": [10, 11]}, "11;10": {"type": "jungle", "variant": 4, "pos": [11, 10]}, "11;11": {"type": "jungle", "variant": 4, "pos": [11, 11]}, "10;12": {"type": "jungle", "variant": 0, "pos": [10, 12]}, "9;12": {"type": "jungle", "variant": 0, "pos": [9, 12]}, "12;11": {"type": "jungle", "variant": 4, "pos": [12, 11]}, "13;11": {"type": "jungle", "variant": 4, "pos": [13, 11]}, "14;11": {"type": "jungle", "variant": 0, "pos": [14, 11]}, "15;11": {"type": "jungle", "variant": 0, "pos": [15, 11]}, "15;12": {"type": "jungle", "variant": 0, "pos": [15, 12]}, "16;12": {"type": "jungle", "variant": 0, "pos": [16, 12]}, "17;12": {"type": "jungle", "variant": 1, "pos": [17, 12]}, "14;12": {"type": "jungle", "variant": 0, "pos": [14, 12]}, "13;12": {"type": "jungle", "variant": 4, "pos": [13, 12]}, "12;12": {"type": "jungle", "variant": 4, "pos": [12, 12]}, "11;12": {"type": "jungle", "variant": 0, "pos": [11, 12]}, "7;8": {"type": "jungle", "variant": 0, "pos": [7, 8]}, "7;7": {"type": "jungle", "variant": 0, "pos": [7, 7]}, "7;4": {"type": "jungle", "variant": 0, "pos": [7, 4]}, "6;3": {"type": "jungle", "variant": 1, "pos": [6, 3]}, "6;2": {"type": "jungle", "variant": 0, "pos": [6, 2]}, "6;1": {"type": "jungle", "variant": 0, "pos": [6, 1]}, "5;1": {"type": "jungle", "variant": 0, "pos": [5, 1]}, "4;3": {"type": "jungle", "variant": 1, "pos": [4, 3]}, "4;4": {"type": "jungle", "variant": 0, "pos": [4, 4]}, "3;4": {"type": "jungle", "variant": 0, "pos": [3, 4]}, "3;3": {"type": "jungle", "variant": 1, "pos": [3, 3]}, "4;6": {"type": "jungle", "variant": 0, "pos": [4, 6]}, "4;7": {"type": "jungle", "variant": 0, "pos": [4, 7]}, "4;8": {"type": "jungle", "variant": 0, "pos": [4, 8]}, "5;8": {"type": "jungle", "variant": 0, "pos": [5, 8]}, "5;7": {"type": "jungle", "variant": 0, "pos": [5, 7]}, "6;7": {"type": "jungle", "variant": 0, "pos": [6, 7]}, "6;6": {"type": "jungle", "variant": 0, "pos": [6, 6]}, "5;6": {"type": "jungle", "variant": 0, "pos": [5, 6]}, "5;5": {"type": "jungle", "variant": 0, "pos": [5, 5]}, "5;4": {"type": "jungle", "variant": 0, "pos": [5, 4]}, "5;3": {"type": "jungle", "variant": 1, "pos": [5, 3]}, "6;4": {"type": "jungle", "variant": 0, "pos": [6, 4]}, "6;5": {"type": "jungle", "variant": 0, "pos": [6, 5]}, "6;8": {"type": "jungle", "variant": 0, "pos": [6, 8]}, "4;5": {"type": "jungle", "variant": 0, "pos": [4, 5]}, "5;2": {"type": "jungle", "variant": 0, "pos": [5, 2]}, "7;2": {"type": "jungle", "variant": 0, "pos": [7, 2]}, "7;1": {"type": "jungle", "variant": 0, "pos": [7, 1]}, "7;3": {"type": "jungle", "variant": 1, "pos": [7, 3]}, "8;7": {"type": "jungle", "variant": 0, "pos": [8, 7]}, "8;8": {"type": "jungle", "variant": 0, "pos": [8, 8]}, "8;5": {"type": "jungle", "variant": 0, "pos": [8, 5]}, "8;4": {"type": "jungle", "variant": 7, "pos": [8, 4]}, "8;3": {"type": "jungle", "variant": 1, "pos": [8, 3]}, "8;2": {"type": "jungle", "variant": 8, "pos": [8, 2]}, "8;1": {"type": "jungle", "variant": 0, "pos": [8, 1]}, "9;1": {"type": "jungle", "variant": 4, "pos": [9, 1]}, "11;1": {"type": "jungle", "variant": 4, "pos": [11, 1]}, "13;1": {"type": "jungle", "variant": 0, "pos": [13, 1]}, "15;1": {"type": "jungle", "variant": 0, "pos": [15, 1]}, "16;1": {"type": "jungle", "variant": 0, "pos": [16, 1]}, "17;1": {"type": "jungle", "variant": 0, "pos": [17, 1]}, "18;1": {"type": "jungle", "variant": 0, "pos": [18, 1]}, "18;2": {"type": "jungle", "variant": 0, "pos": [18, 2]}, "18;3": {"type": "jungle", "variant": 0, "pos": [18, 3]}, "18;4": {"type": "jungle", "variant": 0, "pos": [18, 4]}, "18;5": {"type": "jungle", "variant": 0, "pos": [18, 5]}, "18;6": {"type": "jungle", "variant": 0, "pos": [18, 6]}, "17;6": {"type": "jungle", "variant": 1, "pos": [17, 6]}, "17;7": {"type": "jungle", "variant": 1, "pos": [17, 7]}, "17;8": {"type": "jungle", "variant": 1, "pos": [17, 8]}, "18;7": {"type": "jungle", "variant": 0, "pos": [18, 7]}, "18;8": {"type": "jungle", "variant": 0, "pos": [18, 8]}, "15;8": {"type": "jungle", "variant": 0, "pos": [15, 8]}, "14;8": {"type": "jungle", "variant": 0, "pos": [14, 8]}, "13;8": {"type": "jungle", "variant": 0, "pos": [13, 8]}, "12;8": {"type": "jungle", "variant": 0, "pos": [12, 8]}, "11;8": {"type": "jungle", "variant": 4, "pos": [11, 8]}, "10;8": {"type": "jungle", "variant": 4, "pos": [10, 8]}, "9;8": {"type": "jungle", "variant": 0, "pos": [9, 8]}, "9;7": {"type": "jungle", "variant": 4, "pos": [9, 7]}, "9;6": {"type": "jungle", "variant": 4, "pos": [9, 6]}, "9;5": {"type": "jungle", "variant": 4, "pos": [9, 5]}, "9;4": {"type": "jungle", "variant": 6, "pos": [9, 4]}, "9;3": {"type": "jungle", "variant": 5, "pos": [9, 3]}, "9;2": {"type": "jungle", "variant": 11, "pos": [9, 2]}, "10;1": {"type": "jungle", "variant": 4, "pos": [10, 1]}, "10;2": {"type": "jungle", "variant": 11, "pos": [10, 2]}, "10;3": {"type": "jungle", "variant": 5, "pos": [10, 3]}, "10;4": {"type": "jungle", "variant": 6, "pos": [10, 4]}, "10;5": {"type": "jungle", "variant": 4, "pos": [10, 5]}, "10;6": {"type": "jungle", "variant": 4, "pos": [10, 6]}, "10;7": {"type": "jungle", "variant": 4, "pos": [10, 7]}, "11;7": {"type": "jungle", "variant": 4, "pos": [11, 7]}, "12;7": {"type": "jungle", "variant": 0, "pos": [12, 7]}, "13;7": {"type": "jungle", "variant": 0, "pos": [13, 7]}, "14;7": {"type": "jungle", "variant": 0, "pos": [14, 7]}, "15;7": {"type": "jungle", "variant": 0, "pos": [15, 7]}, "17;5": {"type": "jungle", "variant": 1, "pos": [17, 5]}, "17;4": {"type": "jungle", "variant": 1, "pos": [17, 4]}, "17;3": {"type": "jungle", "variant": 1, "pos": [17, 3]}, "17;2": {"type": "jungle", "variant": 0, "pos": [17, 2]}, "16;2": {"type": "jungle", "variant": 0, "pos": [16, 2]}, "15;2": {"type": "jungle", "variant": 0, "pos": [15, 2]}, "14;2": {"type": "jungle", "variant": 0, "pos": [14, 2]}, "13;2": {"type": "jungle", "variant": 0, "pos": [13, 2]}, "12;2": {"type": "jungle", "variant": 10, "pos": [12, 2]}, "12;1": {"type": "jungle", "variant": 0, "pos": [12, 1]}, "14;1": {"type": "jungle", "variant": 0, "pos": [14, 1]}, "15;3": {"type": "jungle", "variant": 1, "pos": [15, 3]}, "16;3": {"type": "jungle", "variant": 1, "pos": [16, 3]}, "15;6": {"type": "jungle", "variant": 0, "pos": [15, 6]}, "14;6": {"type": "jungle", "variant": 0, "pos": [14, 6]}, "13;6": {"type": "jungle", "variant": 0, "pos": [13, 6]}, "13;5": {"type": "jungle", "variant": 0, "pos": [13, 5]}, "13;4": {"type": "jungle", "variant": 0, "pos": [13, 4]}, "13;3": {"type": "jungle", "variant": 1, "pos": [13, 3]}, "14;3": {"type": "jungle", "variant": 1, "pos": [14, 3]}, "15;4": {"type": "jungle", "variant": 0, "pos": [15, 4]}, "15;5": {"type": "jungle", "variant": 0, "pos": [15, 5]}, "14;5": {"type": "jungle", "variant": 0, "pos": [14, 5]}, "14;4": {"type": "jungle", "variant": 0, "pos": [14, 4]}, "12;5": {"type": "jungle", "variant": 0, "pos": [12, 5]}, "11;6": {"type": "jungle", "variant": 4, "pos": [11, 6]}, "11;5": {"type": "jungle", "variant": 4, "pos": [11, 5]}, "11;4": {"type": "jungle", "variant": 6, "pos": [11, 4]}, "11;3": {"type": "jungle", "variant": 5, "pos": [11, 3]}, "12;3": {"type": "jungle", "variant": 1, "pos": [12, 3]}, "12;4": {"type": "jungle", "variant": 9, "pos": [12, 4]}, "12;6": {"type": "jungle", "variant": 0, "pos": [12, 6]}, "11;2": {"type": "jungle", "variant": 11, "pos": [11, 2]}, "17;10": {"type": "jungle", "variant": 1, "pos": [17, 10]}, "17;9": {"type": "jungle", "variant": 1, "pos": [17, 9]}, "5;12": {"type": "jungle", "variant": 0, "pos": [5, 12]}, "5;11": {"type": "jungle", "variant": 0, "pos": [5, 11]}, "16;11": {"type": "jungle", "variant": 0, "pos": [16, 11]}, "16;10": {"type": "jungle", "variant": 0, "pos": [16, 10]}, "16;9": {"type": "jungle", "variant": 0, "pos": [16, 9]}, "16;8": {"type": "jungle", "variant": 0, "pos": [16, 8]}, "16;7": {"type": "jungle", "variant": 0, "pos": [16, 7]}, "16;6": {"type": "jungle", "variant": 0, "pos": [16, 6]}, "16;5": {"type": "jungle", "variant": 0, "pos": [16, 5]}, "16;4": {"type": "jungle", "variant": 0, "pos": [16, 4]}}, "tile_size": 16, "waypoints": [[0, 13], [8, 13], [8, 10], [1, 10], [1, 3], [17, 3], [17, 12]]} \ No newline at end of file diff --git a/assets/theme/editor_theme.json b/assets/theme/editor_theme.json new file mode 100644 index 0000000..b756069 --- /dev/null +++ b/assets/theme/editor_theme.json @@ -0,0 +1,21 @@ +{ + "defaults": { + "colours": { + "normal_bg": "#252525", + "hovered_bg": "#353535", + "disabled_bg": "#202020", + "selected_bg": "#454545", + "active_bg": "#555555", + "normal_text": "#FFFFFF", + "hovered_text": "#FFFFFF", + "selected_text": "#FFFFFF", + "disabled_text": "#777777" + }, + "font": { + "name": "assets/fonts/arial.ttf", + "size": "14", + "bold": "0", + "italic": "0" + } + } +} \ No newline at end of file diff --git a/editor.py b/editor.py index 523c22d..43c3e5a 100644 --- a/editor.py +++ b/editor.py @@ -1,5 +1,6 @@ import pygame as pg -from game.util import load_image, load_images +import pygame_gui as pgi +from game.util import * from game.tilemap import Tilemap RENDER_SCALE = 2.0 @@ -7,12 +8,15 @@ WINDOW_SIZE=(640, 480) class Editor(): def __init__(self): + pg.font.init() self.screen = pg.display.set_mode(WINDOW_SIZE) self.clock = pg.time.Clock() self.width, self.height = pg.display.get_surface().get_size() - self.tilemap = Tilemap(self) - self.display = pg.Surface((self.width/4*3, self.height/6*5)) + self.tilemap = Tilemap(self, 16) + self.display = pg.Surface((WINDOW_SIZE[0] / RENDER_SCALE, WINDOW_SIZE[1] / RENDER_SCALE)) + + self.manager = pgi.UIManager(self.screen.get_size(), "assets/theme/editor_theme.json") self.map = 'test' self.path = 'assets/maps/' + str(self.map) + '.json' @@ -25,7 +29,8 @@ class Editor(): self.scroll = [0, 0] self.assets = { - "base": load_images("/tiles/test") + "base": load_images("/tiles/test"), + "jungle": load_images("/tiles/jungle") } self.tile_list = list(self.assets) @@ -39,6 +44,14 @@ class Editor(): self.right_clicking = False self.shift = False self.ongrid = True + self.edit_mode = "tile" + + self.drop_down_controls = pgi.elements.UIDropDownMenu( + options_list=["Mode: Tile", "Mode: Path"], + starting_option="Mode: Tile", + relative_rect=pg.Rect((self.screen.get_width() -200, 0), (200, 30)), + manager=self.manager + ) def run(self): self.running = True @@ -49,85 +62,219 @@ class Editor(): return self.running def update(self): + #for pygame_gui + time_delta = self.clock.tick(60) / 1000.0 + self.mpos = pg.mouse.get_pos() + # print(self.mpos) self.mpos = (self.mpos[0] / RENDER_SCALE, self.mpos[1] / RENDER_SCALE) self.tile_pos = (int((self.mpos[0] + self.scroll[0]) // self.tilemap.tile_size), int((self.mpos[1] + self.scroll[1]) // self.tilemap.tile_size)) + # print(self.tile_pos) self.scroll[0] += (self.movment[1] - self.movment[0]) * 2 self.scroll[1] += (self.movment[3] - self.movment[2]) * 2 - if self.clicking and self.ongrid: - self.tilemap.tilemap[str(self.tile_pos[0]) + ';' + str(self.tile_pos[1])] = {'type': self.tile_list[self.tile_group], 'variant': self.tile_variant, 'pos': self.tile_pos} - if self.right_clicking: - tile_loc = str(self.tile_pos[0]) + ';' + str(self.tile_pos[1]) - if tile_loc in self.tilemap.tilemap: - del self.tilemap.tilemap[tile_loc] + self.process_clicks() self.current_tile_img = self.assets[self.tile_list[self.tile_group]][self.tile_variant].copy() for event in pg.event.get(): if event.type == pg.QUIT: self.running = False - if event.type == pg.MOUSEBUTTONDOWN: - if event.button == 1: - self.clicking = True - if event.button == 3: - self.right_clicking = True - if self.shift: - if event.button == 4: - self.tile_variant = (self.tile_variant - 1) % len(self.assets[self.tile_list[self.tile_group]]) - if event.button == 5: - self.tile_variant = (self.tile_variant + 1) % len(self.assets[self.tile_list[self.tile_group]]) - else: - if event.button == 4: - self.tile_group = (self.tile_group - 1) % len(self.tile_list) - self.tile_variant = 0 - if event.button == 5: - self.tile_group = (self.tile_group + 1) % len(self.tile_list) - self.tile_variant = 0 - if event.type == pg.MOUSEBUTTONUP: - if event.button == 1: - self.clicking = False - if event.button == 3: - self.right_clicking = False + self.process_event(event) + + self.manager.update(time_delta) + + def process_event(self, event): + #pygame_gui + self.manager.process_events(event) + if event.type == pgi.UI_DROP_DOWN_MENU_CHANGED: + self.edit_mode = event.text.split(" ")[1].lower() + + if event.type == pg.MOUSEBUTTONDOWN: + if event.button == 1: + self.clicking = True + if event.button == 3: + self.right_clicking = True + if self.shift: + if event.button == 4: + self.tile_variant = (self.tile_variant - 1) % len(self.assets[self.tile_list[self.tile_group]]) + if event.button == 5: + self.tile_variant = (self.tile_variant + 1) % len(self.assets[self.tile_list[self.tile_group]]) + else: + if event.button == 4: + self.tile_group = (self.tile_group - 1) % len(self.tile_list) + self.tile_variant = 0 + if event.button == 5: + self.tile_group = (self.tile_group + 1) % len(self.tile_list) + self.tile_variant = 0 + if event.type == pg.MOUSEBUTTONUP: + if event.button == 1: + self.clicking = False + if event.button == 3: + self.right_clicking = False + + if event.type == pg.KEYDOWN: + if event.key == pg.K_a: + self.movment[0] = True + if event.key == pg.K_d: + self.movment[1] = True + if event.key == pg.K_w: + self.movment[2] = True + if event.key == pg.K_s: + self.movment[3] = True + if event.key == pg.K_LSHIFT: + self.shift = True + if event.key == pg.K_o: + self.tilemap.save(self.path) + if event.key == pg.K_BACKSPACE: + if self.edit_mode == "path": + self.remove_last_waypoint() + if event.key == pg.K_c: + if self.edit_mode == "path": + self.clear_waypoints() + if event.type == pg.KEYUP: + if event.key == pg.K_a: + self.movment[0] = False + if event.key == pg.K_d: + self.movment[1] = False + if event.key == pg.K_w: + self.movment[2] = False + if event.key == pg.K_s: + self.movment[3] = False + if event.key == pg.K_LSHIFT: + self.shift = False + + def process_clicks(self): + if self.manager.get_hovering_any_element(): + return + + if self.clicking and self.ongrid and self.edit_mode == "tile": + self.tilemap.tilemap[str(self.tile_pos[0]) + ';' + str(self.tile_pos[1])] = {'type': self.tile_list[self.tile_group], 'variant': self.tile_variant, 'pos': self.tile_pos} + if self.clicking and self.ongrid and self.edit_mode == "path": + self.add_waypoint(self.tile_pos) + if self.right_clicking and self.edit_mode == "tile": + tile_loc = str(self.tile_pos[0]) + ';' + str(self.tile_pos[1]) + if tile_loc in self.tilemap.tilemap: + del self.tilemap.tilemap[tile_loc] + if self.right_clicking and self.edit_mode == "path": + self.remove_waypoint_at(self.tile_pos) - if event.type == pg.KEYDOWN: - if event.key == pg.K_a: - self.movment[0] = True - if event.key == pg.K_d: - self.movment[1] = True - if event.key == pg.K_w: - self.movment[2] = True - if event.key == pg.K_s: - self.movment[3] = True - if event.key == pg.K_LSHIFT: - self.shift = True - if event.key == pg.K_o: - self.tilemap.save(self.path) - if event.type == pg.KEYUP: - if event.key == pg.K_a: - self.movment[0] = False - if event.key == pg.K_d: - self.movment[1] = False - if event.key == pg.K_w: - self.movment[2] = False - if event.key == pg.K_s: - self.movment[3] = False - if event.key == pg.K_LSHIFT: - self.shift = False - def draw(self): self.display.fill((0, 0, 0)) render_scroll = (int(self.scroll[0]), int(self.scroll[1])) - self.display.blit(self.current_tile_img, (10, 10)) + self.draw_grid(self.display, 60, render_scroll) self.tilemap.render(self.display, offset=render_scroll) - if self.ongrid: + + if self.edit_mode == "path": + self.draw_path(self.display, self.tilemap.waypoints, self.scroll) + + if self.ongrid and self.edit_mode == "tile": self.display.blit(self.current_tile_img, (self.tile_pos[0] * self.tilemap.tile_size - self.scroll[0], self.tile_pos[1] * self.tilemap.tile_size - self.scroll[1])) + elif self.ongrid and self.edit_mode == "path": + pg.draw.circle(self.display, (255, 0, 0), (self.tile_pos[0] * self.tilemap.tile_size - self.scroll[0] + self.tilemap.tile_size//2, self.tile_pos[1] * self.tilemap.tile_size - self.scroll[1] + self.tilemap.tile_size//2), 5) else: - self.display.blit(self.current_tile_img, self.mpos) + if self.edit_mode == "tile": + self.display.blit(self.current_tile_img, self.mpos) + + self.display.blit(self.current_tile_img, (10, 10)) self.screen.blit(pg.transform.scale(self.display, self.screen.get_size())) - pg.display.update() \ No newline at end of file + + self.manager.draw_ui(self.screen) + + pg.display.update() + + def draw_grid(self, surf, alpha, offset=(0, 0)): + tile_size = self.tilemap.tile_size + temp_surf = pg.Surface((self.width, self.height), pg.SRCALPHA) + offset_x, offset_y = offset + + start_x = (offset_x // tile_size) * tile_size # normalize + start_y = (offset_y // tile_size) * tile_size + + for x in range(start_x, offset_x + self.width, tile_size): + screen_x = x - offset_x + pg.draw.line( + temp_surf, + (255, 255, 255, alpha), + (screen_x, 0), + (screen_x, self.height) + ) + + for y in range(start_y, offset_y + self.height + tile_size, tile_size): + screen_y = y - offset_y + pg.draw.line( + temp_surf, + (255, 255, 255, alpha), + (0, screen_y), + (self.width, screen_y) + ) + + surf.blit(temp_surf, (0, 0)) + + def draw_path(self, surf, waypoints, offset): + if len(waypoints) == 0: + return + + # draw first point even if there is no line yet + if len(waypoints) == 1: + pixel_point = tile_to_pixel( + waypoints[0], + self.tilemap.tile_size, + True + ) + + pixel_point_off = ( + pixel_point[0] - offset[0], + pixel_point[1] - offset[1] + ) + + pg.draw.circle(surf, (255, 0, 0), pixel_point_off, 3) + return + + for i in range(len(waypoints) -1): + tile_point1 = waypoints[i] + tile_point2 = waypoints[i+1] + + pixel_point1 = tile_to_pixel(tile_point1, self.tilemap.tile_size, True) + pixel_point2 = tile_to_pixel(tile_point2, self.tilemap.tile_size, True) + pixel_point1_off = (pixel_point1[0] - offset[0], pixel_point1[1] - offset[1]) + pixel_point2_off = (pixel_point2[0] - offset[0], pixel_point2[1] - offset[1]) + pg.draw.circle(surf, (255, 0, 0), pixel_point1_off, 3) + + pg.draw.line( + surf, + (255, 0, 0), + pixel_point1_off, + pixel_point2_off + ) + pg.draw.circle(surf, (255, 0, 0), pixel_point2_off, 3) + + def add_waypoint(self, tile_pos): + waypoint = [tile_pos[0], tile_pos[1]] + + if waypoint in self.tilemap.waypoints: + return + + self.tilemap.waypoints.append(waypoint) + + + def remove_waypoint_at(self, tile_pos): + waypoint = [tile_pos[0], tile_pos[1]] + + if waypoint in self.tilemap.waypoints: + self.tilemap.waypoints.remove(waypoint) + + + def remove_last_waypoint(self): + if self.tilemap.waypoints: + self.tilemap.waypoints.pop() + + + def clear_waypoints(self): + self.tilemap.waypoints.clear() + \ No newline at end of file diff --git a/game/camera.py b/game/camera.py new file mode 100644 index 0000000..5cbc230 --- /dev/null +++ b/game/camera.py @@ -0,0 +1,26 @@ +import pygame as pg + +class Camera(): + def __init__(self): + self.zoom = 1 + self.offset = pg.math.Vector2(0, 0) + + def world_to_screen(self, pos): + return ( + int((pos[0] - self.offset.x) * self.zoom), + int((pos[1] - self.offset.y) * self.zoom) + ) + + def screen_to_world(self, pos): + return ( + pos[0] / self.zoom + self.offset.x, + pos[1] / self.zoom + self.offset.y + ) + + def move(self, dx, dy): + self.offset.x += dx + self.offset.y += dy + + def change_zoom(self, amount): + self.zoom += amount + self.zoom = max(0.5, min(self.zoom, 4.0)) \ No newline at end of file diff --git a/game/enemy.py b/game/enemy.py new file mode 100644 index 0000000..311dfc8 --- /dev/null +++ b/game/enemy.py @@ -0,0 +1,63 @@ +from game.util import * +import pygame as pg + +class Enemy(pg.sprite.Group): + def __init__(self, game, speed, health): + super().__init__() + self.game = game + self.waypoints = self.game.tilemap.waypoints + print(self.waypoints) + + self.speed = speed + self.health = health + + self.image = self.game.assets['enemy'] + self.rect = self.image.get_rect() + + self.pos = pg.Vector2( + tile_to_pixel(self.waypoints[0], self.game.tilemap.tile_size, True) + ) + + self.target_index = 1 + + self.rect.center = self.pos + + def update(self): + if self.target_index >= len(self.waypoints): + return + + tile_size = self.game.tilemap.tile_size + + target = pg.Vector2( + tile_to_pixel( + self.waypoints[self.target_index], + tile_size, + True + ) + ) + + direction = target - self.pos + distance = direction.length() + + if distance <= self.speed: + self.pos = target + self.target_index += 1 + else: + direction = direction.normalize() + self.pos += direction * self.speed + + self.rect.center = self.pos + + def render(self, surf, camera): + zoom = camera.zoom + scaled_rect = self.rect.scale_by(zoom) + + scaled_image = pg.transform.scale( + self.image, + (scaled_rect.size[0], scaled_rect.size[1]) + ) + + scaled_pos = camera.world_to_screen(self.pos) + scaled_rect.center = scaled_pos + + surf.blit(scaled_image, scaled_rect) \ No newline at end of file diff --git a/game/game.py b/game/game.py index 9fe9200..24a07da 100644 --- a/game/game.py +++ b/game/game.py @@ -20,12 +20,21 @@ class Game: self.clock = pygame.time.Clock() self.ui_manager = pygame_gui.UIManager( WINDOW_SIZE, - "theme.json" + "assets/theme/theme.json" ) self.tilemap = Tilemap(self) + self.map = 'test' + self.path = 'assets/maps/' + str(self.map) + '.json' + try: + self.tilemap.load(self.path) + except FileNotFoundError: + print('File not Found') + print(self.tilemap.waypoints) self.assets={ - "base": load_images('/tiles/test') + "base": load_images('/tiles/test'), + "jungle": load_images('/tiles/jungle'), + "enemy": load_image('/entities/enemies/sand_monster.png') } self.screens = { @@ -58,6 +67,8 @@ class Game: self.ui_manager.process_events(event) self.current_screen.process_event(event) + + self.current_screen.update(dt) self.ui_manager.update(dt) diff --git a/game/screens/game_play.py b/game/screens/game_play.py index 0c1897f..f40085c 100644 --- a/game/screens/game_play.py +++ b/game/screens/game_play.py @@ -1,4 +1,7 @@ from game.screens.base_screen import BaseScreen +from game.enemy import Enemy +from game.camera import Camera +from game.util import * import pygame as pg import pygame_gui as pgi @@ -6,30 +9,62 @@ class GamePlay(BaseScreen): def __init__(self, game): super().__init__(game) - self.tile_multiplicator = 2.0 + # self.tile_multiplicator = 2.0 self.width, self.height = pg.display.get_surface().get_size() - self.map_screen = pg.surface.Surface((int(self.width/4*3),int(self.height/6*5))) + self.game_surface = pg.surface.Surface((int(self.width/4*3),int(self.height/6*5))) + # self.map_surface = pg.surface.Surface((self.game_surface.get_width()/self.tile_multiplicator,self.game_surface.get_height()/self.tile_multiplicator)) - self.scroll = [0, 0] + self.camera = Camera() + self.movment = [False, False, False, False] self.map = 'test' self.path = 'assets/maps/' + str(self.map) + '.json' + self.enemy = Enemy(self.game, 0.5, 100) + try: self.game.tilemap.load(self.path) except FileNotFoundError: print('File not Found') def process_event(self, event): - pass + if event.type == pg.KEYDOWN: + if event.key == pg.K_a: + self.movment[0] = True + if event.key == pg.K_d: + self.movment[1] = True + if event.key == pg.K_w: + self.movment[2] = True + if event.key == pg.K_s: + self.movment[3] = True + + if event.key == pg.K_q: + self.camera.change_zoom(-0.25) + if event.key == pg.K_e: + self.camera.change_zoom(0.25) + if event.type == pg.KEYUP: + if event.key == pg.K_a: + self.movment[0] = False + if event.key == pg.K_d: + self.movment[1] = False + if event.key == pg.K_w: + self.movment[2] = False + if event.key == pg.K_s: + self.movment[3] = False def update(self, dt): - pass + self.enemy.update() + + self.camera.move((self.movment[1] - self.movment[0]) * 2, (self.movment[3] - self.movment[2]) * 2) def draw(self, surface): - self.map_screen.fill((40, 40, 40)) + self.game_surface.fill((40, 40, 40)) + # self.map_surface.fill((40, 40, 40)) - render_scroll = (int(self.scroll[0]), int(self.scroll[1])) - self.game.tilemap.render(self.map_screen, offset=render_scroll) + self.game.tilemap.render_game(self.game_surface, self.camera) + + self.enemy.render(self.game_surface, self.camera) + + # self.game_surface.blit(pg.transform.scale(self.map_surface, self.game_surface.get_size())) - self.game.window.blit(self.map_screen, (0, self.height/6)) + surface.blit(self.game_surface, (0, self.height/6)) diff --git a/game/tilemap.py b/game/tilemap.py index 9f6bc7a..59e510b 100644 --- a/game/tilemap.py +++ b/game/tilemap.py @@ -1,14 +1,21 @@ import pygame, json +""" +Todo: +* Add prop system for Trees, etc. (like off_grid), handle blocked with game objects over props +""" + class Tilemap: def __init__(self, game, tile=16): self.game = game self.tile_size = tile self.tilemap = {} + self.offgrid_tiles = [] + self.waypoints=[] def save(self, path): f = open(path, 'w') - json.dump({'tilemap': self.tilemap, 'tile_size': self.tile_size}, f) + json.dump({'tilemap': self.tilemap, 'tile_size': self.tile_size, 'waypoints': self.waypoints}, f) f.close() def load(self, path): @@ -17,8 +24,8 @@ class Tilemap: f.close() self.tilemap = map_data['tilemap'] - self.tile_size = map_data['tile_size'] - + self.tile_size = map_data['tile_size'] + self.waypoints = map_data['waypoints'] def render(self, surf, offset=(0, 0)): for x in range(offset[0] // self.tile_size, (offset[0] + surf.get_width()) // self.tile_size + 1): @@ -27,3 +34,36 @@ class Tilemap: if loc in self.tilemap: tile = self.tilemap[loc] surf.blit(self.game.assets[tile['type']][tile['variant']], (tile['pos'][0] * self.tile_size - offset[0], tile['pos'][1] * self.tile_size - offset[1])) + + def render_game(self, surf, camera): + tile_size = self.tile_size + zoom = camera.zoom + scaled_tile_size = int(tile_size * zoom) + + start_x = int(camera.offset.x // tile_size) + start_y = int(camera.offset.y // tile_size) + + end_x = int((camera.offset.x + surf.get_width() / zoom) // tile_size) + 2 + end_y = int((camera.offset.y + surf.get_height() / zoom) // tile_size) + 2 + + for x in range(start_x, end_x): + for y in range(start_y, end_y): + loc = f"{x};{y}" + + if loc in self.tilemap: + tile = self.tilemap[loc] + image = self.game.assets[tile["type"]][tile["variant"]] + + scaled_image = pygame.transform.scale( + image, + (scaled_tile_size, scaled_tile_size) + ) + + world_pos = ( + tile["pos"][0] * tile_size, + tile["pos"][1] * tile_size + ) + + screen_pos = camera.world_to_screen(world_pos) + + surf.blit(scaled_image, screen_pos) diff --git a/game/util.py b/game/util.py index fd34f24..73ce868 100644 --- a/game/util.py +++ b/game/util.py @@ -11,6 +11,18 @@ def load_image(path, colorkey=(0,0,0)): def load_images(dir_path): images = [] - for img_name in os.listdir(img_path+dir_path): + for img_name in os.listdir(img_path + dir_path): images.append(load_image(dir_path + '/' + img_name)) return images + +def tile_to_pixel(waypoint, tile_size, center=False): + if center: + return ( + waypoint[0] * tile_size + tile_size // 2, + waypoint[1] * tile_size + tile_size // 2 + ) + else: + return ( + waypoint[0] * tile_size, + waypoint[1] * tile_size + )