From 757d3fad52a1467b414e104b51d82c88ddd6a625 Mon Sep 17 00:00:00 2001 From: Florian Fischer Date: Sun, 3 Jan 2021 14:59:26 +0100 Subject: introduce seperate assets subdirectory --- assets/tiles/deep_water.png | Bin 0 -> 17321 bytes assets/tiles/docks.png | Bin 0 -> 13164 bytes assets/tiles/farm.png | Bin 0 -> 11162 bytes assets/tiles/house.png | Bin 0 -> 12776 bytes assets/tiles/neutral.png | Bin 0 -> 6194 bytes assets/tiles/not_part_of_the_map.png | Bin 0 -> 5479 bytes assets/tiles/shallow_water.png | Bin 0 -> 15879 bytes assets/tiles/spawn_player_1.png | Bin 0 -> 8062 bytes assets/tiles/spawn_player_2.png | Bin 0 -> 10427 bytes assets/tiles/spawn_player_3.png | Bin 0 -> 10840 bytes assets/tiles/spawn_player_4.png | Bin 0 -> 9615 bytes assets/tiles/stick_of_victory.png | Bin 0 -> 10884 bytes assets/tiles/street.png | Bin 0 -> 8940 bytes assets/tiles/street_2.png | Bin 0 -> 9363 bytes assets/tiles/street_3.png | Bin 0 -> 10492 bytes assets/tiles/street_4.png | Bin 0 -> 10891 bytes assets/tiles/tower.png | Bin 0 -> 11874 bytes latex/Makefile | 2 +- maps/tiles/deep_water.png | Bin 17321 -> 0 bytes maps/tiles/docks.png | Bin 13164 -> 0 bytes maps/tiles/farm.png | Bin 11162 -> 0 bytes maps/tiles/house.png | Bin 12776 -> 0 bytes maps/tiles/neutral.png | Bin 6194 -> 0 bytes maps/tiles/not_part_of_the_map.png | Bin 5479 -> 0 bytes maps/tiles/shallow_water.png | Bin 15879 -> 0 bytes maps/tiles/spawn_player_1.png | Bin 8062 -> 0 bytes maps/tiles/spawn_player_2.png | Bin 10427 -> 0 bytes maps/tiles/spawn_player_3.png | Bin 10840 -> 0 bytes maps/tiles/spawn_player_4.png | Bin 9615 -> 0 bytes maps/tiles/stick_of_victory.png | Bin 10884 -> 0 bytes maps/tiles/street.png | Bin 8940 -> 0 bytes maps/tiles/street_2.png | Bin 9363 -> 0 bytes maps/tiles/street_3.png | Bin 10492 -> 0 bytes maps/tiles/street_4.png | Bin 10891 -> 0 bytes maps/tiles/tower.png | Bin 11874 -> 0 bytes scripts/generate_latex.py | 4 ++-- scripts/generate_map_img.py | 4 ++-- 37 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 assets/tiles/deep_water.png create mode 100644 assets/tiles/docks.png create mode 100644 assets/tiles/farm.png create mode 100644 assets/tiles/house.png create mode 100644 assets/tiles/neutral.png create mode 100644 assets/tiles/not_part_of_the_map.png create mode 100644 assets/tiles/shallow_water.png create mode 100644 assets/tiles/spawn_player_1.png create mode 100644 assets/tiles/spawn_player_2.png create mode 100644 assets/tiles/spawn_player_3.png create mode 100644 assets/tiles/spawn_player_4.png create mode 100644 assets/tiles/stick_of_victory.png create mode 100644 assets/tiles/street.png create mode 100644 assets/tiles/street_2.png create mode 100644 assets/tiles/street_3.png create mode 100644 assets/tiles/street_4.png create mode 100644 assets/tiles/tower.png delete mode 100644 maps/tiles/deep_water.png delete mode 100644 maps/tiles/docks.png delete mode 100644 maps/tiles/farm.png delete mode 100644 maps/tiles/house.png delete mode 100644 maps/tiles/neutral.png delete mode 100644 maps/tiles/not_part_of_the_map.png delete mode 100644 maps/tiles/shallow_water.png delete mode 100644 maps/tiles/spawn_player_1.png delete mode 100644 maps/tiles/spawn_player_2.png delete mode 100644 maps/tiles/spawn_player_3.png delete mode 100644 maps/tiles/spawn_player_4.png delete mode 100644 maps/tiles/stick_of_victory.png delete mode 100644 maps/tiles/street.png delete mode 100644 maps/tiles/street_2.png delete mode 100644 maps/tiles/street_3.png delete mode 100644 maps/tiles/street_4.png delete mode 100644 maps/tiles/tower.png diff --git a/assets/tiles/deep_water.png b/assets/tiles/deep_water.png new file mode 100644 index 00000000..efe80ad7 Binary files /dev/null and b/assets/tiles/deep_water.png differ diff --git a/assets/tiles/docks.png b/assets/tiles/docks.png new file mode 100644 index 00000000..a1a97179 Binary files /dev/null and b/assets/tiles/docks.png differ diff --git a/assets/tiles/farm.png b/assets/tiles/farm.png new file mode 100644 index 00000000..b083ee29 Binary files /dev/null and b/assets/tiles/farm.png differ diff --git a/assets/tiles/house.png b/assets/tiles/house.png new file mode 100644 index 00000000..9e86e72f Binary files /dev/null and b/assets/tiles/house.png differ diff --git a/assets/tiles/neutral.png b/assets/tiles/neutral.png new file mode 100644 index 00000000..c7ecf31e Binary files /dev/null and b/assets/tiles/neutral.png differ diff --git a/assets/tiles/not_part_of_the_map.png b/assets/tiles/not_part_of_the_map.png new file mode 100644 index 00000000..cf739f9e Binary files /dev/null and b/assets/tiles/not_part_of_the_map.png differ diff --git a/assets/tiles/shallow_water.png b/assets/tiles/shallow_water.png new file mode 100644 index 00000000..af721934 Binary files /dev/null and b/assets/tiles/shallow_water.png differ diff --git a/assets/tiles/spawn_player_1.png b/assets/tiles/spawn_player_1.png new file mode 100644 index 00000000..57d63821 Binary files /dev/null and b/assets/tiles/spawn_player_1.png differ diff --git a/assets/tiles/spawn_player_2.png b/assets/tiles/spawn_player_2.png new file mode 100644 index 00000000..fd29adf0 Binary files /dev/null and b/assets/tiles/spawn_player_2.png differ diff --git a/assets/tiles/spawn_player_3.png b/assets/tiles/spawn_player_3.png new file mode 100644 index 00000000..311a4e8e Binary files /dev/null and b/assets/tiles/spawn_player_3.png differ diff --git a/assets/tiles/spawn_player_4.png b/assets/tiles/spawn_player_4.png new file mode 100644 index 00000000..9b609b2c Binary files /dev/null and b/assets/tiles/spawn_player_4.png differ diff --git a/assets/tiles/stick_of_victory.png b/assets/tiles/stick_of_victory.png new file mode 100644 index 00000000..e2c55455 Binary files /dev/null and b/assets/tiles/stick_of_victory.png differ diff --git a/assets/tiles/street.png b/assets/tiles/street.png new file mode 100644 index 00000000..6c0b5a76 Binary files /dev/null and b/assets/tiles/street.png differ diff --git a/assets/tiles/street_2.png b/assets/tiles/street_2.png new file mode 100644 index 00000000..c34d4f6f Binary files /dev/null and b/assets/tiles/street_2.png differ diff --git a/assets/tiles/street_3.png b/assets/tiles/street_3.png new file mode 100644 index 00000000..5194e842 Binary files /dev/null and b/assets/tiles/street_3.png differ diff --git a/assets/tiles/street_4.png b/assets/tiles/street_4.png new file mode 100644 index 00000000..1c70dd7a Binary files /dev/null and b/assets/tiles/street_4.png differ diff --git a/assets/tiles/tower.png b/assets/tiles/tower.png new file mode 100644 index 00000000..f69b2cb7 Binary files /dev/null and b/assets/tiles/tower.png differ diff --git a/latex/Makefile b/latex/Makefile index 6942b6e6..3953d816 100644 --- a/latex/Makefile +++ b/latex/Makefile @@ -28,7 +28,7 @@ CARD_PNGS_PREFIXED = $(addprefix $(PDF_DIR)/,$(CARD_PNGS)) MAKEFILE_LIST = Makefile -ASSETS_PATH = ./assets +ASSETS_PATH = ../assets PDFLATEX_ENV := TEXINPUTS=".:$(ASSETS_PATH):" all: $(PDF_DIR)/print.pdf $(PDFS_PREFIXED) $(CARD_PNGS_PREFIXED) diff --git a/maps/tiles/deep_water.png b/maps/tiles/deep_water.png deleted file mode 100644 index efe80ad7..00000000 Binary files a/maps/tiles/deep_water.png and /dev/null differ diff --git a/maps/tiles/docks.png b/maps/tiles/docks.png deleted file mode 100644 index a1a97179..00000000 Binary files a/maps/tiles/docks.png and /dev/null differ diff --git a/maps/tiles/farm.png b/maps/tiles/farm.png deleted file mode 100644 index b083ee29..00000000 Binary files a/maps/tiles/farm.png and /dev/null differ diff --git a/maps/tiles/house.png b/maps/tiles/house.png deleted file mode 100644 index 9e86e72f..00000000 Binary files a/maps/tiles/house.png and /dev/null differ diff --git a/maps/tiles/neutral.png b/maps/tiles/neutral.png deleted file mode 100644 index c7ecf31e..00000000 Binary files a/maps/tiles/neutral.png and /dev/null differ diff --git a/maps/tiles/not_part_of_the_map.png b/maps/tiles/not_part_of_the_map.png deleted file mode 100644 index cf739f9e..00000000 Binary files a/maps/tiles/not_part_of_the_map.png and /dev/null differ diff --git a/maps/tiles/shallow_water.png b/maps/tiles/shallow_water.png deleted file mode 100644 index af721934..00000000 Binary files a/maps/tiles/shallow_water.png and /dev/null differ diff --git a/maps/tiles/spawn_player_1.png b/maps/tiles/spawn_player_1.png deleted file mode 100644 index 57d63821..00000000 Binary files a/maps/tiles/spawn_player_1.png and /dev/null differ diff --git a/maps/tiles/spawn_player_2.png b/maps/tiles/spawn_player_2.png deleted file mode 100644 index fd29adf0..00000000 Binary files a/maps/tiles/spawn_player_2.png and /dev/null differ diff --git a/maps/tiles/spawn_player_3.png b/maps/tiles/spawn_player_3.png deleted file mode 100644 index 311a4e8e..00000000 Binary files a/maps/tiles/spawn_player_3.png and /dev/null differ diff --git a/maps/tiles/spawn_player_4.png b/maps/tiles/spawn_player_4.png deleted file mode 100644 index 9b609b2c..00000000 Binary files a/maps/tiles/spawn_player_4.png and /dev/null differ diff --git a/maps/tiles/stick_of_victory.png b/maps/tiles/stick_of_victory.png deleted file mode 100644 index e2c55455..00000000 Binary files a/maps/tiles/stick_of_victory.png and /dev/null differ diff --git a/maps/tiles/street.png b/maps/tiles/street.png deleted file mode 100644 index 6c0b5a76..00000000 Binary files a/maps/tiles/street.png and /dev/null differ diff --git a/maps/tiles/street_2.png b/maps/tiles/street_2.png deleted file mode 100644 index c34d4f6f..00000000 Binary files a/maps/tiles/street_2.png and /dev/null differ diff --git a/maps/tiles/street_3.png b/maps/tiles/street_3.png deleted file mode 100644 index 5194e842..00000000 Binary files a/maps/tiles/street_3.png and /dev/null differ diff --git a/maps/tiles/street_4.png b/maps/tiles/street_4.png deleted file mode 100644 index 1c70dd7a..00000000 Binary files a/maps/tiles/street_4.png and /dev/null differ diff --git a/maps/tiles/tower.png b/maps/tiles/tower.png deleted file mode 100644 index f69b2cb7..00000000 Binary files a/maps/tiles/tower.png and /dev/null differ diff --git a/scripts/generate_latex.py b/scripts/generate_latex.py index f2906308..3cdc5cbe 100755 --- a/scripts/generate_latex.py +++ b/scripts/generate_latex.py @@ -49,7 +49,7 @@ CARD_TEMPLATE = \ SET_SYMBOLS = {'base': 'base', 'magic': 'magic', 'equipments': 'equipments', 'nautics': 'nautics', 'misc': ''} LATEX_ROOT = pathlib.Path(os.getcwd()) -ASSETS_DIR = LATEX_ROOT / 'assets' +ASSETS_DIR = LATEX_ROOT / '../assets' CARDS_DIR = LATEX_ROOT / 'cards' def file_for_card(card_name: str) -> pathlib.Path: @@ -156,7 +156,7 @@ def main(): global CARDS_DIR CARDS_DIR = LATEX_ROOT / 'cards' global ASSETS_DIR - ASSETS_DIR = LATEX_ROOT / 'assets' + ASSETS_DIR = LATEX_ROOT / '../assets' data_files = [args.data] diff --git a/scripts/generate_map_img.py b/scripts/generate_map_img.py index bb6925bc..f4e29148 100755 --- a/scripts/generate_map_img.py +++ b/scripts/generate_map_img.py @@ -7,7 +7,7 @@ import os from typing import MutableMapping MAP_ROOT = pathlib.Path(os.getcwd()) -TILES_DIR = MAP_ROOT / 'tiles' +TILES_DIR = MAP_ROOT / '../assets/tiles' SHOW_MAP = False def get_tile_path(tile: str) -> pathlib.Path: @@ -131,7 +131,7 @@ def main(): global MAP_ROOT MAP_ROOT = pathlib.Path(args.latex_root) global TILES_DIR - TILES_DIR = MAP_ROOT / 'tiles' + TILES_DIR = MAP_ROOT / '../assets/tiles' if args.show_map: global SHOW_MAP -- cgit v1.2.3