From 07af20135086e6caa69a69b0182325704a6fedaf Mon Sep 17 00:00:00 2001 From: luxick Date: Fri, 26 Feb 2016 19:04:12 +0100 Subject: [PATCH] Introduced Eggs. Every tamagotchi will spawn an egg, all the time(DEBUG) --- egg.py | 21 +++++++++++++++++++++ mayorgotchi.py | 23 +++++++++++++++++++++-- tamagotchi.py | 4 ++++ util.py | 1 - 4 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 egg.py diff --git a/egg.py b/egg.py new file mode 100644 index 0000000..e564948 --- /dev/null +++ b/egg.py @@ -0,0 +1,21 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +class Egg: + alive = True + age = 0 + care = 100 + + def __init__(self): + self.alive = True + self.age = 0 + self.care = 100 + + def step(self): + if self.alive: + if self.care >= 0: + age += 1 + else: + self.alive = False + + diff --git a/mayorgotchi.py b/mayorgotchi.py index 0a6cb1a..ba61958 100644 --- a/mayorgotchi.py +++ b/mayorgotchi.py @@ -5,9 +5,11 @@ from tamagotchi import Tamagotchi import random from config import * from util import Util +from egg import Egg class Mayorgotchi: mygotchis = [] + myeggs = [] name = '' graveyard = 0 @@ -22,7 +24,10 @@ class Mayorgotchi: self.mygotchis.remove(n) def give_status(self,show_pct): - result = 'I am Mayorgotchi ' + self.name + '.\nIn my Village live '+str(len(self.mygotchis))+' Tamagotchis.\nIn my Village '+str(self.graveyard)+' Tamagotchis died so far.\n\n' + result = "Town: " + self.name + "\n" + result += "Population: " + str(len(self.mygotchis)) + " " + result += "Graveyard: " + str(self.graveyard) + " " + result += "Eggs: " + str(len(self.myeggs)) + "\n\n" for n in self.mygotchis: if show_pct: result += n.status_pct() @@ -120,8 +125,22 @@ class Mayorgotchi: for n in self.mygotchis: n.step() self.remove_corpses() - + self.checkCildBirth() self.order_feed() self.order_wash() self.order_play() + + def addToVillage(self, new): + if isinstance(new, Egg): + self.myeggs.append(new) + elif isinstance(new, Tamagotchi): + self.mygotchis.append(new) + + def checkCildBirth(self): + for n in self.mygotchis: + if n.fertility[0] == True: + self.addToVillage(Egg()) + + + diff --git a/tamagotchi.py b/tamagotchi.py index 127ee2b..96dcb21 100644 --- a/tamagotchi.py +++ b/tamagotchi.py @@ -14,6 +14,7 @@ class Tamagotchi: power = 0 recovery = 0 lifetime = 0 + fertility = [True, 0] def __init__(self, name, hunger, happiness, hygiene, sleep, decayspeed, potential, recovery, lifetime): self.name = name @@ -130,3 +131,6 @@ class Tamagotchi: rtn += 'Sleep: {0:5}'.format(sleep_pct) rtn += '\n' return rtn + + def checkFertility(self): + return True diff --git a/util.py b/util.py index c619909..3078133 100644 --- a/util.py +++ b/util.py @@ -7,7 +7,6 @@ from config import * import os class Util: - def make_Tamagotchi(self): name = self.generateName() hunger = random.randrange(statrange[0],statrange[1],1)