Mirrors/Pokemon-Terminal
2
0
Fork 0
mirror of https://github.com/LazoCoder/Pokemon-Terminal synced 2024-11-24 04:43:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #57 from dosman711/add-random-shuffle

Browse source 
Add random shuffle option to slideshow
This commit is contained in:
Lazo 2017-06-25 13:10:05 -04:00 committed by GitHub
commit e72de8c93b
2 changed files with 57 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
README.md
View file

@ -82,15 +82,17 @@ Parameters:
[two letters] - List all Pokemon who's names begin with those two letters. [two letters] - List all Pokemon who's names begin with those two letters.
Other Parameters: Other Parameters:
pokemon all - List all the Pokemon supported. all - List all the Pokemon supported.
pokemon regions - List all the available regions. regions - List all the available regions.
pokemon extra - List all the Pokemon from the 'Extra' folder. extra - List all the Pokemon from the 'Extra' folder.
pokemon random - Change the terminal background to a random Pokemon. random - Change the terminal background to a random Pokemon.
pokemon random-kanto - Change the terminal background to a random Pokemon from the specified region. random-<region> - Change the terminal background to a random Pokemon from the specified region.
pokemon slideshow [time] - Iterate through each Pokemon. Optional time (in seconds) between Pokemon. slideshow [time] - Iterate through each Pokemon. Optional time (in seconds) between Pokemon.
pokemon slideshow-kanto [time] - Iterate through each Pokemon in the specified region. Optional time (in seconds) between Pokemon. slideshow-<region> [time] - Iterate through each Pokemon in the specified region. Optional time (in seconds) between Pokemon.
pokemon clear | disable | off - Clear the Pokemon in the terminal. rnd-slideshow [time] - Iterate through each Pokemon in a random order. Optional time (in seconds) between Pokemon.
pokemon help - Display this menu. rnd-slideshow-<region> [time] - Iterate through each Pokemon in the specified region in a random order. Optional time (in seconds) between Pokemon.
clear | disable | off - Clear the Pokemon in the terminal.
help - Display this menu.
Wallpaper Parameters: Wallpaper Parameters:
pokemon _pikachu - Change the wallpaper to the specified Pokemon. pokemon _pikachu - Change the wallpaper to the specified Pokemon.

83
main.py
View file

@ -4,6 +4,7 @@
from sys import argv from sys import argv
from database import Database from database import Database
import random
import scripter import scripter
import sys import sys
import time import time
@ -65,15 +66,17 @@ Parameters:
[two letters] - List all Pokemon who's names begin with those two letters. [two letters] - List all Pokemon who's names begin with those two letters.
Other Parameters: Other Parameters:
pokemon all - List all the Pokemon supported. all - List all the Pokemon supported.
pokemon regions - List all the available regions. regions - List all the available regions.
pokemon extra - List all the Pokemon from the 'Extra' folder. extra - List all the Pokemon from the 'Extra' folder.
pokemon random - Change the terminal background to a random Pokemon. random - Change the terminal background to a random Pokemon.
pokemon random-kanto - Change the terminal background to a random Pokemon from the specified region. random-<region> - Change the terminal background to a random Pokemon from the specified region.
pokemon slideshow [time] - Iterate through each Pokemon. Optional time (in seconds) between Pokemon. slideshow [time] - Iterate through each Pokemon. Optional time (in seconds) between Pokemon.
pokemon slideshow-kanto [time] - Iterate through each Pokemon in the specified region. Optional time (in seconds) between Pokemon. slideshow-<region> [time] - Iterate through each Pokemon in the specified region. Optional time (in seconds) between Pokemon.
pokemon clear | disable | off - Clear the Pokemon in the terminal. rnd-slideshow [time] - Iterate through each Pokemon in a random order. Optional time (in seconds) between Pokemon.
pokemon help - Display this menu. rnd-slideshow-<region> [time] - Iterate through each Pokemon in the specified region in a random order. Optional time (in seconds) between Pokemon.
clear | disable | off - Clear the Pokemon in the terminal.
help - Display this menu.
Wallpaper Parameters: Wallpaper Parameters:
pokemon _pikachu - Change the wallpaper to the specified Pokemon. pokemon _pikachu - Change the wallpaper to the specified Pokemon.
@ -87,13 +90,20 @@ Search System Information:
''') ''')
def slideshow(db, start, end, seconds="0.25"): def slideshow(db, start, end, seconds="0.25", rand=False):
# Show each Pokemon in order, one by one. delay = 0.25
if seconds is not None:
delay = float(seconds)
# Show each Pokemon, one by one.
r = list(range(start, end))
if rand:
random.shuffle(r)
try: try:
for x in range(start, end): for x in r:
pokemon = db.get_pokemon(x) pokemon = db.get_pokemon(x)
scripter.change_terminal(pokemon) scripter.change_terminal(pokemon)
time.sleep(float(seconds)) time.sleep(delay)
except KeyboardInterrupt: except KeyboardInterrupt:
print("Program was terminated.") print("Program was terminated.")
sys.exit() sys.exit()
@ -140,22 +150,21 @@ def change_wallpaper(db, arg):
scripter.change_wallpaper(suggestions[0]) scripter.change_wallpaper(suggestions[0])
def multiple_argument_handler(arg, time): def multiple_argument_handler(arg, arg2):
db = Database() db = Database()
rand = arg.startswith("rnd")
if arg.startswith("slideshow"): if "slideshow" in arg:
try: try:
float(time) if arg.endswith("slideshow"):
if arg == "slideshow": slideshow(db, 1, 494, arg2, rand)
slideshow(db, 1, 494, time) elif arg.endswith("slideshow-kanto"):
elif arg == "slideshow-kanto": slideshow(db, 1, 152, arg2, rand)
slideshow(db, 1, 152, time) elif arg.endswith("slideshow-johto"):
elif arg == "slideshow-johto": slideshow(db, 152, 252, arg2, rand)
slideshow(db, 152, 252, time) elif arg.endswith("slideshow-hoenn"):
elif arg == "slideshow-hoenn": slideshow(db, 252, 387, arg2, rand)
slideshow(db, 252, 387, time) elif arg.endswith("slideshow-sinnoh"):
elif arg == "slideshow-sinnoh": slideshow(db, 387, 494, arg2, rand)
slideshow(db, 387, 494, time)
else: else:
print('Invalid slideshow command specified.' print('Invalid slideshow command specified.'
'\nType "help" to see all the commands.') '\nType "help" to see all the commands.')
@ -218,16 +227,16 @@ def single_argument_handler(arg):
change_terminal_background(db, db.get_random_from_region("hoenn").get_name()) change_terminal_background(db, db.get_random_from_region("hoenn").get_name())
elif arg == "random-sinnoh": elif arg == "random-sinnoh":
change_terminal_background(db, db.get_random_from_region("sinnoh").get_name()) change_terminal_background(db, db.get_random_from_region("sinnoh").get_name())
elif arg == "slideshow": elif arg.endswith("slideshow"):
slideshow(db, 1, 494) slideshow(db, 1, 494, rand=arg.startswith("rnd"))
elif arg == "slideshow-kanto": elif arg.endswith("slideshow-kanto"):
slideshow(db, 1, 152) slideshow(db, 1, 152, rand=arg.startswith("rnd"))
elif arg == "slideshow-johto": elif arg.endswith("slideshow-johto"):
slideshow(db, 152, 252) slideshow(db, 152, 252, rand=arg.startswith("rnd"))
elif arg == "slideshow-hoenn": elif arg.endswith("slideshow-hoenn"):
slideshow(db, 252, 387) slideshow(db, 252, 387, rand=arg.startswith("rnd"))
elif arg == "slideshow-sinnoh": elif arg.endswith("slideshow-sinnoh"):
slideshow(db, 387, 494) slideshow(db, 387, 494, rand=arg.startswith("rnd"))
elif arg == "?": elif arg == "?":
print("This function is deprecated.") print("This function is deprecated.")
elif escape_code: elif escape_code: