From 577de170f0cb2a18c1ff1ce4b0d0f0048e90e8dc Mon Sep 17 00:00:00 2001
From: Adnovac <annadnowak98@gmail.com>
Date: Tue, 19 Mar 2019 11:47:23 +0100
Subject: [PATCH] Big update

---
 game.py                                  |  56 ++++++++++++++++++++---
 images/{tile.png => grass.png}           | Bin
 images/{house_empty.png => house.png}    | Bin
 sprites/__pycache__/cell.cpython-36.pyc  | Bin 0 -> 594 bytes
 sprites/__pycache__/grass.cpython-36.pyc | Bin 0 -> 559 bytes
 sprites/__pycache__/house.cpython-36.pyc | Bin 0 -> 559 bytes
 sprites/cell.py                          |   7 +--
 sprites/grass.py                         |   8 ++--
 sprites/house.py                         |   8 ++++
 9 files changed, 66 insertions(+), 13 deletions(-)
 rename images/{tile.png => grass.png} (100%)
 mode change 100644 => 100755
 rename images/{house_empty.png => house.png} (100%)
 create mode 100644 sprites/__pycache__/cell.cpython-36.pyc
 create mode 100644 sprites/__pycache__/grass.cpython-36.pyc
 create mode 100644 sprites/__pycache__/house.cpython-36.pyc
 create mode 100644 sprites/house.py

diff --git a/game.py b/game.py
index bd1d960..cbd005f 100644
--- a/game.py
+++ b/game.py
@@ -1,16 +1,60 @@
 from pygame import *
+import sys, random
 from sprites.grass import Grass
+from sprites.house import House
+from pygame.locals import *
+
+all_sprites = sprite.Group()
 cells = []
 FPS = 5
 cell_size = 64
+fps_clock = time.Clock()
 
-PLAY_WIDTH = 640
-PLAY_HEIGHT = 640
+#Tu będzie zmienna do wybrania przez użytkownika na start/ do zmiany w trakcie "gry"
+home_amount = 9
+
+#Obszar przeznaczony na płyki
+PLAY_WIDTH = (home_amount+1)*64
+PLAY_HEIGHT = PLAY_WIDTH
+
+#Całe okno gry (z przyszłym hud'em)
 WINDOW_WIDTH = PLAY_WIDTH + 100
 WINDOW_HEIGHT = PLAY_HEIGHT + 100
+GAMEWINDOW = display.set_mode((WINDOW_WIDTH, WINDOW_HEIGHT), 0, 32)
+WHITE = (255, 255, 255)
+display.set_caption('Śmieciarz WMI')
 
-
-for x in range(WINDOW_HEIGHT//64):
+#Dodawanie pól typu Grass
+for x in range(PLAY_HEIGHT//64):
     cells.append([])
-    for y in range(WINDOW_HEIGHT//64):
-        cells[x].append(grass(x,y))
+    for y in range(PLAY_HEIGHT//64):
+        grass = Grass(x,y)
+        cells[x].append(grass)
+
+
+#Losowanie  domków i dodawanie je do mapy
+for x in range(home_amount):
+    #Sprawdzenie, czy istnieje już domek na danej pozycji, jeżeli tak to losuj ponownie
+     x = random.randint(0, (PLAY_WIDTH//64)-1)
+     y = random.randint(0, (PLAY_WIDTH//64)-1)
+     print(x,y)
+     house = House(x,y)
+     cells[x][y] = house
+
+#Dodawanie wszystkich spritow do grupy spritow
+for x in range(len(cells)):
+    for y in range(len(cells[x])):
+        all_sprites.add(cells[x][y])
+
+#Sama gierka
+while(1):
+    for e in event.get():
+        if e.type == QUIT:
+            quit()
+            sys.exit()
+
+    all_sprites.update()
+    all_sprites.draw(GAMEWINDOW)
+
+    display.flip()
+    fps_clock.tick(FPS)
diff --git a/images/tile.png b/images/grass.png
old mode 100644
new mode 100755
similarity index 100%
rename from images/tile.png
rename to images/grass.png
diff --git a/images/house_empty.png b/images/house.png
similarity index 100%
rename from images/house_empty.png
rename to images/house.png
diff --git a/sprites/__pycache__/cell.cpython-36.pyc b/sprites/__pycache__/cell.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..e47bd020ba0f34c4580697f4c8e016f8ddcc2d21
GIT binary patch
literal 594
zcmYjNOK#gR5S<ZeMK$VV;{#-?F023v`T^R)Kneuicu{vH6d(kVO|8<Ok}^;S+Bpa4
zHF}Spg4?cgg|7N&!GMRDH$#l(>G55UM#DFMeto%MqQ7(!68#kEuK=1fTPpj?CF7ph
z<TKro7Fs@%mWCS9$h{~Bn&*@cp0Gu;oCCk8V|$DQ%@pa!07H?gOf>7{kxHQjR%MX4
z#@brogBY<6khe(x8qiY1P11;t_RQ3AM@n`HaDYkLvF0&#;2cA==Doz^OcR)s+0zvJ
zc^1;m?!H=@kot{Vw5apGW=btqi&m+?KLhWA{AB7jNC(VCklxs@?incD5b&GaIm*9x
z#kcj+6u#YRvub_eZ?11%y}T+u82`OpZ;JWHVpjQw>hgYJTvhbH^hJ$FPBuH2fg?rw
z*btv{it{jv9!!pMW^e`CR?rM>L#38$y|uA_uGEihW&6p2>mcd`F2L%JCi>`q#)o^J
ry69^Ve&@recVuGMb!EMag5240^MozF*hR{az3oN3kCZ+xWE{_bAKQW!

literal 0
HcmV?d00001

diff --git a/sprites/__pycache__/grass.cpython-36.pyc b/sprites/__pycache__/grass.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..648142c48d523405573f0c548223cfd5b7683c82
GIT binary patch
literal 559
zcmYjO!AiqG5S`ggN~o=P@B_T|(iB=0M5Iumc<IGk5SGwgV`|dYObWL2)_#D$;ctjv
zu~$$2f+uHFs~vc=Gn<(=Z#La#vwr#UdjAdppNv2AIO;Q~!%l<745HnM5ppgvk;_OT
z3_(lnZ9#iRZe-+Xyn~ki#a%FJq4fqP%f>F-o8X|&pi_1R99twbYO#e#YRTQ6^@l}F
zG?rZ9%$-iqfI(;MN|@jp*0>fMmQad`obccc-zlkqDa2@XlIC$@C`=qxdp=ECe&J@@
zK&f<^mP*;$e3`_#v3^x*y=)fimb4z3?7`xT#pN3mN8Iy$9X`%-6H>X*W?E86y>9Q~
zyc6CSdMao0@a{Go#k7jglGGG&Nb@2s|7R}?r@qD@7XTjP>bP35z1K40ty$QV<*=~2
zQu$0TG8Z?LdS1lY?n^~fNjh*1rYzhW`3!P923Y01vAeR8mJ~I9MYYHLN2-^oY7ThZ
VriCN3!PRd3HF8Eycz^*m#1B~8ebE2_

literal 0
HcmV?d00001

diff --git a/sprites/__pycache__/house.cpython-36.pyc b/sprites/__pycache__/house.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..0f044c22dc6cafbdd87d403679ae7162be1efcb1
GIT binary patch
literal 559
zcmYjO!A`<J5S`g=O@lx@_yJtGP!fn<3?acpy>Q{ym~0w$#bOKCDTxqn@B#jYzhV4}
zy?XK&JULrLndHsRY-irQ*>-BRO7G+K{v7~58Gq(+)Mrqeod%65MEesX<Xog8laWNY
z0WGz+1ML~Pm64}$1Wo^oyI|Nv>kUkrj$L*z!9kxv=j;qPwn%8yVh54blDj?Y-_Dn0
z#*!<Xxzh<6FsQ+<fGKWZgB!7B35A%-DG%QAost@uLJZeuNfu8Gg^!M^wU|wse(q-5
zK&fPw6iV5X#cC2~#`<Nc_0oB)o6>q@(g%w#7FTbOpK{N4k7+U!QnA!#R!~UYPWSSn
z9bOxHD&~uDbQca|TE~q^V)8hoMV=J@vsbxOf5IRa0M>C`FIQ|Gv<!J`7B*u!EUcnb
zHrLD4#Z{%AmvOrPQWBMtj$D-~bN5C*gWQe*mN{?iuB@aL+3K&T)|mfD`4VN#5s%w6
UcVsrW+K=xcXXJzj7+_WW0G024WdHyG

literal 0
HcmV?d00001

diff --git a/sprites/cell.py b/sprites/cell.py
index 7eb962e..babf778 100644
--- a/sprites/cell.py
+++ b/sprites/cell.py
@@ -1,9 +1,10 @@
-from pygame import *
+# -*- coding: utf-8 -*-
+import pygame
 import sys
 from pygame.locals import *
-class Cell(pygame.sprite.Sprites):
+class Cell(pygame.sprite.Sprite):
     def __init__(self,x,y):
-        sprite.Sprite.__init__(self)
+        pygame.sprite.Sprite.__init__(self)
         self.x = x
         self.y = y
         self.rect = pygame.Rect(x*64,y*64, 64,64)
diff --git a/sprites/grass.py b/sprites/grass.py
index e75e6ed..5eda041 100644
--- a/sprites/grass.py
+++ b/sprites/grass.py
@@ -1,8 +1,8 @@
-from pygame import *
+import pygame
 import sys
-from cell import Cell
+from sprites.cell import Cell
 
 class Grass(Cell):
-    def __init__(x,y):
+    def __init__(self,x,y):
         Cell.__init__(self,x,y)
-        self.image = pygame.image.load("/images/grass.png")
+        self.image = pygame.image.load("images/grass.png")
diff --git a/sprites/house.py b/sprites/house.py
new file mode 100644
index 0000000..3ec092b
--- /dev/null
+++ b/sprites/house.py
@@ -0,0 +1,8 @@
+import pygame
+import sys
+from sprites.cell import Cell
+
+class House(Cell):
+    def __init__(self,x,y):
+        Cell.__init__(self,x,y)
+        self.image = pygame.image.load("images/house.png")