X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2FuccProgComp.py;fp=src%2FuccProgComp.py;h=9f256fd9752fae6f8d1a4554dfedc3d791fd2908;hb=bde6a9634c116c190cb631e962ccda551503a5c5;hp=c5f22e0df7784ec14d2ea97772d04b15b47bf8db;hpb=47363bd0ed17d01c273471c2eb3bebbdc3aeae67;p=progcomp10.git

diff --git a/src/uccProgComp.py b/src/uccProgComp.py
index c5f22e0..9f256fd 100644
--- a/src/uccProgComp.py
+++ b/src/uccProgComp.py
@@ -10,22 +10,7 @@ import random, uuid
 random.seed ()
 
 from rpsconst import *
-
-DEFAULT_HEALTH = 50
-REPRODUCE_HEALTH = 100
-DIE_HEALTH = 0
-MAX_AGE = 100
-
-DEBUG = True
-
-# Game dynamics - these are not final:
-#		 WINNER		 TRUTH		ATTPoints, DEFPoints
-pointsTable 	[Attacker]	[False] = 	(2, -2)
-pointsTable	[Attacker]	[True]  =	(2, -2)
-pointsTable	[Defender]	[False] =	(-2, 2)
-pointsTable	[Defender]	[True]  =	(-2, 2)
-pointsTable	[Tie]		[False] =	(0, 0)
-pointsTable	[Tie]		[True]  =	(1, 1)
+from conf import *
 
 def Debug (f):
 	def g (*args):