From 0f4cc5ed33eb7d59129191a3b1dedb4e97fc4fe2 Mon Sep 17 00:00:00 2001
From: luxick <git@luxick.com>
Date: Sun, 26 Jul 2015 23:13:02 +0200
Subject: [PATCH] more variables in config

---
 config.py       |   8 ++++++++
 config.pyc      | Bin 439 -> 539 bytes
 mayorgotchi.py  |   7 ++++---
 mayorgotchi.pyc | Bin 3949 -> 4019 bytes
 test.py         |   4 +---
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/config.py b/config.py
index 4ef9ee0..3a17f3e 100644
--- a/config.py
+++ b/config.py
@@ -2,8 +2,16 @@
 
 # The lenght of one game cycle in milliseconds
 ticklenght = 0.1
+# Number of Tamagotchis to be created at the start of the simulation
+startnr = 50
 # 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
+washing_point = 50
+# If the happiness stat falls below this level Tamagotchis can be played with
+play_point = 50
 # Controls if Tamagotchi stats are shown in absolute vlaues or precentage (Possible values: True/False)
 show_pct = True
 # When new Tamagotchis are created their stats will be be created randomly between these.
diff --git a/config.pyc b/config.pyc
index 024e5cf17e4586e75a38e553d72e084b70dc0b71..c0fade43a6031ad9e26d8b003959f2ff8286fc5b 100644
GIT binary patch
delta 316
zcmY+7F;2rk5Jmrb9XoL_M1qonGBp=~10Whivjx%0vvF2L#)?Nmsd5HN;0|;V;s%_B
zmJ2XD&@iic^Z(aq=iR>MJNsQ%Z&&-<27hH_UP=#l0s@@Sz!^{mm#MbOTscB0;7X8%
z8-sGViEdV)5!_Vuf$AD0n}?th?g%u-&3u9#(7rsU`nZVaaxtd+QSKssCfI~3;Y4sf
zp9wj6j?Mi#bnS|{6g#lraJS*9XbO$r`k@bjxE8+@5xaKLKg5nTdGy0dlVgq2fBo8T
We>a}?UuUP16xqLL#F@fM%lrY?4L%nD

delta 200
zcmbQuvYok}`7<xq0=KQ9$qZ1y2&5f=xY!Lyq%bf<0ZB%NC`N`<CWa_xh7=&l!jQtu
z5XA}>XJbfVVTfV}vpK+QPKFd#hA1wE6gGw^ZiW<ghF}d2pi$|wW`e*@`%I7xnLv{n
zGEXo}oFlBv17wzPfr!lH?3~oR^o)`cZXh=$H94^|vA7^LHD$6O<0}afpcoqy7%~D$
KMmA<32GRiZ10)~-

diff --git a/mayorgotchi.py b/mayorgotchi.py
index f284da2..23d18f7 100644
--- a/mayorgotchi.py
+++ b/mayorgotchi.py
@@ -3,6 +3,7 @@
 from tamagotchi import Tamagotchi
 import names
 import random
+from config import *
 
 class Mayorgotchi:
     mygotchis = []
@@ -41,13 +42,13 @@ class Mayorgotchi:
     def get_hungry(self):
         for n in self.mygotchis:
             if n.status is 'Idle':
-                if n.hunger[0] <= 20:
+                if n.hunger[0] <= feeding_point:
                     return n
 
     def get_dirty(self):
         dirties = []
         for n in self.mygotchis:
-            if n.hygiene[0] <= 20:
+            if n.hygiene[0] <= washing_point:
                 dirties.append(n)
         if len(dirties) > 0:
             return dirties[random.randrange(0,len(dirties),1)]
@@ -58,7 +59,7 @@ class Mayorgotchi:
         unhappies = []
         result = []
         for n in self.mygotchis:
-            if n.happiness[0] <= 20:
+            if n.happiness[0] <= play_point:
                 unhappies.append(n)
         if len(unhappies) > 0:
             return unhappies[random.randrange(0,len(unhappies), 1)]
diff --git a/mayorgotchi.pyc b/mayorgotchi.pyc
index 23a75d3fe0ce97462280018cdf4acfdeb70e33e4..bf8ca5b5cec4e88721a3f024d6477848a98e7d9c 100644
GIT binary patch
delta 1098
zcmbtTO;1xn6utAlTKi~)7)!BOK{3_}Y9w)C3^B%!Knx^<)xf4Hebc@N&)4$aG}wg1
z1#UILS-N*m2n!N7uH5+>*t&4#AMoBOg{X05+c}+&J7><hcjiZF|5DNXna#w{4yp|}
z{+Rgx09!J@Tb#ZO;F%Cw@Z7V&bHKCVEx-=I%Bl^X0n6poZtbF5X1GBTRQ9$%GL}^Z
zqsJ`u!MMrN>Wi_)M)s%78CFbD9G#HJm=6sGp@_JpLhD*7O;ZGk-`=Wq8d5qqh(*#3
zCC{lnYlV#}*FGG#D3I0?S(n{Jck7*wh&(=`j_ezG&E#T0GZv!NmJL5hkYUn!!6wve
zr^=-I<`kZimPI~_7+`}k@p26X>}guR8?{6%vp8-F;RR8v)@cWkEE^O{=V)aMYCV->
z71c{Uc_R(jU=R<(HiLB&whh=}z&3{ge=ns)(>UQV*svfDX((-2$Mj<7WED4=Ft+Rg
z=vLNJwaS1pUDhY-JWy8sUMmoh&@$(?>WP1%laG<a5rPW@MS^hz&8Q7XV(@}k27;2b
zXDz71be7##U(<YGCO<G^_RZvBGyk`l_`l7ZK`B0#GKfTy$P7FJ=!ErNKj;7UqHCs$
zP6XXZQ=pskIMSAuTp?@y`QAM>oe8HVX^9fSO9*&WzreM&^hJDJUG+KBV2{;=yXIa!
z4Oj2n0$%J-?iyR5wJX<8*NBQFXwh4N^ao7uhdj1~(G%)ic6CM<jv$eu!_U(GX@Xk>
zcM$%#Uh@v0#o4O*p1u1}o28oRH^fPKpCV5^a>KPbEm>>(otw|9dTz<43!GL5xe9aC
sQLd1;X(QbceeWCXs2Q}lfuV~f{V4ChYJ1&K%;^VAxgKUi_{|u<06aCzX8-^I

delta 907
zcmZ`%OHUL*5U!e;-d$&(F}NTrE)vvLUN@8Vq9I0u2TU4~z=f>LgdG+am}z1#B*x&)
z7(?m?2lZq;8ACky3;Ykp#G@y@7(83mETSe%y1%Ke>Z<yxs`skj&sN-@dEeAOOfNv^
zbNPRrcXDmJGTh@rpdj$zDZm!M?3@RI15>rscGUNNdlxZBBhCi8^u`(W)9huCp-rzd
zx9Ea<5=(n^cLXabu}I*=#5#L;SPt9Tr6=A+Ow(KM4Cd)&VS<XPgk|biA35r0)r%$C
zS3`W`T&k;c<8dmFReGM9o(f!OA;fjqM3`Fhf!9m`%+KQ-le)|p@rJ02p(X^hg>IIN
zkZP{C7sI&bh(+k@0}jv9MZ842>6?nHZ6USP0A(_{v<FMv4Ww79|K3sHNNTQGcZqI9
zYHln>VLQ}460{_6TA){;!f-&wc1$3MViSc)C;hif0mtZ9Mqjn*AudaSOAc(hu!VqY
zW#Bc#9c48u0)&<aaV$sk7svVIIiBF8&Bp3#)DDy6c$U&f+ZZDb>uu}8Jf)u<vPG4m
zIp4=Rh5mB3Dh4S~_t6)>hv&BMFW?Ot&iB&`e|&J@$j*}S86Gy0=KP9j{+R=P&ECg}
zLznFNBNuv?>*kQ3asf`V{n3c+w~$OsxT*_svnDVkFv{@XXm6`AR^Fw7!j*CR666us
z7pbMdg9xWY>JzZlSjv{fzoGRQ?G)}P8Gf366fO@cmTX0)@u0D|ViuZ_W)*1LMLU0F
Tmr1HRigt>5Uy_$FhdJjrhi9Jk

diff --git a/test.py b/test.py
index fda71a8..94db8ac 100644
--- a/test.py
+++ b/test.py
@@ -6,13 +6,11 @@ from config import *
 import time
 import curses
 
-
 # Temporary test section
 
 list = []
 ticks = 0
-
-for n in range(0,50):
+for n in range(0,startnr):
     list.append(Util().make_Tamagotchi())
 
 mayor = Mayorgotchi(list)