Interface changes

This commit is contained in:
luxick
2016-01-21 16:58:38 +01:00
parent ce318aebb0
commit 3c25b147d2
2 changed files with 9 additions and 9 deletions

14
cli.py
View File

@@ -47,12 +47,12 @@ class cursesUI:
if self.kingdomview: if self.kingdomview:
self.win.addstr(1, 0, '-----------------------------------') self.win.addstr(1, 0, '-----------------------------------')
self.win.addstr(2, 0, '[q]Exit [p]Pause [v]Village View') self.win.addstr(2, 0, '[q]uit [p]ause [s]witch view')
self.win.addstr(3, 0, '-----------------------------------') self.win.addstr(3, 0, '-----------------------------------')
self.win.addstr(5, 0, king.show_kingdom()) self.win.addstr(5, 0, king.show_kingdom())
else: else:
self.win.addstr(1, 0, '------------------------------------------------------------------') self.win.addstr(1, 0, '------------------------------------------------------------------')
self.win.addstr(2, 0, '[q]Exit [p]Pause [v]Kingdom View [n/m]Previous/Next [s]Percentage') self.win.addstr(2, 0, '[q]uit [p]ause [s]witch view [b]ack [n]ext [a]bsolute numbers')
self.win.addstr(3, 0, '------------------------------------------------------------------') self.win.addstr(3, 0, '------------------------------------------------------------------')
self.win.addstr(5, 0, king.myvillages[self.villagenr].give_status(self.percentage)) self.win.addstr(5, 0, king.myvillages[self.villagenr].give_status(self.percentage))
@@ -65,17 +65,17 @@ class cursesUI:
self.running = False self.running = False
elif key == ord('p'): elif key == ord('p'):
self.paused = not self.paused self.paused = not self.paused
elif key == ord('v'): elif key == ord('s'):
self.win.move(0, 0) self.win.move(0, 0)
self.win.clrtobot() self.win.clrtobot()
self.kingdomview = not self.kingdomview self.kingdomview = not self.kingdomview
elif key == ord('n'): elif key == ord('n'):
if not self.kingdomview:
self.villagenr -= 1
elif key == ord('m'):
if not self.kingdomview: if not self.kingdomview:
self.villagenr += 1 self.villagenr += 1
elif key == ord('s'): elif key == ord('b'):
if not self.kingdomview:
self.villagenr -= 1
elif key == ord('a'):
if not self.kingdomview: if not self.kingdomview:
self.percentage = not self.percentage self.percentage = not self.percentage
elif key < 0: elif key < 0:

View File

@@ -16,10 +16,10 @@ class Util:
sleep = random.randrange(statrange[0],statrange[1],1) sleep = random.randrange(statrange[0],statrange[1],1)
decayspeed = random.randrange(decay[0],decay[1],1) decayspeed = random.randrange(decay[0],decay[1],1)
potential = random.randrange(workpower[0], workpower[1],1) potential = random.randrange(workpower[0], workpower[1],1)
recovery = random.randrange(recovery[0], recovery[1], 1) recoveryspeed = random.randrange(recovery[0], recovery[1], 1)
lifetime = random.randrange(life[0], life[1], 1) lifetime = random.randrange(life[0], life[1], 1)
return Tamagotchi(name,hunger,happiness,hygiene,sleep,decayspeed,potential,recovery,lifetime) return Tamagotchi(name,hunger,happiness,hygiene,sleep,decayspeed,potential,recoveryspeed,lifetime)
def make_list_of_Tamagotchis(self, number): def make_list_of_Tamagotchis(self, number):
tmp = [] tmp = []