s444350/SZI-Smieciarka
2
2
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mergeradd

Browse Source
This commit is contained in:
Bowske 2020-04-26 13:32:47 +02:00
parent 8b609f0259
commit f7612970d2
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modele.py
View File

@ -4,9 +4,7 @@ import os
import pygame import pygame
import game import game
import random import random
<< << << < HEAD
== == == =
>>>>>> > 7cb3aa904cd3d316c84df69942bbfdf66561a2e9
# wysokosc i szerokosc kazdej kratki # wysokosc i szerokosc kazdej kratki
WIDTH = 60 WIDTH = 60
@ -148,17 +146,12 @@ class Kratka(pygame.sprite.Sprite):
def __init__(self, poz_x, poz_y): def __init__(self, poz_x, poz_y):
self.pozX = poz_x self.pozX = poz_x
self.pozY = poz_y self.pozY = poz_y
<< << << < HEAD
== == == =
self.pozycja = (self.pozX, self.pozY) self.pozycja = (self.pozX, self.pozY)
self.rodzic = None self.rodzic = None
self.jestDomem = False self.jestDomem = False
self.jestKontenerem = False self.jestKontenerem = False
self.jestWysypiskiem = False self.jestWysypiskiem = False
self.jestPrzeszkoda = False self.jestPrzeszkoda = False
>>>>>> > 7cb3aa904cd3d316c84df69942bbfdf66561a2e9
self.kolor = GREY self.kolor = GREY
self.obiekt = None self.obiekt = None
self.g = 0 # Distance to start node self.g = 0 # Distance to start node