Update final stage art

pull/5/head
Jake Funke 2017-04-26 21:46:42 +00:00
parent 00fe6c2175
commit 2786a46397
1 changed files with 5 additions and 11 deletions

View File

@ -47,8 +47,6 @@ class CursedMenu(object):
self.draw_menu() self.draw_menu()
def update_options(self): 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 # Makes sure you can get a new plant if it dies
if self.plant.dead: if self.plant.dead:
if "harvest" not in self.options: if "harvest" not in self.options:
@ -69,7 +67,6 @@ class CursedMenu(object):
def draw(self): def draw(self):
# Draw the menu and lines # Draw the menu and lines
# TODO: display refresh is hacky. Could be more precise
self.screen.refresh() self.screen.refresh()
try: try:
self.draw_default() self.draw_default()
@ -145,10 +142,10 @@ class CursedMenu(object):
elif this_plant.stage == 2: elif this_plant.stage == 2:
this_filename = plant_art_dict[this_plant.species]+'1.txt' this_filename = plant_art_dict[this_plant.species]+'1.txt'
self.ascii_render(this_filename, ypos, xpos) self.ascii_render(this_filename, ypos, xpos)
elif this_plant.stage == 3: elif this_plant.stage == 3 or this_plant.stage == 5:
this_filename = plant_art_dict[this_plant.species]+'2.txt' this_filename = plant_art_dict[this_plant.species]+'2.txt'
self.ascii_render(this_filename, ypos, xpos) self.ascii_render(this_filename, ypos, xpos)
elif this_plant.stage >= 4: elif this_plant.stage == 4:
this_filename = plant_art_dict[this_plant.species]+'3.txt' this_filename = plant_art_dict[this_plant.species]+'3.txt'
self.ascii_render(this_filename, ypos, xpos) self.ascii_render(this_filename, ypos, xpos)
@ -175,6 +172,7 @@ class CursedMenu(object):
self.screen.addstr(12, 2, "score: ", curses.A_DIM) self.screen.addstr(12, 2, "score: ", curses.A_DIM)
self.screen.addstr(12, 9, self.plant_ticks, curses.A_NORMAL) self.screen.addstr(12, 9, self.plant_ticks, curses.A_NORMAL)
# display fancy water gauge
if not self.plant.dead: if not self.plant.dead:
water_gauge_str = self.water_gauge() water_gauge_str = self.water_gauge()
self.screen.addstr(5,14, water_gauge_str, curses.A_NORMAL) self.screen.addstr(5,14, water_gauge_str, curses.A_NORMAL)
@ -184,7 +182,6 @@ class CursedMenu(object):
# draw cute ascii from files # draw cute ascii from files
self.draw_plant_ascii(self.plant) self.draw_plant_ascii(self.plant)
# self.ascii_render("sun.txt",-2,self.maxx-14)
def water_gauge(self): def water_gauge(self):
# build nice looking water gauge # build nice looking water gauge
@ -212,7 +209,7 @@ class CursedMenu(object):
user_in = self.screen.getch() # Gets user input user_in = self.screen.getch() # Gets user input
except Exception as e: except Exception as e:
self.__exit__() self.__exit__()
## DEBUG KEYS - enable to see curses key codes ## DEBUG KEYS - enable these lines to see curses key codes
# self.screen.addstr(1, 1, str(user_in), curses.A_NORMAL) # self.screen.addstr(1, 1, str(user_in), curses.A_NORMAL)
# self.screen.refresh() # self.screen.refresh()
@ -414,7 +411,6 @@ class CursedMenu(object):
# if young plant # if young plant
if this_stage == 2: if this_stage == 2:
# TODO: more descriptive rarity
if this_plant.rarity >= 2: if this_plant.rarity >= 2:
rarity_hint = "You feel like your plant is special." rarity_hint = "You feel like your plant is special."
output_text += rarity_hint + ".\n" output_text += rarity_hint + ".\n"
@ -442,7 +438,6 @@ class CursedMenu(object):
# otherwise just set toggle # otherwise just set toggle
self.infotoggle = 0 self.infotoggle = 0
def draw_instructions(self): def draw_instructions(self):
# Draw instructions on screen # Draw instructions on screen
self.clear_info_pane() self.clear_info_pane()
@ -497,7 +492,6 @@ class CursedMenu(object):
# Menu options call functions here # Menu options call functions here
if request == None: return if request == None: return
if request == "harvest": if request == "harvest":
#TODO: should harvest be separate from dead plant start over?
self.harvest_confirmation() self.harvest_confirmation()
if request == "water": if request == "water":
self.plant.water() self.plant.water()