mergeradd
This commit is contained in:
parent
8b609f0259
commit
f7612970d2
@ -4,9 +4,7 @@ import os
|
||||
import pygame
|
||||
import game
|
||||
import random
|
||||
<< << << < HEAD
|
||||
== == == =
|
||||
>>>>>> > 7cb3aa904cd3d316c84df69942bbfdf66561a2e9
|
||||
|
||||
|
||||
# wysokosc i szerokosc kazdej kratki
|
||||
WIDTH = 60
|
||||
@ -148,17 +146,12 @@ class Kratka(pygame.sprite.Sprite):
|
||||
def __init__(self, poz_x, poz_y):
|
||||
self.pozX = poz_x
|
||||
self.pozY = poz_y
|
||||
|
||||
|
||||
<< << << < HEAD
|
||||
== == == =
|
||||
self.pozycja = (self.pozX, self.pozY)
|
||||
self.rodzic = None
|
||||
self.jestDomem = False
|
||||
self.jestKontenerem = False
|
||||
self.jestWysypiskiem = False
|
||||
self.jestPrzeszkoda = False
|
||||
>>>>>> > 7cb3aa904cd3d316c84df69942bbfdf66561a2e9
|
||||
self.kolor = GREY
|
||||
self.obiekt = None
|
||||
self.g = 0 # Distance to start node
|
||||
|
Loading…
Reference in New Issue
Block a user