diff --git a/mayorgotchi.py b/mayorgotchi.py index 4dd1a2d..9f9e4e6 100644 --- a/mayorgotchi.py +++ b/mayorgotchi.py @@ -1,13 +1,8 @@ #!/usr/bin/python from tamagotchi import Tamagotchi -from util import Util import names -decayaspeed = 1 -ticks = 50 -show_pct = True - class Mayorgotchi: mygotchis = [] name = '' @@ -21,7 +16,7 @@ class Mayorgotchi: if n.is_dead(): self.mygotchis.remove(n) - def give_status(self): + def give_status(self,show_pct): result = 'I am Mayorgotchi ' + self.name + '. These are the Tamagotchis in my Village:\n\n' for n in self.mygotchis: if show_pct: @@ -34,27 +29,3 @@ class Mayorgotchi: for n in self.mygotchis: n.step() self.remove_corpses() - - -# Temoprarty Test Section -list = [] -for n in range(0,10): - list.append(Util().make_Tamagotchi()) - -mayor = Mayorgotchi(list) - -print mayor.give_status() - -for n in range (0, ticks): - mayor.step() - -print '----------------------After '+str(ticks)+' ticks------------------------------\n' - -print mayor.give_status() - -for n in range (0, ticks): - mayor.step() - -print '----------------------After another '+str(ticks)+' ticks------------------------------\n' - -print mayor.give_status() diff --git a/mayorgotchi.pyc b/mayorgotchi.pyc new file mode 100644 index 0000000..303e3f3 Binary files /dev/null and b/mayorgotchi.pyc differ diff --git a/tamagotchi.pyc b/tamagotchi.pyc index 252d4e9..d3f9d3a 100644 Binary files a/tamagotchi.pyc and b/tamagotchi.pyc differ diff --git a/test.py b/test.py new file mode 100644 index 0000000..79ddb1b --- /dev/null +++ b/test.py @@ -0,0 +1,35 @@ +#!/usr/bin/python + +from mayorgotchi import Mayorgotchi +from util import Util + + +# Temporary test section + +# Variable Definition +decayaspeed = 1 +ticks = 50 +show_pct = True + +list = [] + +for n in range(0,10): + list.append(Util().make_Tamagotchi()) + +mayor = Mayorgotchi(list) + +print mayor.give_status(show_pct) + +for n in range (0, ticks): + mayor.step() + +print '----------------------After '+str(ticks)+' ticks------------------------------\n' + +print mayor.give_status(show_pct) + +for n in range (0, ticks): + mayor.step() + +print '----------------------After another '+str(ticks)+' ticks------------------------------\n' + +print mayor.give_status(show_pct) diff --git a/util b/util deleted file mode 100644 index b46f1b1..0000000 --- a/util +++ /dev/null @@ -1,3 +0,0 @@ -#! /usr/bin/python - -class util: