Moved all test functions to cli class

.gitignore

@@ -1,2 +1,3 @@
 *.pyo
 *.pyc
+*.swp     

cli.py

@@ -1,6 +1,8 @@
 #!/usr/bin/python
 # coding=UTF-8
 
+from mayorgotchi import Mayorgotchi
+from kinggotchi import Kinggotchi
 from config import *
 import curses
 import time
@@ -10,8 +12,10 @@ class cursesUI:
     villagenr = 0
     percentage = True
     running = True
+    ticks = 0
+    king = Kinggotchi()
     
-    def __init__(self,start_paused):
+    def __init__(self):
         self.kingdomview = True
         self.villagenr = 0
         self.percentage = True
@@ -27,6 +31,15 @@ class cursesUI:
         height, width = self.stdscr.getmaxyx()
         self.win = curses.newpad(16383, width)
         
+        self.king.createKingdom(50)
+
+        while self.running:
+            self.build_screen(self.king, self.ticks)
+            
+            if not self.paused:
+                self.king.step()
+                self.ticks += 1
+
     def build_screen(self, king, ticks):
 
         height, width = self.stdscr.getmaxyx()

config.py

@@ -5,8 +5,6 @@
 ticklenght = 0.001
 # Number of Tamagotchis to be created at the start of the simulation
 startnr = 60
-# The amount of points a Tamagotchi loses per tick
-decayaspeed = 1
 # If the hunger stat falls below this level Tamagotchis can be fed
 feeding_point = 50
 # If the hygiene stat falls below this level Tamagotchis can be washed

kinggotchi.py

@@ -2,7 +2,10 @@
 # -*- coding: utf-8 -*-
 
 from config import *
+from mayorgotchi import Mayorgotchi
+from util import Util
 import names
+import itertools
 
 class Kinggotchi:
     myvillages = []
@@ -37,3 +40,7 @@ class Kinggotchi:
         for n in self.myvillages:
             result += n.graveyard
         return result
+    
+    def createKingdom(self, startvillages):
+        for _ in itertools.repeat(None, startvillages): 
+            self.add_village(Mayorgotchi(Util().make_list_of_Tamagotchis(startnr)))

test.py

@@ -1,28 +1,6 @@
 #!/usr/bin/python
 # coding=UTF-8
 
-from mayorgotchi import Mayorgotchi
-from kinggotchi import Kinggotchi
-from util import Util
-from config import *
 from cli import *
-import time
-import curses
-
-# Temporary test section
-ticks = 0
-king = Kinggotchi()
-ui = cursesUI(True)
-
-for n in range(0, 50):
-    king.add_village(Mayorgotchi(Util().make_list_of_Tamagotchis(startnr)))
-
-while True:
-    ui.build_screen(king, ticks)
-
-    if not ui.paused:
-        king.step()
-        ticks += 1
-    if not ui.running:
-        break
 
+ui = cursesUI()