Commit 01/06-24

Realms/RealmManager.py

@@ -8,18 +8,22 @@ class RealmManager:
         self.amount = amount
         temptext = open("./Realms/computer_names.txt", "r")
         self.compnames = temptext.read()
-        print (self.compnames)
         self.compnames = self.compnames.split("\n")
         temptext.close()
         temptext = open("./Realms/valid_border_colours.txt", "r")
         self.colournames = temptext.read()
-        print (self.colournames)
         self.colournames = self.colournames.split("\n")
         temptext.close()
         for x in range(self.amount):
             if x == 0:
-                self.players[0] = Player("p1", self.colournames)
-            self.players[x] = Player("c", self.colournames, x, self.compnames)
+                c = self.colournames[random.randint(0,len(self.colournames)-1)]
+                self.players[0] = Player("p1", c)
+                self.colournames.remove(c)
+            c1 = self.colournames[random.randint(0,len(self.colournames)-1)]
+            c2 = self.compnames[random.randint(0,len(self.compnames)-1)]
+            self.players[x] = Player("c", c1, x, c2)
+            self.colournames.remove(c1)
+            self.compnames.remove(c2)
         for x in self.players:
             p = self.players[x]
             print(f"Player {p.id}/{p.name} with colour {p.borderColour}")
@@ -33,13 +37,21 @@ class RealmManager:
         
 class Player:
     
-    def __init__(self, controller, colour, id=0, names=None,):
+    def __init__(self, controller, colour, id=0, name=None,):
+        self.resources = {
+            "settlers": 1,
+            "villagers": 4,
+            "wood": 0.0,
+            "stone": 0.0,
+            "food": 0.0,
+            "weapons": 0.0,
+            "tools": 0.0,
+        }
         self.id = id
         self.controller = controller
         self.heldTiles = []
-        colour = colour[random.randint(0,len(colour)-1)]
+        self.borderTiles = []
         colour = colour.split(",")
         print (colour)
         self.borderColour = (int(colour[0]),int(colour[1]),int(colour[2]))
-        if controller == "c":
-            self.name = names[random.randint(0,len(names)-1)]
+        self.name = name

Realms/valid_border_colours.txt

@@ -1,8 +1,8 @@
-255,0,0
-255,255,0
+255,51,102
+204,0,102
+255,128,0
 255,0,255
-0,0,0
-160,160,160
-0,100,0
-255,100,255
-180,0,180
+255,255,0
+102,0,204
+255,255,102
+204,51,255