From 59dada94b6bcabe97901c5d98eabfa5d1ac642da Mon Sep 17 00:00:00 2001 From: Jake Funke Date: Wed, 22 Mar 2017 00:42:39 +0000 Subject: [PATCH] Update ASCII art to stage 2, new flavor text --- README.md | 4 ++-- art/agave2.txt | 10 ++++++++++ art/aloe2.txt | 10 ++++++++++ art/baobab2.txt | 10 ++++++++++ art/brugmansia1.txt | 6 +++--- art/brugmansia2.txt | 10 ++++++++++ art/cactus2.txt | 10 ++++++++++ art/columbine2.txt | 10 ++++++++++ art/daffodil1.txt | 6 +++--- art/daffodil2.txt | 10 ++++++++++ art/fern2.txt | 10 ++++++++++ art/ficus2.txt | 6 +++--- art/flytrap2.txt | 10 ++++++++++ art/hemp2.txt | 10 ++++++++++ art/iris2.txt | 10 ++++++++++ art/jadeplant2.txt | 10 ++++++++++ art/lithops2.txt | 10 ++++++++++ art/palm2.txt | 10 ++++++++++ art/pansy2.txt | 10 ++++++++++ art/poppy2.txt | 10 ++++++++++ art/sage2.txt | 10 ++++++++++ art/snapdragon2.txt | 10 ++++++++++ art/sun.txt | 7 +++++++ art/sunflower2.txt | 10 ++++++++++ menu_screen.py | 47 ++++++++++++++++++++++++++++----------------- 25 files changed, 237 insertions(+), 29 deletions(-) create mode 100644 art/agave2.txt create mode 100644 art/aloe2.txt create mode 100644 art/baobab2.txt create mode 100644 art/brugmansia2.txt create mode 100644 art/cactus2.txt create mode 100644 art/columbine2.txt create mode 100644 art/daffodil2.txt create mode 100644 art/fern2.txt create mode 100644 art/flytrap2.txt create mode 100644 art/hemp2.txt create mode 100644 art/iris2.txt create mode 100644 art/jadeplant2.txt create mode 100644 art/lithops2.txt create mode 100644 art/palm2.txt create mode 100644 art/pansy2.txt create mode 100644 art/poppy2.txt create mode 100644 art/sage2.txt create mode 100644 art/snapdragon2.txt create mode 100644 art/sun.txt create mode 100644 art/sunflower2.txt diff --git a/README.md b/README.md index 43161b8..24b8e5f 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ If your plant goes 5 days without water, it will die! * Curses-based menu system, optimized for 80x24 terminal * ASCII art display of plant * Persistent aging system that allows your plant to grow even when app is closed -* Community leaderboard (for shared unix servers) created in program directory `garden_file.json` +* Community garden of other users' plants (for shared unix servers) * Data file is created in the user's home (~) directory, along with a JSON file that can be used in other apps. ``` @@ -45,7 +45,7 @@ If your plant goes 5 days without water, it will die! ``` ### testing features -* ASCII art only shows first stage of growth - more coming soon! +* ASCII art only shows first few stages of growth - more coming soon! ### to-dos * Finish garden feature diff --git a/art/agave2.txt b/art/agave2.txt new file mode 100644 index 0000000..d4b3752 --- /dev/null +++ b/art/agave2.txt @@ -0,0 +1,10 @@ + + + , , . + . |`. |\ /| ., + . |\ | | /||^| | /| + \ \v| \v /|v/| |/ | + \ |\ |/ /| / V / + \^\ \ \ \ / / ,| / +. , \ \\ \ |,/_/./ / . + ^ ' ` ' diff --git a/art/aloe2.txt b/art/aloe2.txt new file mode 100644 index 0000000..bb9875c --- /dev/null +++ b/art/aloe2.txt @@ -0,0 +1,10 @@ + + + .\ .| + \\ || ._ + ..\ \\. //. // + \ \.\|v ||// + \\\ || // + '| \ / / +. , _ . .\ |,/_ ., _ . + ^ ' ` ' diff --git a/art/baobab2.txt b/art/baobab2.txt new file mode 100644 index 0000000..1058af4 --- /dev/null +++ b/art/baobab2.txt @@ -0,0 +1,10 @@ + + &&& && && &&& + &&&&\& & v & /& && + && \ | \^ , &/^/& + | |^ + | , | + |. ; | + / . \ +. , _ ( . )_ . + ^ ' ` ' diff --git a/art/brugmansia1.txt b/art/brugmansia1.txt index 4d838c4..21388ae 100644 --- a/art/brugmansia1.txt +++ b/art/brugmansia1.txt @@ -2,9 +2,9 @@ _. //\\ //\ - } }\\ // \\ - \V/{ + | |\\ // \\ + \V//| | || - ||{ + ||/ . , _ . ., || _ ., _ . ^ ' ` ' diff --git a/art/brugmansia2.txt b/art/brugmansia2.txt new file mode 100644 index 0000000..46e2fa4 --- /dev/null +++ b/art/brugmansia2.txt @@ -0,0 +1,10 @@ + + _ /n\ + //.\ || \| + // \\|`//\ + | ||\|// \ + /\V/| | + | || + ||/\ +. , _ . ., || _ ., _ . + ^ ' ` ' diff --git a/art/cactus2.txt b/art/cactus2.txt new file mode 100644 index 0000000..ac3a66c --- /dev/null +++ b/art/cactus2.txt @@ -0,0 +1,10 @@ + + + +-+, + ,+\/|`| \ + \' | |'| ., + \ `| | |/ ) + | |'| , / + |'| |, / +. , _ . |_|_| | ., _ . + ^ ' ` ' diff --git a/art/columbine2.txt b/art/columbine2.txt new file mode 100644 index 0000000..a163030 --- /dev/null +++ b/art/columbine2.txt @@ -0,0 +1,10 @@ + + + + \ | / + | &|/ |& / + &\ | / / + \| \|&| + &\/&/ +. , _ . ., &/ _ ., _ . + ^ ' ` ' diff --git a/art/daffodil1.txt b/art/daffodil1.txt index ee6f177..93c4a83 100644 --- a/art/daffodil1.txt +++ b/art/daffodil1.txt @@ -2,9 +2,9 @@ - \ - |/> - < | + -\ + |/- + - | \| . , _ . ., l, _ ., _ . ^ ' ` ' diff --git a/art/daffodil2.txt b/art/daffodil2.txt new file mode 100644 index 0000000..20b1d12 --- /dev/null +++ b/art/daffodil2.txt @@ -0,0 +1,10 @@ + + + -\, + |/- + \| + -| |/- + \ | | /- + \|/.| +. , _ . ., l,/_ ., _ . + ^ ' ` ' diff --git a/art/fern2.txt b/art/fern2.txt new file mode 100644 index 0000000..8184eec --- /dev/null +++ b/art/fern2.txt @@ -0,0 +1,10 @@ + + + | + \|/ | + \|/, \|/ + .| \|/,\// . + \|/ \|/ |/ |/` + \\/,\|/|l///, +. , _ .`\,\lv/_// _ . + ^ ' ` ' diff --git a/art/ficus2.txt b/art/ficus2.txt index 01035d0..e502899 100644 --- a/art/ficus2.txt +++ b/art/ficus2.txt @@ -1,10 +1,10 @@ &&&\/& &&& &\|,/ |/& && - &&/ / /_& && + &&/ / /_&& && \ { |_____/_& - { / / &&& + { / / & & &&& `, \{___________/_&& - } }{ \____& + } }{ &\____& }{{ `&\&& {}{ && . , , -=-~{ .-^- _ _ . diff --git a/art/flytrap2.txt b/art/flytrap2.txt new file mode 100644 index 0000000..6c3a7b4 --- /dev/null +++ b/art/flytrap2.txt @@ -0,0 +1,10 @@ + + ._, + .__, ,/ | _,_,, + ._\ \, |--/ /\ \ \< + '\ \ | \/ ||\ \,|< + '\_+/, || // \_/` + ' \\ ||// , + \\\|/ / +. , _ . .\ l,/_ ., _ . + ^ ' ` ' diff --git a/art/hemp2.txt b/art/hemp2.txt new file mode 100644 index 0000000..4bea70e --- /dev/null +++ b/art/hemp2.txt @@ -0,0 +1,10 @@ + + ^ + ^+^ + + ^+^+ + \+^+^/ + ^+\|^/^/ + \+^\|/ ^ + ^+\|+/+/ +. , _ . ., l/ _ ., _ . + ^ ' ` ' diff --git a/art/iris2.txt b/art/iris2.txt new file mode 100644 index 0000000..9e0b031 --- /dev/null +++ b/art/iris2.txt @@ -0,0 +1,10 @@ + + /\ + /\ | /\ + _ | || / + / \ \||/ /\ + |\ \\v/ ` + /\ v ||/\ + \\v// +. , _ . .,\V/ _ ., _ . + ^ ' ` ' diff --git a/art/jadeplant2.txt b/art/jadeplant2.txt new file mode 100644 index 0000000..a2821c7 --- /dev/null +++ b/art/jadeplant2.txt @@ -0,0 +1,10 @@ + + % % %% + %% |O%o| %o % + &&O%\o|%|/% /& + & &\o%O %,o& + O &\%o& + ||.|/ + \\ | +. , _ . .|,l, _ ., _ . + ^ ' ` ' diff --git a/art/lithops2.txt b/art/lithops2.txt new file mode 100644 index 0000000..08c9678 --- /dev/null +++ b/art/lithops2.txt @@ -0,0 +1,10 @@ + + + + + + + + .__v___ +. , _ .( | )., _ . + ^ ' ` ' diff --git a/art/palm2.txt b/art/palm2.txt new file mode 100644 index 0000000..df84c5c --- /dev/null +++ b/art/palm2.txt @@ -0,0 +1,10 @@ + _ _ + ',\ / / '-. + /--\ \ / /^\ + |/ /\ ||/ \,| + ` | /\=|\,| ` + ` |_| ` + |_| + |_|. +. , _ . .|__| _ ., _ . + ^ ' ` ' diff --git a/art/pansy2.txt b/art/pansy2.txt new file mode 100644 index 0000000..4e9acff --- /dev/null +++ b/art/pansy2.txt @@ -0,0 +1,10 @@ + + + + o o + \o /_o o + o\| / /__o + | |o /o + \/ /o +. , _ . ., l/ _ ., _ . + ^ ' ` ' diff --git a/art/poppy2.txt b/art/poppy2.txt new file mode 100644 index 0000000..afb99fe --- /dev/null +++ b/art/poppy2.txt @@ -0,0 +1,10 @@ + + O + o | + | | o + o| |&| + &\\o/ + ||o + &\/ +. , _ . ., l, _ ., _ . + ^ ' ` ' diff --git a/art/sage2.txt b/art/sage2.txt new file mode 100644 index 0000000..5764d1c --- /dev/null +++ b/art/sage2.txt @@ -0,0 +1,10 @@ + + + + `\' + `\' /` + `| '\|/` /` + `\|'\|/`|/` + ,'\ \|/ |/` +. , _ .\|/,l-/`,., _ . + ^ ' ` ' diff --git a/art/snapdragon2.txt b/art/snapdragon2.txt new file mode 100644 index 0000000..5295c70 --- /dev/null +++ b/art/snapdragon2.txt @@ -0,0 +1,10 @@ + + + + + | , + + , |/ + '\ \| , + \| ,|/ + , + \|/ \| |/ +. , _ . \, l,/_ ., _ . + ^ ' ` ' diff --git a/art/sun.txt b/art/sun.txt new file mode 100644 index 0000000..b408b43 --- /dev/null +++ b/art/sun.txt @@ -0,0 +1,7 @@ + . + \ | / + '-.;;;;;.-' +-==;;;;;;;==- + .-';;;;;'-. + / | \ + ' diff --git a/art/sunflower2.txt b/art/sunflower2.txt new file mode 100644 index 0000000..18233a5 --- /dev/null +++ b/art/sunflower2.txt @@ -0,0 +1,10 @@ + + __ + (##) + & || + \//& + || + ||/& + &\|| +. , _ . ., || _ ., _ . + ^ ' ` ' diff --git a/menu_screen.py b/menu_screen.py index e419370..2c3fe4f 100644 --- a/menu_screen.py +++ b/menu_screen.py @@ -43,6 +43,8 @@ class CursedMenu(object): self.draw_menu() def update_options(self): + # TODO: should this have separate options if plant dies vs plant is + # last stage? # Makes sure you can get a new plant if it dies if self.plant.dead: if "harvest" not in self.options: @@ -136,10 +138,12 @@ class CursedMenu(object): self.ascii_render('seed.txt', ypos, xpos) elif this_plant.stage == 1: self.ascii_render('seedling.txt', ypos, xpos) - elif this_plant.stage >= 2: - # this_filename = plant_art_dict[this_plant.species]+str(this_plant.stage)+'.txt' + elif this_plant.stage == 2: this_filename = plant_art_dict[this_plant.species]+'1.txt' self.ascii_render(this_filename, ypos, xpos) + elif this_plant.stage >= 3: + this_filename = plant_art_dict[this_plant.species]+'2.txt' + self.ascii_render(this_filename, ypos, xpos) def draw_default(self): # draws default menu @@ -276,7 +280,7 @@ class CursedMenu(object): self.screen.addstr(y+12, 2, line) if len(plant_table_pages) > 1: # Multiple pages, paginate and require keypress - page_text = " --- press any key --- (%d/%d)" % (page_num, len(plant_table_pages)) + page_text = "(%d/%d) --- press any key ---" % (page_num, len(plant_table_pages)) self.screen.addstr(self.maxy-2, 2, page_text) self.screen.getch() self.screen.refresh() @@ -287,12 +291,6 @@ class CursedMenu(object): self.screen.refresh() else: self.screen.refresh() - # self.screen.getch() - # for y, line in enumerate(range(self.maxy-16), 2): - # self.screen.addstr(y+12, 2, clear_bar) - # self.screen.refresh() - - def get_plant_description(self, this_plant): output_text = "" @@ -332,31 +330,44 @@ class CursedMenu(object): "You play piano to your " + this_species + ".", "You play rap music to your " + this_species + ".", "You whistle a tune to your " + this_species + ".", + "You read a poem to your " + this_species + ".", + "You tell a secret to your " + this_species + ".", + "You play your favorite record for your " + this_species + ".", ], 3:[ "Your " + this_species + " is growing nicely!", "You're proud of the dedication it took to grow your " + this_species + ".", - "The " + this_species + " looks good.", - "You think about how good this " + this_species + " will look.", + "You take a deep breath with your " + this_species + ".", + "You think of all the words that rhyme with " + this_species + ".", + "The " + this_species + " looks full of life.", + "The " + this_species + " inspires you.", + "Your " + this_species + " makes you forget about your problems.", + "Your " + this_species + " gives you a reason to keep going.", + "Looking at your " + this_species + " helps you focus on what matters.", + "You think about how nice this " + this_species + " looks here.", "The buds of your " + this_species + " might bloom soon.", - "You play your favorite song for your " + this_species + ".", ], 4:[ "The " + this_color + " flowers look nice on your " + this_species +"!", "The " + this_color + " flowers have bloomed and fill you with positivity.", - "The " + this_color + " flowers of your " + this_species + " remind you of your childhood.", - "The " + this_color + " flowers of your " + this_species + " smell amazing.", + "The " + this_color + " flowers remind you of your childhood.", + "The " + this_color + " flowers remind you of spring mornings.", + "The " + this_color + " flowers remind you of a forgotten memory.", + "The " + this_color + " flowers remind you of your happy place.", + "The aroma of the " + this_color + " flowers energize you.", "The " + this_species + " has grown beautiful " + this_color + " flowers.", "The " + this_color + " petals remind you of that favorite shirt you lost.", "The " + this_color + " flowers remind you of your crush.", + "You smell the " + this_color + " flowers and are filled with peace.", ], 5:[ - "You fondly remember all of the time you spent caring for your " + this_species + ".", + "You fondly remember the time you spent caring for your " + this_species + ".", "Seed pods have grown on your " + this_species + ".", + "You feel like your " + this_species + " appreciates your care.", "The " + this_species + " fills you with love.", - "Your " + this_species + " reminds you of your childhood backyard.", - "The " + this_species + " reminds you of your family.", - "The " + this_species + " reminds you of a forgotten memory.", + "You're ready for whatever comes after your " + this_species + ".", + "You're excited to start growing your next plant.", + "You reflect on when your " + this_species + " was just a seedling.", "You grow nostalgic about the early days with your " + this_species + ".", ], 99:[