From b34722cc51623dbb102cffce78cc0b5c283093af Mon Sep 17 00:00:00 2001
From: Hannah-Dagemark <Hannah.Dagemark@gmail.com>
Date: Sat, 4 May 2024 16:57:39 +0200
Subject: [PATCH] Commit 04/05-24

---
 Main.py                                       | 190 ++++++++++++++----
 Map/Images/blackstripes.png                   | Bin 5498 -> 6527 bytes
 Map/Images/sampledone.png                     | Bin 5036 -> 7236 bytes
 Map/MapManager.py                             |  77 ++++++-
 Map/__pycache__/MapManager.cpython-312.pyc    | Bin 10950 -> 14735 bytes
 Map/__pycache__/TileTypes.cpython-312.pyc     | Bin 4619 -> 4628 bytes
 .../__pycache__/ScriptUtils.cpython-312.pyc   | Bin 155 -> 164 bytes
 cache.py                                      |  63 ++++++
 8 files changed, 286 insertions(+), 44 deletions(-)
 create mode 100644 cache.py

diff --git a/Main.py b/Main.py
index baa3f3a..894b353 100644
--- a/Main.py
+++ b/Main.py
@@ -26,67 +26,98 @@ mapHeight = int(map.get_height())
 time1 = pygame.time.get_ticks()
 def initMapGen():
     y = 0
-    bY = 5
-    bX = 4
+    bY = 10
+    cY = 0
+    bX = 6
+    i = 0
+
     while bX < mapWidth:
         for x in range(bX, mapWidth):
             if y < mapHeight:    
                 map.set_at((x, y), (0,0,0,255))
                 y += 1
-                if y % 5 == 0:
-                    map.set_at((x, y), (0,0,0,255))
-                    y += 1
+                cY += 1
+                if cY % 7 == 0:
+                    while i != 4:
+                        map.set_at((x, y), (0,0,0,255))
+                        y += 1
+                        i += 1
+                    i = 0
+                    cY += 1
         screen.blit(map, maprect)
         pygame.display.flip()
-        bX += 8
+        bX += 12
         y = 0
+        cY = 0
 
-    y = bY
-
-    while bY < mapHeight:
-        for x in range(0, mapWidth):
-            if y < mapHeight:    
-                map.set_at((x, y), (0,0,0,255))
-                y += 1
-                if y % 5 == 0:
-                    map.set_at((x, y), (0,0,0,255))
-                    y += 1
-        screen.blit(map, maprect)
-        pygame.display.flip()
-        bY += 10
-        y = bY
-
-    bX = 4
+    bX = 6
     y = 0
+    cY = y
+    i = 0
 
     while bX < mapWidth:
         for x in range(bX, -1, -1):
             if y < mapHeight:    
                 map.set_at((x, y), (0,0,0,255))
                 y += 1
-                if y % 5 == 0:
-                    map.set_at((x, y), (0,0,0,255))
-                    y += 1
+                cY += 1
+                if cY % 7 == 0:
+                    while i != 4:
+                        map.set_at((x, y), (0,0,0,255))
+                        y += 1
+                        i += 1
+                    i = 0
+                    cY += 1
         screen.blit(map, maprect)
         pygame.display.flip()
-        bX += 8
+        bX += 12
         y = 0
+        cY = y
 
-    bY = 2
     y = bY
+    cY = 0
+    
+    while bY < mapHeight:
+        for x in range(0, mapWidth):
+            if y < mapHeight:    
+                map.set_at((x, y), (0,0,0,255))
+                y += 1
+                cY += 1
+                if cY % 7 == 0:
+                    while i != 4:
+                        map.set_at((x, y), (0,0,0,255))
+                        y += 1
+                        i += 1
+                    i = 0
+                    cY += 1
+        screen.blit(map, maprect)
+        pygame.display.flip()
+        bY += 20
+        y = bY
+        cY = 0
+
+    bY = 12
+    y = bY
+    cY = 2
 
     while bY < mapHeight:
         for x in range(mapWidth, 0, -1):
             if y < mapHeight:    
                 map.set_at((x, y), (0,0,0,255))
                 y += 1
-                if y % 5 == 0:
-                    map.set_at((x, y), (0,0,0,255))
-                    y += 1
+                cY += 1
+                if cY % 7 == 0:
+                    while i != 4:
+                        map.set_at((x, y), (0,0,0,255))
+                        y += 1
+                        i += 1
+                    i = 0
+                    cY += 1
         screen.blit(map, maprect)
         pygame.display.flip()
-        bY += 10
+        bY += 20
         y = bY
+        cY = 2
         
 initMapGen()
 class uText:
@@ -94,14 +125,23 @@ class uText:
     def __init__(self):
         self.font = pygame.font.Font(pygame.font.get_default_font(), 36)
         self.texts = []
+        self.takenPos = []
+        self.texts_to_remove = []
 
     def write(self, text, position):
-        self.texts.append((text,position))
+        if not (text,position) in self.texts:    
+            for textTest in self.texts:
+                if textTest[0] != text and textTest[1] == position:
+                    self.texts.remove(textTest)
+            self.texts.append((text,position))
+            print(self.texts)
         
-    def delete(self, text):
+    def delete(self, parameter, info):
         text2 = []
         for place in self.texts:
-            if place[0] != text:
+            if place[0] != info and parameter == "name":
+                text2.append(place)
+            elif place[1] != info and parameter == "pos":
                 text2.append(place)
         self.texts = text2
     
@@ -113,16 +153,86 @@ class uText:
             screen.blit(textPrint, textPrintRect)
         
     def runTextTile(self, tile_pressed):
+        i=0
         info = GameMap.getTileInfo(tile_pressed)
+        self.write(info["terrain"],(1000,50))
+        
+        for bit in info["gameplay"]:
+            if True: #type(bit) == "<class 'str'" or type(bit) == "<class 'int'"
+                self.write(bit[0],(840,100 + 50*i))
+                self.write(bit[1],(1090,100 + 50*i))
+            i += 1
         tile_pressed = str(tile_pressed)
         tilePrint = self.font.render(tile_pressed, True, (255, 255, 255))
         tilePrintRect = tilePrint.get_rect()
-        tilePrintRect = tilePrintRect.move(1000,50)
+        tilePrintRect = tilePrintRect.move(1100,0)
         screen.blit(tilePrint, tilePrintRect)
 
+class uButtons:
+
+    def __init__(self):
+        self.buttons = []
+        self.colours = {
+            "black": (0, 0, 0),
+            "white": (255, 255, 255),
+            "gray": (200, 200, 200),
+            "darkgray": (100, 100, 100),
+            "red": (255, 0, 0,),
+            "green": (0, 255, 0,),
+            "blue": (0, 0, 255,)
+        }
+
+    def addButton(self, name, x, y, width, height, colour_standby=(255,255,255), colour_hover=(200, 200, 200), onAction=print("Button pressed")):
+        if colour_standby != (255,255,255):
+            if self.colours[colour_standby] != None:
+                colour_standby = self.colours[colour_standby]
+            else:
+                colour_standby = (255,255,255)
+        if colour_hover != (200, 200, 200):
+            if self.colours[colour_hover] != None:
+                colour_hover = self.colours[colour_hover]
+            else:
+                colour_hover = (200, 200, 200)
+        button = {
+            "text": name,
+            "xPos": x,
+            "yPos": y,
+            "width": int(width),
+            "height": int(height),
+            "colour_standby": colour_standby,
+            "colour_hover": colour_hover,
+            "button_action": onAction,
+            "isHover": False
+        }
+        self.buttons.append(button)
+        uTexter.write(name,(x,y))
+
+    def updateHover(self):
+        pos = pygame.mouse.get_pos()
+        for button in self.buttons:
+            if pos[0] > button["xPos"] and pos[0] < button["xPos"] + button["width"]:
+                if pos[1] > button["yPos"] and pos[1] < button["yPos"] + button["height"]:
+                    button["isHover"] = True
+            elif button["isHover"] == True:
+                button["isHover"] = False
+
+    def drawButtons(self):
+        for button in self.buttons:
+            buttonRect = pygame.Rect(button["xPos"],button["yPos"],button["width"],button["height"])
+            if button["isHover"] == False:
+                pygame.draw.rect(screen,(button["colour_standby"]),buttonRect)
+            else:
+                pygame.draw.rect(screen,(button["colour_hover"]),buttonRect)
+
+uButtoner = uButtons()
 uTexter = uText()
 
-uTexter.write("State",(1000,0))
+def prerenderGraphics():
+    uTexter.write("State",(1000,0))
+    uButtoner.addButton("Claim",850,600,110,40,"darkgray","gray")
+prerenderGraphics()
+
+
 
 pygame.image.save(map, "./Map/Images/blackstripes.png")
 
@@ -156,6 +266,8 @@ while running:
                 print(f"MB1 is true")
                 pos = pygame.mouse.get_pos()
                 tile_pressed = GameMap.findTileAt(pos)
+                if tile_pressed != None:
+                    GameMap.paintTileBorder(tile_pressed, map)
     
     # fill the screen with a color to wipe away anything from last frame
     screen.fill("black")
@@ -163,10 +275,12 @@ while running:
     if tile_pressed != None:
         uTexter.runTextTile(tile_pressed)
     
+    uButtoner.updateHover()
+    uButtoner.drawButtons()
     uTexter.runText()
-    
+
     screen.blit(map, maprect)
-            
+    
     # RENDER YOUR GAME HERE
 
     # flip() the display to put your work on screen
diff --git a/Map/Images/blackstripes.png b/Map/Images/blackstripes.png
index 02c772ab9805624b5b9bbd868542eb1b30433445..d7e3a5d551ed550d99a6d55802e77536492390e0 100644
GIT binary patch
literal 6527
zcmeHMYfO`86s|5tg96#gCJ4gJx-K{r3Ihfr$Y9Dh3)`5PmaQn)k`+b>*UF^{bC5C=
zQnFeo*tvn513{=vRxXWP$G8;Pq`-his;$VK3I$5r6~6ba8>ZQ>{rgV7U+wpv%X6M{
zPS0D`M?t4dO%9mga5z&Wz&{v=d&v`r+j(NoPW>mpAH1}H!&#j~{C&@)mClaUavuF`
zcH-kIole2n;c%C~L;6!;c4plxJXZaU$_A}QEzydmh4MpfPW$vvQFu5bg(_iA&@6Mp
z^p6>rD-NOC=}geC69@CfVgZH61riz98RN~H-#XgnqzKF?tykz;Nt>G5oUG(ezhtcB
zuBfcGRB`zwDo4LJ5%!tG(<KBXc&dudCLk4pYJ^Sr_UN4SjhUy?%m~zMF!@ev{Himm
zM^<qCbb=H(R7aj^pY}F5YtMn&mC?RFb1vwK+{?LM1cdzojao!N4woedvI#enhFlSL
z`Czl8UfcZ3^y1z@k1ek(<y_WURbYG;h=CHFk#((av>gb6?tD@?l99WKg=LOM{G_ZZ
zO7yS?efjh8BVz4<7I>rlM0Uu0(*#BGg6#yIZP;1eoHg|O`&YBtuA(}vnER-CY8X*e
z_*<bcA`ATK+9ok-s?>e&dIBGK5$pBnkRC?Q7h#-hu3nz6rxu(q><3BcBKOkbE-Jr5
zk9IrDl*-s4A{0sysYEP4hN9NXz}wM|s7=oUV76uNfH@;TpQ(N!al7qr)T%v=>#0&S
zcU%kntp)2ApmR0iN$?nq$N_(BQ3xU`=bp=ZoC!=dQ3eXs;6#{l80V93F>7WoZe%B2
z0Z>GTd(;2m*`Y_t94kJbCU7GG=`P8?pW!A&Uk&T$t-ebiF|g`vYLCF@jtF?O@n_m^
ze$QF*&lFO}M5l%yh}4~ECd#=nUrQIF&{#X|{H{*603DIV!z>Aih}h8{>@W}LsOZbi
z8iNI8Z4}1z8oDMuP9oc1o(P~I;guBL#Kr~GSY7Yxh8M4%1q2z2%$Ez+%s^#Mw0BW@
z46OQ9_}Mkhbq&P#$4)=n=f(D~6i#Z7w^nP%-O)@CJN)0?$Z<q<x@awh7AhD~PkT@k
zEHHZ_C!7K482{Qc8Q^c?uu&Mt)2Y)^dZVrA^)gW8SBkmf(P#4ApeUj`6^fCnKr)az
zV#GWAzEr>|CDFS-WW~U$2jfdK=CcrAA6MI@!tI5Qrf|P%{^gYA`4&(O_Qa5f?irvT
zEp`o5G(a5`V#;JPhzKFoTJ%6VG6dh*LH@QGhjC&$L>Kzk^6IWB8<3FR_Kcw$?mi#@
z2N!Q2adccb5Vot;4{Nb4=&Nm|?u!XSbp}>d&v9tX7$)#$?dD=(?)H9(rcl_xEVy0C
zR9!|Xj*#w~7@AYQPtMVfOrWFNxfWjoA|mIpD$c?F-p|{mX#o7SaWe{|Dpazr8m;bf
z3{Zf0B8YN<Tl3mIv?wBr7uOhWbUcuvs&30Zn(`p5ZdQSSqk*hSOup--_ESTAKQ!K}
zJ2dH+sG7!jP~CZ~Pgh}cirye4+0Vg<IIOa?aZq5vWQUF=NXH3>Cta`xZX1VDB^(k-
zQjTZ&dUm1l*tn4R^;3Q3peTC&bL!0)SXJ5hc*JfLj;pLMjP`15<ZWSHgpIsjY~*1h
zPe1msk%x^uY~*eJmch2X91m>E!?rvY3)}MGhK6l<*p`QFdDz7!cCksqE;iw%&i{L{
bsolLI=7n_MD^=_NSivFh2l-dOcOm<4!$j*<

literal 5498
zcmeAS@N?(olHy`uVBq!ia0y~yV76jlU~=GK0*aiHZTY~!AnNGp;uumf=j~m?Np~zn
zSRE7I)jyA97D;wk({HqC&GDSA>oYn(K7arI{g3N&KEGFfKBxGc<^Ff}^Upt<^Z&Q(
zIZL2G-O>7gb!NwY{NaRfuLHT;s{XS;)fU_KFFs#x0pk4>{cmYMLB%s@`TXz8x9wlM
z|5PDJ%jehs{(SnzcY9kd5Ls`XU(fTG_m8<1#I#@kHq;*jS#xgv?r>fe&q<edW*q?W
z=aq%?f=#{rZWSX)zVg=dDmnN0?+d_YYQGC*_MEh&WStb4zx?mdr*CD!Hry`D+6^`0
z+uy|hJwP8lpA%ocUdm&V%F^Pi4IsYFTbRDPq0C_Oww(WJ(`R@8At(Tzhu>MvHc7?v
zWsK<q5a0jz=hL^XbHE;Wd!-C!#P7rZBtZ@X23VXa(A!?mVGfOj>f61V4QyWK{MVH-
zwfhc3{J8_wpWmKO-(G$L;`EhoVMcs!|7#3#SaIFmy;%yLlct=5ITYqOc=*^||7`KA
zrXA$)Iq`*P{yeXr|9%4~;BRjWz6~?tJ^$}?u*3fBs=n$lNkwxm%%SBl&%wf{cHQ&B
zFF*Mp{(OYy&-wB9?j=Ivb@?`!5%=Z4orffc((kJpfvLd?BO+np^E>AJ;}@S{$qdb(
z_WSqjJq!sJzg(CR`|RJ$hbAht1OSgnSonO~Iq&$z=hhH^cA@#RzOJ&m9TF^aZ^8Xq
zf5ZMUSpD_8s0jcbk?`<AN%m;|L`m*&zm6vK(S#1p&__oTI;@l%EzyD1;}%$nHCm#h
zROzE7I;2V;ZMuv$U67h+qfHlZ6K%AO4)4Q^w$XtFrT=IfeY7(=+8O;RI@%e9jYN!&
rx&UiR#PAt>Bw}>bh3MhM|BM1N>O*rEn=A*8sWN!F`njxgN@xNAySGQ6

diff --git a/Map/Images/sampledone.png b/Map/Images/sampledone.png
index 9ad694fa1fbc661700fe663de0c264088e555212..37d70912a446c87689147fdaf7b69f154b9ee37f 100644
GIT binary patch
literal 7236
zcmeHM|5H*~6ldDDcGPmTW>dFx)?8D|LNiRUWh>HXH5=R6Ny|tx+@!R0(FhlsGR@p%
z7W#tUU}_83F=0zdC6g_+MkQFkBx90HMo^-mlHY*GTjV|3-FDo+;N5w@+<VTu=Y2l+
z+<WdhuW--qs3i^_4k#3A31KHb4u$$89EDo&&1Va&BOR;q#!#r0js*PH?@pDEzS!EW
z#$=x9T3CENOS)~%U0FzY*Sg%|#zjqUyo&<P_)&Wo#s%pe3s$rjB-bg2WhV;FojB0l
z3z*vfe!E7WKExPU@t!$BJZ{mJ%~m8?O53Ms-1ftk$@8s3GT1z`Ov0-LR!!H^6W2bK
zfWUe4#JA;q`T^58*)m$+Pt{ZxUX``tI-G!C&GlufN=;7wY^U#lp6bh-r9=)XUNea1
zLY2JVQf!Ks2(D<Z5lQN6#Gy3H?}7@`+mzKw&80JU;#A<f{v+vN@65RN)2!(Xh2F`)
zj=rZdM0;k{-vPvL^+mXGQ`ms&Bu=Lgbt{h_!)1%AsY0?BC~18e`6zdjkkO3u0N(YJ
z7ctVx83)lVjQjLd4lnI4z)hXt&<|sCL@nz8(@?CLE}P0x%8ito5a99D;Is97u7qo$
zshF4YX45QV^699+irE&PhnIB{FEAUBp`AI$B-)Y)jrh(_BWVTk#_2ZR3{XC*Z{SVp
z5{?SK7|;r`IUYS=q+Yp`BP2mnP=Tr-v*BzQIO<`cwV`osDW)xQbr247@1<4y)<>i~
zd5jr+=Iwn0f0LH|O8-MTm~rBJxBMjQV_9aHP5I4-z=}JP$o3)Zs-VQMeEcbWn+U9%
zz0cepRH~md!D4Pnncqf(QNP$7dI{u5N-?bIjZA51mMOLo?bKp@%v#M%aEOXl02Y(R
zJ`8@fSLi)3H>Pn0FFVfZp{2y&8qozN7^W&6ASPSts9=U|T8@MiiE~YA&;{A%Lt}ql
zLEXvnxg`_(5?GhRb)`OpxZ&GmmJgvy*C+A<6ZgBv+g@}dHCCM?2La3B-j$<W>o-hn
z7EV5Ig<DFGdY{5b2B7bs)2}tSba{8Y_k>JI+59GDQ~MT(6waDU^IERfYhB(2JcJ;R
z1aC?X=ol|wV8i89+p?0FzqF0YonzK5zdvQTW@fV-Qe78XlgJ>wnN*KOz{<)WbqTpx
zyEx>a`pb_|)(Qw#_=5ck*%}vLn3U@1RR@aRRzj1atD}o_G=+@(022ha{*bUfktKlv
zQIQ{?K0K0(ue%WZU@>IYaMOQ7Xhx<pB-apL?eLr<6f*TMriV?`y!*RgL-(UEaV};?
zRQ>@2M?blCefvpnDnuBj<n-FFWg8(bJ7dTSp8M%7VG(w0p)bUrtL$RO`MI^Os)3M4
zfR`j-?_x!=(cj+d88Qxv3<<)RXt-fwiYYacJ|0AN($%tXtd~pRjc7f*I1xuXI-iy)
z&p~o(_o-hB{&t{$;uRa|o-YNiu%Y#PSMzVIl>5WLvC{D)Z}yaHA<yB&@CPq44X|ov
z&-2OD{DZMe<sYEe3)<@K;%)PDE2fO*x+b~8p3u?zP{g4-*n4#i%{ik@edJ|uW5=)$
zC+dWgFxi~fe3>i?U*y+AgTFDhbRyH>JADXR4DSE9QZp~Ap?V=~sI&J%mEV&r2N=!L
ztX%i-<ytDdiP%;3L$5ygYF#!^a$Ui0v17~ZsUeS#+Qom)&uw}lmWSuGLSK42m~tYJ
z&wFI=1q$?uSY(^JA=?z$rna~SpZLf&wH{GOG@Uypk!T8sCnTD(E{l<9YV`)>(u-Vr
zThPd*_di)NlAF$DHX}%GYOS##xhb6GBDpD2LbADnGyo|fAtfZF(rYU!Bb8pX6sh#u
sO5>!DD!qNf`<(0rZO0gLptr@jRr$K{IEC14{X2*v?AVPLY&&%JFOGa@^8f$<

literal 5036
zcmeAS@N?(olHy`uVBq!ia0y~yV76jlU~=GK0*aiHZTY~!AYAO};uumf=j~m?q8LjN
zmV=r1{-2xD%-h*?%}p{gOxZKGp-Vo0{`>Rqzy199WKQup%jfI=zJ5RdZT&yq=OAwV
z!+86;Z#(OnK~i(<zpj_J|NZ9=FNjn8?^gM}^2cCJ{eOS|{{1@MexizJ(9-qy>$84u
zuC)Le@U!^-w$IbI|NW?LaeG@X5Ls{j|NH!f_vh2Ezb^!t^7;Bc`Tbw6?|%rf{O)qL
zNh+Q%V@w}_`2M?Bvw_7k%da+oTwwFo`u%Q*zT@v!H3Dt34d(@0v>V6;nSZ;ic6ZhR
zkn`r1L8UIg3ugA5w4`L6Q~}7w<#$7w!8UJ!Df~9~`(21@lgqC<Oj21n4{B{}`PBnp
zSMS~zi|(TDD?!#<!R=VZ2=Z^`EttaJ=YHpb-Tr6e?kok*Ng?N<)~?%~l>iQl*!vhR
z`h5jxz2;mDU&9pEKCd+gxxM(`jabtODxRyJL#@3YYq|mK{dM^mE~*7tKjj>{ui?S7
z@AE!sklQWm->j4Jn51&G7!uffUayn70rvj&?HDey16l6{vmWkic!b@ryx$8+GeCP(
zJSV-{35k_^rQy6eVDG=ajp3sCAnTVxt+#m#^EEue-tT#T4CMQB@<4ll>EtUkoxI<*
znhosG+h5<J$HQ)akoA|K)*~efm_kG%2HFEmCsj~u%Yj_5L*M=?gQY&Wi$;^_Xfnk}
z6tMI>noLJa)6vp&v@{*9^hYawP-|thZ93XE1vXDd+ooupy3sDwXcua<rw{5SBgQvi
jJ<QRb{t)fy?~NC(T=4hxhJ{Cfqi_tKu6{1-oD!M<OfLn+

diff --git a/Map/MapManager.py b/Map/MapManager.py
index ea8241e..9da9ce5 100644
--- a/Map/MapManager.py
+++ b/Map/MapManager.py
@@ -76,12 +76,13 @@ class MapManager:
     def load(self,mapObject):
         print("Loading map")
         self.tiles = {}
+        self.paintedTile = None
         tileprint = 0
         currentVertical = 0
         currentHorizontal = 0
         currentTile = 0
         for y in range(0, mapObject.get_height()-1):
-            if (y-1) % 5 == 0:
+            if (y-1) % 10 == 0:
                 currentVertical += 1
                 currentHorizontal = 0
             #print(f"Current Vertical:{currentVertical}")
@@ -102,8 +103,8 @@ class MapManager:
                     currentTile += 1
                     currentHorizontal += 1
         self.amountOfTiles = currentTile
-        self.Verticals = 200
-        self.Horizontals = 200
+        self.Verticals = 120
+        self.Horizontals = 80
         print(f"{self.tiles.keys()}")
 
     def populate(self, mapObject):
@@ -152,8 +153,9 @@ class MapManager:
             if tilesMapped[tile.Position[0]][tile.Position[1]] != "":
                 colour = mappedColours[f"{tilesMapped[tile.Position[0]][tile.Position[1]]}"]
                 colour1, colour2, colour3 = colour[0], colour[1], colour[2]
-                tile.paint_pixels(mapObject, int(colour1),int(colour2),int(colour3))
                 tile.add_terrain(f"{tilesMapped[tile.Position[0]][tile.Position[1]]}")
+                tile.paint_pixels(mapObject, int(colour1),int(colour2),int(colour3))
+                tile.findBorder(mapObject)
     
     def findTileAt(self, pos):
         for x in self.tiles.keys():
@@ -170,9 +172,26 @@ class MapManager:
     
     def getTileInfo(self, id):
         info = {}
+        thistile = self.tiles[f"{id}"]
         info["id"] = id
-        info["pixels"] = self.tiles[f"{id}"].getPixels()
-        info["terrain"] = self.tiles[f"{id}"].getTerrain()
+        info["pixels"] = thistile.getPixels()
+        info["terrain"] = thistile.getTerrain()
+        info["border"] = thistile.getBorderPixels()
+        info["gameplay"] = thistile.getGameplayInfo()
+        return info
+    
+    def paintTileBorder(self, id, mapObject):
+        if self.paintedTile != None:
+            self.clearPaintedTile(mapObject)
+            print("Clearing previous tile")
+        tile = self.tiles[f"{id}"]
+        tile.paint_border_pixels(mapObject)
+        self.paintedTile = tile
+    
+    def clearPaintedTile(self, mapObject):
+        self.paintedTile.paint_border_pixels(mapObject)
+        self.paintedTile = None
+        print("Cleared previous tile")
     
         
 class Tile:
@@ -183,6 +202,13 @@ class Tile:
         self.pixels = []
         self.colour = (random.randint(0,255),random.randint(0,255),random.randint(0,255))
         self.terrain = ""
+        self.resources = {}
+        self.buildings = []
+        self.units = {}
+        self.owner = "Unclaimed"
+        self.pop = 0
+        self.borderPixels = []
+        self.borderPainted = False
     
     def getId(self):
         return self.Id
@@ -192,14 +218,53 @@ class Tile:
     
     def getTerrain(self):
         return self.terrain
+    
+    def getBorderPixels(self):
+        return self.borderPixels
+    
+    def getGameplayInfo(self):
+        infoToSend = (("resources", self.resources), ("buildings", self.buildings), ("units", self.units), ("owner", self.owner), ("population", self.pop))
+        return infoToSend
 
     def add_pixel(self,pixel):
         self.pixels.append(pixel)
 
     def add_terrain(self, terrain):
         self.terrain = terrain
+        #print(f"Added terrain for tile {self.Id}, it is now a {self.terrain} / {terrain} biome")
 
     def paint_pixels(self, map, r,g,b):
         for pixel in self.pixels:
             map.set_at((pixel[0],pixel[1]), (r,g,b,255))
+    
+    def paint_border_pixels(self, map):
+        if self.borderPainted == False:
+            print(f"Painting border for tile {self.Id}")
+            for pixel in self.borderPixels:
+                map.set_at((pixel[0],pixel[1]), (255,255,255,255))
+            self.borderPainted = True
+        else:
+            print(f"Clearing border for tile {self.Id}")
+            for pixel in self.borderPixels:
+                map.set_at((pixel[0],pixel[1]), (0,0,0,255))
+
+    def findBorder(self, map):
+        for pixel in self.pixels:
+            #check above
+            if pixel[1] != 0:
+                if map.get_at((pixel[0],pixel[1]-1)) == ((0,0,0,255)):
+                    self.borderPixels.append((pixel[0],pixel[1]-1))
+            #check right
+            if pixel[0] < map.get_width()-1:
+                if map.get_at((pixel[0]+1,pixel[1])) == ((0,0,0,255)):
+                    self.borderPixels.append((pixel[0]+1,pixel[1]))
+            #check below
+            if pixel[1] < map.get_height()-1:
+                if map.get_at((pixel[0],pixel[1]+1)) == ((0,0,0,255)):
+                    self.borderPixels.append((pixel[0],pixel[1]+1))
+            #check left
+            if pixel[0] != 0:
+                if map.get_at((pixel[0]-1,pixel[1])) == ((0,0,0,255)):
+                    self.borderPixels.append((pixel[0]-1,pixel[1]))
+
 
diff --git a/Map/__pycache__/MapManager.cpython-312.pyc b/Map/__pycache__/MapManager.cpython-312.pyc
index 66151b7ee3f501b27be60984696558315cfb524d..d751afa0c4c59879de4338591544b20e6ce6fe0b 100644
GIT binary patch
delta 5338
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

delta 2112
zcmZ8ieQXp}5Z|}Adw0Fh*1Ps@w_n%RV)qIZ6`Cup7?ki)pcE~F+ISq@qh4w6j<;8_
zrC%CMuA~U{84)#r|Ec@~)Pz4wj2MFrCZ<h6n#HJze-RTSR}%sW#+luowrsM$dv9j;
z_h#nJ%$?M(?eYBJb~`wDiu$V#PFGEO-XP)0cj|=!t75zK&0T>g?6UZApz-<joqM!6
z)jGGvlF4}Irnq(}lS)tZS(`2VZ#?_eE3Zs&LtK;~7d|RK%)@JeSAbW{h^8DhLxhDa
zWo*Pz#OfVk=MoJYSzF0Q9YNOR@Ubr(<;2aV9Zkf`c9-~Au`|N{F7~ng&RuM$(_c?A
z#d*#l=Y_?Sm&jcI%h;dJXUd&<Yt;^(x|Z$SY^zIQZIAg_`#L+DaCu1q`@|(}M&GCv
z;Eo?xHe5{uC|+Gm(?l|(i<v}kT+>AwOLoU8vQj*V769l%2Pmn`-0s~FO4PmG>P4N0
zU3Bjt5_{;bEdB@_ALD+uyR&^a>}B)Cfvhm$U`?JD+u`wn4>ukknHuthNu(kx+^`41
z?3DksJSm^9oUEKHs-7vVxoNMZr9j%n1LPk(+yd`HXzCYlk5&AU<A$B=a8ZD%B|ovV
zfmU`r;AiUtJNbzjRuJqdtpMXY_=RrkO7*7tsdfkX6dw(-cZ1E<)v%!oLLC}8yW^Q?
zCQfNAk)%~94zoXkPqwVUr4fFuVHQ)>yqQu+-Kecc1?kaALU$Ue+Zjuz<0@@ps<bxf
zL9Nwvfj*7)YZ2D5i;@HhyDn8*`#_+@r*hJSMX(m^CG4&85w@zLf;}v+TXVDUrMqsF
z-p_3#T(J56TuG-EgfFgEm$f^rS2q;2i>_~NBCKabz^So{2gGNbYDuRw4O0*bjZul6
z2t~-J>{@7ayBQxSbW1Ebpcg>w?TI(zy&A=EbrJU4R2qV{BA7A00&9w-v<*NL07Cmi
zAz(dKwSt^wSE{a%QkJTg{2zeoG?(Cpp(%!Vm9)T~Rjn#v-da1~V_~sM*$#4kxm-l~
zdo}j90XVWv=M$=KO&c!hw#8dfEattu286l;T<kD!3*^Q%96-5{NFGcr#*E(mUQ_q#
z1yE?M0At*|w<s$Z6`AcAcg#!W=j1c;d3s)*l~&%88fT@(IVqAAvirt8^K!+x@R{&u
z{Q1nRyy})5nUy1R@_JCdeB5i)XPaVY(I;wE8K`L^LI=Wrgl>d=2w2HfLcpXMfD0`I
zaE!|dn~3Po?cgiL6}jg~gSeOE4iKm4Uyuc{+58yICzCIf(;8TG;eF;GY-8LnOmpn*
zy6I6Pc@)ds=xZ8*m15I*xXjHc>_XTApxdCiRcLnlB8pUid>XMBbxZqyl>=Esi9H%k
zBomovbkL0xV0C``B`CFB0FYcZ9Bvg(xM(T+Cmh+d7laC-$oDxhu1Ld)X7bS}EC(G1
zl~HY9!Cu2Y!%Om=JTiVH>oJM8ED{;cQ#4ybgT*lD$<vrc{59I(*fOb(jvt+|%O=-W
z<N|LnVEQOm9E5}3JlA4%T?OG1vZ3*z8G9*^L8-G#tDoIqILDir#lIbeH>>d}{0?sd
zn*@I7;{c1E;tVm0`#ZL}p&a^VN5h&LB%=KQc?R@x8AB^O*HG;L9>q8fA-Vv}P$S>d
z4e#&5{ODE<##k()SWPbqQAVgvx^;4Z8a`pogp9}Z3&+}Ekr8zoW?#niOuNo5tl2n<
z#oMMh=<D!H69_#BX#~7MiutFQI3qraT}F}d(b}&;8Ny|FHMGFm7ezVeAz~nBC1NQ;
z8A3He<${$LQ%z<E;D<1YuyW}}1OdU|T;5|3>@9sMwZAvMfewQS7K(<0{x1t5<TmHN
Z%@y7g4)LV<E{AxpQ<O<ljsq|b`WG|M?Na~%

diff --git a/Map/__pycache__/TileTypes.cpython-312.pyc b/Map/__pycache__/TileTypes.cpython-312.pyc
index 5303f28276a7ed7fcff9063c58b62105a8603488..b0bab43bf18d784819f0a64853b08a87c8843806 100644
GIT binary patch
delta 58
zcmeBHnWDmdnwOW00SJWKWH)kmvMSg)Tg8MHrxq2*WF+S0CC0eqCzs}?=9Lu3xM!Al
MlqPLn&6>ai0OP<Ci2wiq

delta 49
zcmbQD(yhXMnwOW00SJU2%WvfFWED4cwu%WYPAw{q@kq?eOO0_!EzT~<FW9_=HGu~J
DQvDB1

diff --git a/Script/__pycache__/ScriptUtils.cpython-312.pyc b/Script/__pycache__/ScriptUtils.cpython-312.pyc
index 69d7e6bc7f15f993b481e7872b03da375f8c2db4..24c6d33af90715deb6a6753240486312865f4482 100644
GIT binary patch
delta 55
zcmbQuxP+1WG%qg~0}z-N$xh@pR&aK<iU}=FEh>)5NX*MijB&|NF3nBND=Cg~&n)pM
JO_~_$1^}Yg5m*2K

delta 46
zcmZ3&IGd6CG%qg~0}y!Lk(<bEEN<m&6%$&VT2vh4k(ig48sm~$oL!P%Ffq;z03ksR
AI{*Lx

diff --git a/cache.py b/cache.py
new file mode 100644
index 0000000..4565da3
--- /dev/null
+++ b/cache.py
@@ -0,0 +1,63 @@
+def initMapGen():
+    y = 0
+    bY = 5
+    bX = 4
+    while bX < mapWidth:
+        for x in range(bX, mapWidth):
+            if y < mapHeight:    
+                map.set_at((x, y), (0,0,0,255))
+                y += 1
+                if y % 5 == 0:
+                    map.set_at((x, y), (0,0,0,255))
+                    y += 1
+        screen.blit(map, maprect)
+        pygame.display.flip()
+        bX += 8
+        y = 0
+
+    y = bY
+
+    while bY < mapHeight:
+        for x in range(0, mapWidth):
+            if y < mapHeight:    
+                map.set_at((x, y), (0,0,0,255))
+                y += 1
+                if y % 5 == 0:
+                    map.set_at((x, y), (0,0,0,255))
+                    y += 1
+        screen.blit(map, maprect)
+        pygame.display.flip()
+        bY += 10
+        y = bY
+
+    bX = 4
+    y = 0
+
+    while bX < mapWidth:
+        for x in range(bX, -1, -1):
+            if y < mapHeight:    
+                map.set_at((x, y), (0,0,0,255))
+                y += 1
+                if y % 5 == 0:
+                    map.set_at((x, y), (0,0,0,255))
+                    y += 1
+        screen.blit(map, maprect)
+        pygame.display.flip()
+        bX += 8
+        y = 0
+
+    bY = 2
+    y = bY
+
+    while bY < mapHeight:
+        for x in range(mapWidth, 0, -1):
+            if y < mapHeight:    
+                map.set_at((x, y), (0,0,0,255))
+                y += 1
+                if y % set_at((x, y), (0,0,0,255))
+                    y5 == 0:
+                    map. += 1
+        screen.blit(map, maprect)
+        pygame.display.flip()
+        bY += 10
+        y = bY
\ No newline at end of file