Commit graph

49 commits

Author SHA1 Message Date
Samuel Henrique
710428229a get_all and get_[region] fixed. 2017-07-02 20:46:35 -03:00
Lazo
45d4146b2f Merge branch 'master' into master 2017-06-30 17:37:05 -04:00
Samuel Henrique
26b2c396b6 Local escape code variables. 2017-06-29 16:36:16 -03:00
Samuel Henrique
4fc2c613ef Type commands 2017-06-29 15:17:16 -03:00
cclauss
9c5b040571 Make main() a separate function so we can test it
This will enable us to use [pytest](https://docs.pytest.org) to do end-to-end tests like:
https://github.com/LazoCoder/Pokemon-Terminal/pull/60/files#diff-1532f81ff7af5d26a72ae57cdbeabb53R19
2017-06-29 09:00:39 +02:00
Griffin Young
04f665f970 fix help message and name vs id conflict 2017-06-25 13:07:45 -07:00
IamCarbonMan
97ce1dafc7 Merge branch 'master' into master 2017-06-25 11:17:58 -07:00
Griffin Young
016c0fc91f added threshold and all options to get_light/get_dark. added full light-dark table. added unit test 2017-06-25 11:12:45 -07:00
Lazo
e72de8c93b Merge pull request #57 from dosman711/add-random-shuffle
Add random shuffle option to slideshow
2017-06-25 13:10:05 -04:00
Chris Baker
f3ff4428f6 messed up compare for slideshow 2017-06-24 20:49:57 -07:00
Griffin Young
f52c73ed9b added light and dark options 2017-06-24 19:51:50 -07:00
cclauss
15da2260d8 Simplify with in 2017-06-24 07:08:57 +02:00
Chris Baker
b7619c8f7a Add random shuffle option to slideshow
This adds 2 new options for slideshow, `rnd-slideshow [time]` and
`rnd-slideshow-<region> [time]`. Also some cleanup to help text to
help it all fit.
2017-06-23 21:58:03 -07:00
LazoCoder
cfb920fb7c Fixed issue with how the database loads pokemon
If not converted to lowercase it causes problems.
2017-06-21 19:26:14 -04:00
cclauss
797a5eccf4 Simplify with str.join() and enumerate() 2017-06-21 09:00:24 +02:00
LazoCoder
489cd9ea4a alias added: ichooseyou 2017-06-18 20:19:00 -04:00
LazoCoder
088f5859e9 Formatted help menu + added search system info 2017-06-18 00:31:05 -04:00
LazoCoder
f1c0cab647 Removed "?" functionality
It is unreliable and confusing. Also it only worked for iTerm.
2017-06-18 00:07:33 -04:00
Connor Bishop
ac749c84f1 Improved handling of slideshow time. 2017-06-13 21:07:50 -07:00
Connor Bishop
b437857c3e Made it possible to set time to sleep in slideshow mode. 2017-06-11 17:05:19 -07:00
LazoCoder
16f4a6b27b Added clear functionality
Sets the current terminal background image to blank. Tested on iTerm2 on macOS and Terminology on Ubuntu.
2017-06-11 15:30:23 -04:00
Ben Magee
ee624fa99e Updated the usage string to include the new random commands with specified regions. 2017-06-07 10:06:27 +01:00
Ben Magee
1219b1d7c7 Added get_random_from_region(region) function to the Database class, which picks a random Pokemon from the specified region (passed as a string: johto, kanto, hoenn, sinnoh). Added a wrapper in the main.py file, so a call such as 'pokemon random-johto' can be made to pick a random Pokemon from the Johto region. 2017-06-07 10:03:52 +01:00
LazoCoder
0e540e387c Changed reference to python interpreter 2017-06-06 13:13:26 -04:00
LazoCoder
3a41115f92 Fixed typo 2017-05-09 09:33:24 -04:00
LazoCoder
abd639c8b9 Fixed typo 2017-05-09 09:13:35 -04:00
LazoCoder
160fddc46c Removed usage of non existent method 2017-04-29 13:30:35 -04:00
LazoCoder
3551155b3c Changed usage to take up a bit less room.. some other small changes too 2017-04-29 13:29:15 -04:00
LazoCoder
54543b61c7 Fixed bug where inputs with escape code counted the escape code as a letter
If you type ‘_cha’, this should count as 3 letters, not 4. This matters
because typing ‘_ch’ should give suggestions and not change the
wallpaper. Only inputs with 3 characters or above should change the
wallpaper or terminal.
2017-04-29 02:20:17 -04:00
LazoCoder
db2d3fa515 Fixed bug where changing the wallpaper also changed the terminal sometimes 2017-04-29 02:08:46 -04:00
LazoCoder
90b2dbd04f Refactored & added link to main.py 2017-04-29 01:57:47 -04:00
LazoCoder
18f5b8f08d Added ability to check what the current pokemon is in the terminal or wallpaper 2017-04-28 19:17:44 -04:00
LazoCoder
7faf120282 Changing wallpaper support 2017-04-28 18:26:00 -04:00
LazoCoder
9838c3eb15 Refactored database, added different ways of retrieving pokemon & made unit test class 2017-04-28 15:51:42 -04:00
LazoCoder
9dc09c1d79 Fixed Pokemon class where __str__ method wasn't working for null values 2017-04-28 04:02:50 -04:00
LazoCoder
87f8cec207 Added random selection and fixed typo in johto getter 2017-04-28 03:55:40 -04:00
LazoCoder
a863512084 Added script creator and a bunch of print methods 2017-04-28 03:46:39 -04:00
LazoCoder
3eda8c3549 starting from scratch 2017-04-27 23:23:09 -04:00
LazoCoder
842506dc3f Renamed images in 'Extra' and added support for Extra/Custom images 2017-04-27 18:20:52 -04:00
LazoCoder
ad7cf2dce9 Added region specific slideshow 2017-04-25 11:32:44 -04:00
LazoCoder
d4161f77d2 Refactored comments
Followed best practices by putting comments beneath the method
declaration and not above.
2017-04-25 11:20:15 -04:00
LazoCoder
13063b112b Added method to check what the current pokemon is
Useful if someone uses random, then wants to know what it was changed
to.
2017-04-25 11:10:37 -04:00
LazoCoder
1d579bae01 Updated usage menu and added ability to choose a random pokemon 2017-04-24 04:49:04 -04:00
LazoCoder
759d59a1c3 Updated some comments and added global execution support 2017-04-24 04:18:08 -04:00
LazoCoder
0dedb0eaeb Fixed bug where background is changed even when user input is incorrect & added keyboard interrupt exception 2017-04-21 17:32:59 -04:00
LazoCoder
eba5afdfbb Added suggestions
If user types in “pika” it makes the background Pikachu. If the user
types “dra” then it suggest all the Pokemon who’s names start with
“drag”.
2017-04-21 02:23:49 -04:00
LazoCoder
94fea57850 Fixed formatting issues where columns were not aligned
When printing Pokemon from a region or letter the columns would be off
sometimes because the numbers of the Pokemon have a different quantity
of digits. Example: “2 Ivysaur” should be printed as “002 Ivysaur”.
2017-04-21 00:27:01 -04:00
LazoCoder
199de34fc8 Added ability to print all Pokemon with particular letter & help menu 2017-04-21 00:04:47 -04:00
LazoCoder
32a990e369 Refactored into multiple modules
Code was getting lengthy so I split it up.
2017-04-20 23:24:04 -04:00