From 187df5697a3a265039e554e7d589fb01a78a835d Mon Sep 17 00:00:00 2001
From: luxick <git@luxick.com>
Date: Sun, 26 Jul 2015 22:14:21 +0200
Subject: [PATCH] moved global variables to a seperate config file

---
 config.py       |  16 ++++++++++++++++
 config.pyc      | Bin 0 -> 348 bytes
 mayorgotchi.py  |   4 ++--
 mayorgotchi.pyc | Bin 3909 -> 3949 bytes
 tamagotchi.py   |  31 ++++++++++++++++++-------------
 tamagotchi.pyc  | Bin 4964 -> 5092 bytes
 test.py         |  15 +++++++--------
 util.py         |  13 +++++++------
 util.pyc        | Bin 929 -> 1033 bytes
 9 files changed, 50 insertions(+), 29 deletions(-)
 create mode 100644 config.py
 create mode 100644 config.pyc

diff --git a/config.py b/config.py
new file mode 100644
index 0000000..20884bd
--- /dev/null
+++ b/config.py
@@ -0,0 +1,16 @@
+#!/usr/bin/python
+
+# The amount of points a Tamagotchi loses per tick
+decayaspeed = 1
+# Controls if Tamagotchi stats are shown in absolute vlaues or precentage (Possible values: True/False)
+show_pct = False
+# When new Tamagotchis are created their stats will be be created randomly between these.
+min_stat = 100
+max_stat = 200
+# Tamagotchis decay at a set rate per tick. The value of decay is randomly chosen between these two.
+min_decay = 1
+max_decay = 3
+# These two define how long it takes a Tamagotchi to perform work (preparing food/washing someone/playing with someone)
+# The value is choosen randomly between these two. Obviously a lower number is better.
+min_workpower = 1
+max_workpower = 3
diff --git a/config.pyc b/config.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..45dcc486c1e4abd4ab5cfe8d415dcf612718d23b
GIT binary patch
literal 348
zcmYL@!A`?442IpN>&DP{j-H4#?Kq8{IC4Q;da0r$tkK#!T0C`qFy4Xp;RSHA3KIE?
zfB&`>@v~X)U%oyx%qQdb$Pso715g9l4C)*VQ-H~#E>e8~MnGMre3|kUm;&Cb1rNHo
z#_>3~?+C$os~(v2$S_u`Nd<4Mq1gVax?pL=S!i)=yrv|2H#C9NEY$5T;+E*7C6p9f
zceR<l5ie(tqrFh7u>V)7xCQ<Zwk&0fy_Mbd=JZ*{&ft}{l2orwNV;{6#tw%`Y8*b@
b>Df=|fBPQIwX=tUSA-`<ne)w3h%);HxD!r|

literal 0
HcmV?d00001

diff --git a/mayorgotchi.py b/mayorgotchi.py
index 7a407c2..f284da2 100644
--- a/mayorgotchi.py
+++ b/mayorgotchi.py
@@ -20,7 +20,7 @@ class Mayorgotchi:
                 self.mygotchis.remove(n)
 
     def give_status(self,show_pct):
-        result = 'I am Mayorgotchi ' + self.name + '.\nIn my Village '+str(self.graveyard)+' Tamagotchis died so far.\nThese are the Tamagotchis living in my Village:\n\n'
+        result = 'I am Mayorgotchi ' + self.name + '.\nIn my Village '+str(self.graveyard)+' Tamagotchis died so far.\nThese are the '+str(len(self.mygotchis))+' Tamagotchis living in my Village:\n\n'
         for n in self.mygotchis:
             if show_pct:
                 result += n.status_pct()
@@ -33,7 +33,7 @@ class Mayorgotchi:
         for n in self.mygotchis:
             if n.status is 'Idle':
                 freegotchis.append(n)
-        if freegotchis is not None:
+        if len(freegotchis) > 0:
             return freegotchis[random.randrange(0,len(freegotchis),1)]
         else:
             return None
diff --git a/mayorgotchi.pyc b/mayorgotchi.pyc
index 65821394e5654d1c3bfafa165913bf7e63834bc4..23a75d3fe0ce97462280018cdf4acfdeb70e33e4 100644
GIT binary patch
delta 363
zcmX>q_g0RL`7<w9iRDH%b7n3U1_lOaATF+&?9QwdTf)dt!pu;^z>vkl(98%z;wdZ)
z;<Zc+6;@DTmsov<TA&(6hN2{f8YYGsW`-<QhGqr^bD*k1XP6Khl2ABMS+EA{<n_!3
zj2e?4Fl)0Gs{rks%*CS0$UfPCMU(?*DFZ`JYTjg5meq`wlRvUZGZswdWwnt7xd!Zx
z6efmj7KWk>5VwQ{WMvA|<csVIlN(r#S%U;X#_eI1;sE)_FF!AJ@?F+eMxn{cY>850
zK%q<^X2=u)5*i?zg206M=6h_GjG_`C0gwSfk|06~L`ZMe;c&+xHMxURhEZg4F0bF@
h&zwz+(v!=$UINJk?iY;Gn>~4sGct;97UVNw1ORMCMza6_

delta 358
zcmaDWcT|pz`7<xqL-~zt=FD8o3=9m;KwO+W*_~O*t(J+Q!iu4Wfgy{T!6jCop_ZAU
zhLNGjo1un@p@x|ui-n<?fx#T8s!#_e#EK*o4pbJb!7}+6vjL;`<nPSdlQmdW#Mpr5
z2Z4wZkZr{!MM2y^dU6)aYFQ;l0Y)}PVI~pAWJaJENS+ml!7j?0Y{Y6K1++eefgzid
zp(qLDloA$(ELMgTCWaEW$$hK=T0lMngI|7LY6-}KqQtzE{M-^wC=<v{PX$|=lbSb~
zm93SLXL2`NBBSW!w`>xOVw>66Eg40{fr^8qL4+iTkOC1Bn?pF<aY#+xz$wEhJozl=
f1xAU<^SE9D$qw!pj1rp*d5$wOifp#zGhqY(UFSxx

diff --git a/tamagotchi.py b/tamagotchi.py
index d9c1447..a0b468a 100644
--- a/tamagotchi.py
+++ b/tamagotchi.py
@@ -39,28 +39,33 @@ class Tamagotchi:
         tamagotchi.status = 'Bathing'
 
     def update_sleep(self):
-        if self.sleep[0] <= 0:
-            self.status = 'Sleeping'
         if self.status is 'Sleeping':
-            if self.sleep[0] <= self.sleep[1] - self.decayspeed:
-                self.sleep[0] += 5
             if self.sleep[0] >= self.sleep[1]:
                 self.status = 'Idle'
+            if self.sleep[0] >= self.sleep[1] - self.recovery:
+                self.sleep[0] = self.sleep[1]
+            else:
+                self.sleep[0] += self.recovery
         else:
-            self.sleep[0] -= self.decayspeed
+            if self.sleep[0] <= 0 + self.decayspeed:
+                self.sleep[0] = 0
+                self.status = 'Sleeping'
+            else:
+                self.sleep[0] -= self.decayspeed
 
     def update_hunger(self):
         if self.status is 'Eating':
-            if self.hunger[0] <= self.hunger[1]:
-                self.hunger[0] += 30
-            else:
+            if self.hunger[0] >= self.hunger[1]:
                 self.status = 'Idle'
+            if self.hunger[0] >= self.hunger[1] - self.recovery:
+                self.hunger[0] = self.hunger[1]
+            else:
+                self.hunger[0] += self.recovery
         else:
-            # The Tamagotchi is starving
-            if self.hunger[0] < self.decayspeed:
+            if self.hunger[0] <= 0 + self.decayspeed:
                 self.hunger[0] = 0
-                self.dead = True
                 self.status = 'Dead'
+                self.dead = True
             else:
                 self.hunger[0] -= self.decayspeed
 
@@ -73,7 +78,7 @@ class Tamagotchi:
             else:
                 self.hygiene[0] += self.recovery
         else:
-            if self.hygiene[0] <= 0:
+            if self.hygiene[0] <= 0 + self.decayspeed:
                 self.hygiene[0] = 0
             else:
                 self.hygiene[0] -= self.decayspeed
@@ -87,7 +92,7 @@ class Tamagotchi:
             else:
                 self.happiness[0] += self.recovery
         else:
-            if self.happiness[0] <= 0:
+            if self.happiness[0] <= 0 + self.decayspeed:
                 self.happiness[0] = 0
             else:
                 self.happiness[0] -= self.decayspeed
diff --git a/tamagotchi.pyc b/tamagotchi.pyc
index fa8318c5bd7d54b1e4eb328d27ab5f174d1a7bcd..0fcad13ecc764a732ff267cb37d1fcf375415bc3 100644
GIT binary patch
delta 729
zcmaE&_C%eH`7<w<hw(->M^?tmlaFxbd7o#fVPME&WJqCRNM>S?1aX)c%$aTSJP{I-
zKuM4UGlO_GBSX<nkYczln-oS6C!T>}axRy$MhOQ414D35YHC4dUV0{w&5+3mB!ZZL
zga!+U#RVeRC(CoDPOf7U)fNGA85sE)r5Je_6&b~uB$=cbc^P?_l0n))7^KM=h>P!l
z92{~3VKu6QgAfvE4nBnDU{<JuOIW}RR*=i(jM;#8_yq|9Ni=5zl`$~5q$Z|lfRsSo
z5B7=V<UaOtBMYElu^5oR^aUqYf1CpO!{ivkxv2hdKuDnZW5eWlE~81DN~}SWK-(tk
zbEfNgfGiinVz~g80Hny`P&SaILEMuUvIkG*<ra|$!(sJgOYXC5vLLlmlX-Yj8B-<~
z@kFr6fCM-|nt9lP%*^8W6kv!JP1ff<&RDVeJMSSz#_G+x_!*fP>n86J%$5gR#t+gY
c3?f89ggA(h0ui#4-Gt^d^K%MJej!u?0G26uEdT%j

delta 746
zcmbVJzfTlV5T4l|kNdI9owwY=@$00KtE@~!a>f|!NDk!GSaIO(29L#!++83fBowx2
zGnIw0q0q_@Dk~FBwBm2D;U7>t6B1_LEjdW2DCWzXH}idOzIi9pC%2UO&&@2~JX8<u
zy-xtJ3$P9lAe1;FgmxJMLv9-gaj%SW6Q!X2?m~CMGod6W14e`!_8Xc8D_U^ZtR^bG
zNBXqL4xxPjft@_Ic>uA0ncq{MF{=SUy`p&9T8ja?DTew+7`|@BYc1rYWiu=p3>8yO
z0|FU=EG@cqI#k7(Jg0yjI+(*L^l=n(MpMWV7RMY%=L17BB=3Vw&(oe=d?xN5=z`ux
z-`(c>a|-}*t>2NXB?4%_NjAE!snxD2T@4EYMgQ%w`v#mll&Nb=HyE|ep0i0#wX?3w
z_$XWrD%z}eXOWfKzI}%aodN@}wNdm9$Mn&~G&)xp{6T+IjNfQwU}Wgtg?Z(V+2m(h
zNI#(k^@2{*1)QUN#vk@De;uLUnWt)khf4n7ZFUGBiynIPHG8barBtGQC&UK*b)MrG
z&AUx}MPJ-s*g4uB{EoPFG@C~Qcc@y3%33QYEKi^)Fswxc#_4C_qnS<T=%u%N2Cu$;
Ai~s-t

diff --git a/test.py b/test.py
index 5786189..123db72 100644
--- a/test.py
+++ b/test.py
@@ -2,18 +2,15 @@
 
 from mayorgotchi import Mayorgotchi
 from util import Util
+from config import *
 import time
 import curses
 
 
 # Temporary test section
 
-# Variable Definition
-decayaspeed = 1
-ticks = 200000
-show_pct = True
-
 list = []
+ticks = 0
 
 for n in range(0,50):
     list.append(Util().make_Tamagotchi())
@@ -27,16 +24,18 @@ curses.curs_set(0)
 screen.keypad(1)
 screen.nodelay(1)
 
-for n in range (0, ticks):
+while True:
     screen.move(0,0)
     mayor.step()
-    screen.addstr('----------------------After '+str(n)+' ticks------------------------------\n')
+    screen.addstr('Simulation running. Press [q] to exit.\n')
+    screen.addstr('----------------------After '+str(ticks)+' ticks------------------------------\n')
     screen.addstr(mayor.give_status(show_pct))
+    ticks += 1
 
     screen.clrtobot()
     key = screen.getch()
     if key == ord('q'):
         break
     elif key < 0:
-        time.sleep(0.5)
+        time.sleep(0.1)
 curses.endwin()
diff --git a/util.py b/util.py
index 84a3bef..eaef25c 100644
--- a/util.py
+++ b/util.py
@@ -3,16 +3,17 @@
 from tamagotchi import Tamagotchi
 import random
 import names
+from config import *
 
 class Util:
 
     def make_Tamagotchi(self):
         name = names.get_last_name()
-        hunger = random.randrange(80,120,1)
-        happiness = random.randrange(80,120,1)
-        hygiene = random.randrange(80,120,1)
-        sleep = random.randrange(80,120,1)
-        decayspeed = random.randrange(1,3,1)
-        potential = random.randrange(1,5,1)
+        hunger = random.randrange(min_stat,max_stat,1)
+        happiness = random.randrange(min_stat,max_stat,1)
+        hygiene = random.randrange(min_stat,max_stat,1)
+        sleep = random.randrange(min_stat,max_stat,1)
+        decayspeed = random.randrange(min_decay,max_decay,1)
+        potential = random.randrange(min_workpower, max_workpower,1)
 
         return Tamagotchi(name,hunger,happiness,hygiene,sleep,decayspeed,potential)
diff --git a/util.pyc b/util.pyc
index 524fe9f958b995f6d13ed88967aea0e59192371c..258b7004c0ad05498a4a61be93921b0074b38029 100644
GIT binary patch
delta 449
zcmZWmO-sW-5PiFwucj?{@l?F@6vZDP9*P$cFCL;ET96WwTBEj+cAyF?g7M--2>Av6
z2v6SqL;eA0O(IBl*|+oFo1GchclXunsqe18J@`0}Q7^^!0iWe@(cA3<iNdXgv&2H;
zAhGcR<iK!bBat`_++w`d4g^0S13QJjcp?kLwm`1%C_xg}3jai=>mt8e7wtxLKyFi$
z<0{hwwHna{`OpHoFQFB*1#Lq+&@OV9CzU+jNos}++U1+r8<EHHES-;+6j4Q@`--$`
zCz-_21GnHjwkp=Gy;Zijxyx3Q1^p`Q|0(5{_!NHmEceA`IZ#K3p=oZ~EluFafDwVi
oz%w&MvuK)8e3gdA2yFxABgmx0+59q{hLS4{JEq8n=<xRC4+L6P761SM

delta 346
zcmeC=SjaBT{F#@l&3|KPG6NJa18D~!F1DX2ts}wAkiyE4!otwPz|hRV5E;e7kix_e
ztid)hQ+DFS*!mPk5I=>Pp_!SXmWiQ+i6IN916hz6n;;7|K~|U`&;+105Hs131c45L
z2(mMjurSmxGSrwcG1M?K)BriG3^i;FHS7${>>$?xo$r?!03<UjKm;R*0QoDE6-a2X
zPVQ&4n5@XOn~`(!T_!6=zR42I9+n_Q>_A-11SHs)G=L;fDUc}P0uhP1iRt+z$r+hJ
eAc-Ir5CKvd#0b>wKKV7X5EsZ=0Y)B19wq?x5jMgA