From e0e1db1b98571c1f0d78588c633a803c076312d8 Mon Sep 17 00:00:00 2001 From: luxick Date: Thu, 21 Jan 2016 15:48:53 +0100 Subject: [PATCH] Code formatting --- cli.py | 11 ++++++++--- config.py | 3 +++ kinggotchi.py | 1 + syllables.txt | 23 +++++++++++++++++++++++ tamagotchi.py | 26 +++++++++++++++++++++++--- util.py | 3 ++- 6 files changed, 60 insertions(+), 7 deletions(-) create mode 100644 syllables.txt diff --git a/cli.py b/cli.py index 8d48e4e..790f3a7 100644 --- a/cli.py +++ b/cli.py @@ -66,13 +66,18 @@ class cursesUI: elif key == ord('p'): self.paused = not self.paused elif key == ord('v'): + self.win.move(0, 0) + self.win.clrtobot() self.kingdomview = not self.kingdomview elif key == ord('n'): - self.villagenr -= 1 + if not self.kingdomview: + self.villagenr -= 1 elif key == ord('m'): - self.villagenr += 1 + if not self.kingdomview: + self.villagenr += 1 elif key == ord('s'): - self.percentage = not self.percentage + if not self.kingdomview: + self.percentage = not self.percentage elif key < 0: time.sleep(ticklenght) if not self.running: diff --git a/config.py b/config.py index 43a5746..a98491f 100644 --- a/config.py +++ b/config.py @@ -26,6 +26,9 @@ max_workpower = 6 # This defines the bounds of how much a Tamagotchi can recover when eating/sleeping/playing etc. min_recovery = 10 max_recovery = 20 +# Defines the range in witch the lifetime of Tamagotichs will be created in ticks +min_life = 2000 +max_life = 3000 # Define if simulation should be started paused or running start_paused = True diff --git a/kinggotchi.py b/kinggotchi.py index 14c3280..e14cad6 100644 --- a/kinggotchi.py +++ b/kinggotchi.py @@ -44,3 +44,4 @@ class Kinggotchi: def createKingdom(self, startvillages): for _ in itertools.repeat(None, startvillages): self.add_village(Mayorgotchi(Util().make_list_of_Tamagotchis(startnr))) + diff --git a/syllables.txt b/syllables.txt new file mode 100644 index 0000000..b5b613e --- /dev/null +++ b/syllables.txt @@ -0,0 +1,23 @@ +# Blank lines and lines starting with # are ignored +da +ka +ta +ra +cus +iss +aba +ton +ar +at +cu +da +ta +ab +ba +meno +tor +wir +wen +ein +dev +ken \ No newline at end of file diff --git a/tamagotchi.py b/tamagotchi.py index 0799611..127ee2b 100644 --- a/tamagotchi.py +++ b/tamagotchi.py @@ -13,8 +13,9 @@ class Tamagotchi: potential = 0 power = 0 recovery = 0 + lifetime = 0 - def __init__(self, name, hunger, happiness, hygiene, sleep, decayspeed, potential,recovery): + def __init__(self, name, hunger, happiness, hygiene, sleep, decayspeed, potential, recovery, lifetime): self.name = name self.hunger = [hunger, hunger] self.happiness = [happiness, happiness] @@ -26,6 +27,7 @@ class Tamagotchi: self.potential = potential self.power = potential self.recovery = recovery + self.lifetime = lifetime def feed_other(self, tamagotchi): self.status = 'Working' @@ -59,6 +61,9 @@ class Tamagotchi: if self.hunger[0] <= 0: self.status = 'Dead' self.dead = True + if self.lifetime <= 0: + self.status = 'Dead' + self.dead = True if self.sleep[0] <= 0: self.status = 'Sleeping' if self.status is 'Working': @@ -70,6 +75,7 @@ class Tamagotchi: def step(self): self.update_status() + self.lifetime -= 1 if self.status is 'Eating': self.update_stat(self.hunger,True) @@ -101,7 +107,14 @@ class Tamagotchi: return 100 * float(part)/float(whole) def status_abs(self): - return '{0:15} {1:10} Hunger:{2:10} Happiness:{3:10} Hygiene:{4:10} Sleep:{5:10}\n'.format(self.name,self.status,str(self.hunger[0])+'/'+str(self.hunger[1]),str(self.happiness[0])+'/'+str(self.happiness[1]),str(self.hygiene[0])+'/'+str(self.hygiene[1]),str(self.sleep[0])+'/'+str(self.sleep[1])) + rtn = '{0:15}'.format(self.name) + rtn += '{0:10}'.format(self.status) + rtn += 'Hunger: {0:10}'.format(str(self.hunger[0]) + '/' + str(self.hunger[1])) + rtn += 'Happiness: {0:10}'.format(str(self.happiness[0]) + '/' + str(self.happiness[1])) + rtn += 'Hygiene: {0:10}'.format(str(self.hygiene[0]) + '/' + str(self.hygiene[1])) + rtn += 'Sleep: {0:10}'.format(str(self.sleep[0]) + '/' + str(self.sleep[1])) + rtn += '\n' + return rtn def status_pct(self): hunger_pct = '%.0f%%' %(self.percentage(self.hunger[0], self.hunger[1])) @@ -109,4 +122,11 @@ class Tamagotchi: hygiene_pct = '%.0f%%' %self.percentage(self.hygiene[0], self.hygiene[1]) sleep_pct = '%.0f%%' %self.percentage(self.sleep[0], self.sleep[1]) - return '{0:20} {1:10} Hunger:{2:5} Happiness:{3:5} Hygiene:{4:5} Sleep:{5:5}\n'.format(self.name,self.status,hunger_pct,happiness_pct,hygiene_pct,sleep_pct) + rtn = '{0:20}'.format(self.name) + rtn += '{0:10}'.format(self.status) + rtn += 'Hunger: {0:5}'.format(hunger_pct) + rtn += 'Happiness: {0:5}'.format(happiness_pct) + rtn += 'Hygiene: {0:5}'.format(hygiene_pct) + rtn += 'Sleep: {0:5}'.format(sleep_pct) + rtn += '\n' + return rtn diff --git a/util.py b/util.py index e9a33d6..b2d1807 100644 --- a/util.py +++ b/util.py @@ -18,8 +18,9 @@ class Util: decayspeed = random.randrange(min_decay,max_decay,1) potential = random.randrange(min_workpower, max_workpower,1) recovery = random.randrange(min_recovery, max_recovery, 1) + lifetime = random.randrange(min_life, max_life, 1) - return Tamagotchi(name,hunger,happiness,hygiene,sleep,decayspeed,potential,recovery) + return Tamagotchi(name,hunger,happiness,hygiene,sleep,decayspeed,potential,recovery,lifetime) def make_list_of_Tamagotchis(self, number): tmp = []