diff --git a/land.py b/land.py new file mode 100644 index 00000000..bbed151e --- /dev/null +++ b/land.py @@ -0,0 +1,25 @@ +import pygame +import random + +class Land: + def __init__(self, cell_size, cell_number, grass_body): + self.grass_image = pygame.image.load(r'resources/grass.png').convert() + self.grass_image = pygame.transform.scale(self.grass_image, (cell_size, cell_size)) + + self.bad_grass_image = pygame.image.load(r'resources/bad_grass.png').convert() + self.bad_grass_image = pygame.transform.scale(self.bad_grass_image, (cell_size, cell_size)) + + for i in range(0, cell_number): + for k in range(0, cell_number): + grass_body.append([i,k]) + + + def place_grass(self, parent_screen, cell_number, cell_size, grass_body, name): + for body in grass_body: + x = int(body[0] * cell_size) + y = int(body[1] * cell_size) + if(name == 'good'): + parent_screen.blit(self.grass_image, (x, y)) + if(name == 'bad'): + parent_screen.blit(self.bad_grass_image, (x, y)) + \ No newline at end of file diff --git a/main.py b/main.py index 6c40793f..fba8d115 100644 --- a/main.py +++ b/main.py @@ -1,5 +1,6 @@ import pygame import random +import land import tractor import blocks from pygame.locals import * @@ -16,18 +17,16 @@ class Game: self.green_leaf_body = [] self.stone_body = [] self.flower_body = [] - + self.dead_grass_body = [] + self.grass_body = [] + self.entire_block = {} pygame.init() self.surface = pygame.display.set_mode((self.cell_size*self.cell_number, self.cell_size*self.cell_number)) # initialize a window - self.grass_image = pygame.image.load(r'resources/grass.png').convert() - self.grass_image = pygame.transform.scale(self.grass_image, (self.cell_size, self.cell_size)) - - self.bad_grass_image = pygame.image.load(r'resources/bad_grass.png').convert() - self.bad_grass_image = pygame.transform.scale(self.bad_grass_image, (self.cell_size, self.cell_size)) + self.land = land.Land(self.cell_size, self.cell_number, self.grass_body) self.blocks = blocks.Blocks(self.surface,self.cell_size) @@ -62,17 +61,15 @@ class Game: self.tractor.move('right',self.cell_size, self.cell_number) if pygame.key.get_pressed()[K_SPACE]: self.tractor.water(self.dead_leaf_body, self.green_leaf_body, self.cell_size) + #self.tractor.water(self.grass_body, self.dead_grass_body, self.cell_size) + elif event.type == QUIT: running = False self.surface.fill((140, 203, 97)) # background color - for i in range(0, self.cell_number): - for k in range(0, self.cell_number): - x = int(i * self.cell_size) - y = int(k * self.cell_size) - self.surface.blit(self.grass_image, (x, y)) - + self.land.place_grass(self.surface, self.cell_number, self.cell_size, self.grass_body, 'good') + #self.land.place_grass(self.surface, self.cell_number, self.cell_size, self.dead_grass_body, 'bad') self.blocks.place_blocks(self.surface, self.cell_size, self.dead_leaf_body, 'leaf') self.blocks.place_blocks(self.surface, self.cell_size, self.green_leaf_body, 'alive') diff --git a/resources/bad_grass.png b/resources/bad_grass.png index 511a978c..56a856a4 100644 Binary files a/resources/bad_grass.png and b/resources/bad_grass.png differ diff --git a/tractor.py b/tractor.py index 7fb68a9f..58d9678e 100644 --- a/tractor.py +++ b/tractor.py @@ -1,6 +1,5 @@ import pygame import random -from pygame.math import Vector2 class Tractor: def __init__(self, parent_screen, cell_size):