Skip to content

Commit

Permalink
Merge pull request #28 from geckon/10_packaging
Browse files Browse the repository at this point in the history
Packaging done (#10)
  • Loading branch information
geckon committed Dec 8, 2018
2 parents 446a61f + e5271bb commit f4b42a2
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 6 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/37d712df43e44d6487bb35e015c27c47)](https://app.codacy.com/app/geckon/2-n_solitaire?utm_source=github.com&utm_medium=referral&utm_content=geckon/2-n_solitaire&utm_campaign=Badge_Grade_Dashboard)
[![Updates](https://pyup.io/repos/github/geckon/2-n_solitaire/shield.svg)](https://pyup.io/repos/github/geckon/2-n_solitaire/)

2<sup>n</sup> Solitaire is a simple game inspired by 2048 Solitaire (but more
generic) which is inspired by 2048 (but instead of tiles in a grid you collect
cards here). I find the game fun and satisfying and thus I decided to try and
implement it using Pygame. Here we are.
2<sup>n</sup> Solitaire (or TWN Solitaire) is a simple game inspired by
2048 Solitaire (but more generic) which is inspired by 2048 (but instead of
tiles in a grid you collect cards here). I find the game fun and
satisfying and thus I decided to try and implement it using Pygame. Here we are.

The goal of the game is to stack an endless row of cards into limited-size
columns. Each time you stack two cards of the same value one on the other,
Expand All @@ -25,7 +25,7 @@ The game ends once all the columns are full and so no more cards can be played.

### Controls

![Screenshot](docs/screenshot.png)
![Screenshot](https://github.com/geckon/2-n_solitaire/blob/master/docs/screenshot.png)

This is what the game looks like. At the top you can see your current score,
below that is the main board where the cards are stacked. In the bottom part you
Expand Down
39 changes: 39 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# ___ _ __ _____ _ _ _ _
# |__ \| '_ \ / ____| | (_) | (_)
# ) |_| |_| | (___ ___ | |_| |_ __ _ _ _ __ ___
# / / \___ \ / _ \| | | __/ _` | | '__/ _ \
# / /_ ____) | (_) | | | || (_| | | | | __/
# |____| |_____/ \___/|_|_|\__\__,_|_|_| \___|
#

from setuptools import setup

with open('README.md', 'r', encoding='utf-8') as f:
readme = f.read()

setup(
name='twn-solitaire',
version='0.1.0',
packages=['twnsol', ],
package_dir={'twnsol': 'twnsol'},
package_data={'': ['LICENSE', 'assets/Jellee-Roman/*.txt'],
'twnsol': ['assets/Jellee-Roman/Jellee-Roman.otf']},
scripts=['solitaire.py', ],
url='https://github.com/geckon/2-n_solitaire',
license='GNU GPL v3',
description='Generic version of 2048 Solitaire. Simple, fun and '
'satisfying game.',
long_description=readme,
long_description_content_type='text/markdown',
install_requires=[
"pygame == 1.9.4",
"toml == 0.10.0",
],
classifiers=[
'Intended Audience :: End Users/Desktop',
'Natural Language :: English',
'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
'Programming Language :: Python :: 3',
'Operating System :: OS Independent',
]
)
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 7 additions & 1 deletion twnsol/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@
CONST dictionary is provided for any module to use.
"""

import os

HERE = os.path.dirname(os.path.abspath(__file__))

ASSETS_DIR = os.path.join(HERE, 'assets')

CONST = {
'game': {
Expand All @@ -28,7 +33,8 @@
},
'font': {
'path': {
'default': './assets/Jellee-Roman/Jellee-Roman.otf',
'default': os.path.join(ASSETS_DIR,
'Jellee-Roman/Jellee-Roman.otf'),
},
'size': {
'normal': 18,
Expand Down

0 comments on commit f4b42a2

Please sign in to comment.