diff --git a/runescape-text/__init__.py b/runescape-text/__init__.py deleted file mode 100644 index 97ec5bb..0000000 --- a/runescape-text/__init__.py +++ /dev/null @@ -1 +0,0 @@ -import runescape \ No newline at end of file diff --git a/runescape_text/__init__.py b/runescape_text/__init__.py new file mode 100644 index 0000000..2363271 --- /dev/null +++ b/runescape_text/__init__.py @@ -0,0 +1 @@ +from .runescape_text import * \ No newline at end of file diff --git a/runescape_uf.ttf b/runescape_text/data/runescape_uf.ttf similarity index 100% rename from runescape_uf.ttf rename to runescape_text/data/runescape_uf.ttf diff --git a/runescape-text/runescape_text.py b/runescape_text/runescape_text.py similarity index 98% rename from runescape-text/runescape_text.py rename to runescape_text/runescape_text.py index e554a77..8c39756 100644 --- a/runescape-text/runescape_text.py +++ b/runescape_text/runescape_text.py @@ -1,6 +1,6 @@ from PIL import Image, ImageDraw,ImageFont import math -import sys, getopt +import sys, getopt, os # Preset colors black = (0,0,0) @@ -375,7 +375,7 @@ def line_merge(arr): "shake": shake_effect } -fnt = ImageFont.truetype('./runescape_uf.ttf', size=18) +fnt = ImageFont.truetype(os.path.join(os.path.dirname(__file__),'data/runescape_uf.ttf'), size=18) if __name__ == "__main__": # string = "glow1:wave:cdjquw4 \nAAAA" @@ -398,7 +398,7 @@ def line_merge(arr): else: multi_frame_save(img, file=outfile) except getopt.GetoptError: - print("\nrunescape.py [options] ") + print("\nrunescape_text.py [options] ") print("OPTIONS") print("\t-o ") print("\t-c ") diff --git a/setup.py b/setup.py index 7653c22..f12c1db 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setuptools.setup( name="runescape-text", - version="1.0.0", + version="1.0.4", author="Riley Lahd", author_email="sircinnamon@gmail.com", description="A program for generating runescape-chat-like images of text.", @@ -19,4 +19,8 @@ "Operating System :: OS Independent", ], python_requires='>=3.6', + install_requires=[ + "pillow", + ], + package_data={"":["data/runescape_uf.ttf"]}, ) \ No newline at end of file