Merge pull request 'added new classes + minor changes' (#1) from add_classes into master
Reviewed-on: #1
This commit is contained in:
commit
d72ba00909
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
85
main.py
85
main.py
@ -2,9 +2,24 @@ import pygame
|
|||||||
|
|
||||||
|
|
||||||
class Field:
|
class Field:
|
||||||
def __init__(self, isWet, thingOn):
|
def __init__(self, fieldType, plantType, isWet, wetTime, isFertilized, fertilizedTime):
|
||||||
self.isWet = isWet
|
self.fieldType = fieldType # good/bad
|
||||||
self.thingOn = thingOn
|
self.plantType = plantType # wheat/carrot/cabbage
|
||||||
|
self.isWet = isWet # yes/no
|
||||||
|
self.wetTime = wetTime # number
|
||||||
|
self.isFertilized = isFertilized # yes/no
|
||||||
|
self.fertilizedTime = fertilizedTime # number
|
||||||
|
|
||||||
|
|
||||||
|
class Plant:
|
||||||
|
def __init__(self, plantType, growthState):
|
||||||
|
self.plantType = plantType # wheat/carrot/cabbage
|
||||||
|
self.growthState = growthState # growing/grown
|
||||||
|
|
||||||
|
|
||||||
|
class Fertilizer:
|
||||||
|
def __init__(self, fertilizerType):
|
||||||
|
self.fertilizerType = fertilizerType # wheat/carrot/cabbage
|
||||||
|
|
||||||
|
|
||||||
class Player:
|
class Player:
|
||||||
@ -13,19 +28,22 @@ class Player:
|
|||||||
rotation = 0
|
rotation = 0
|
||||||
|
|
||||||
|
|
||||||
T = [[Field(1, 0), Field(0, 0), Field(0, 1), Field(0, 2), Field(0, 3), Field(1, 0), Field(1, 0), Field(1, 0)],
|
T = [[Field(1,0,0,0,0,0),Field(0,0,1,0,0,0),Field(1,1,1,0,0,0),Field(1,2,0,0,0,0),Field(0,3,1,0,0,0),Field(0,0,0,0,0,0),Field(0,0,0,0,0,0),Field(1,0,1,0,0,0),Field(1,0,0,0,0,0),Field(1,0,1,0,0,0)],
|
||||||
[Field(1, 0), Field(0, 0), Field(0, 1), Field(0, 2), Field(0, 3), Field(1, 0), Field(1, 0), Field(1, 0)],
|
[Field(1,0,0,0,0,0),Field(0,0,1,0,0,0),Field(1,1,1,0,0,0),Field(1,2,0,0,0,0),Field(0,3,1,0,0,0),Field(0,0,0,0,0,0),Field(0,0,0,0,0,0),Field(1,0,1,0,0,0),Field(1,0,0,0,0,0),Field(1,0,1,0,0,0)],
|
||||||
[Field(1, 0), Field(0, 0), Field(0, 1), Field(0, 2), Field(0, 3), Field(1, 0), Field(1, 0), Field(1, 0)],
|
[Field(1,0,0,0,0,0),Field(0,0,1,0,0,0),Field(1,1,1,0,0,0),Field(1,2,0,0,0,0),Field(0,3,1,0,0,0),Field(0,0,0,0,0,0),Field(0,0,0,0,0,0),Field(1,0,1,0,0,0),Field(1,0,0,0,0,0),Field(1,0,1,0,0,0)],
|
||||||
[Field(1, 0), Field(0, 0), Field(0, 1), Field(0, 2), Field(0, 3), Field(1, 0), Field(1, 0), Field(1, 0)],
|
[Field(1,0,0,0,0,0),Field(0,0,1,0,0,0),Field(1,1,1,0,0,0),Field(1,2,0,0,0,0),Field(0,3,1,0,0,0),Field(0,0,0,0,0,0),Field(0,0,0,0,0,0),Field(1,0,1,0,0,0),Field(1,0,0,0,0,0),Field(1,0,1,0,0,0)],
|
||||||
[Field(1, 0), Field(0, 0), Field(0, 1), Field(0, 2), Field(0, 3), Field(1, 0), Field(1, 0), Field(1, 0)],
|
[Field(1,0,0,0,0,0),Field(0,0,1,0,0,0),Field(1,1,1,0,0,0),Field(1,2,0,0,0,0),Field(0,3,1,0,0,0),Field(0,0,0,0,0,0),Field(0,0,0,0,0,0),Field(1,0,1,0,0,0),Field(1,0,0,0,0,0),Field(1,0,1,0,0,0)],
|
||||||
[Field(1, 0), Field(0, 0), Field(0, 1), Field(0, 2), Field(0, 3), Field(1, 0), Field(1, 0), Field(1, 0)],
|
[Field(1,0,0,0,0,0),Field(0,0,1,0,0,0),Field(1,1,1,0,0,0),Field(1,2,0,0,0,0),Field(0,3,1,0,0,0),Field(0,0,0,0,0,0),Field(0,0,0,0,0,0),Field(1,0,1,0,0,0),Field(1,0,0,0,0,0),Field(1,0,1,0,0,0)],
|
||||||
[Field(1, 0), Field(0, 0), Field(0, 1), Field(0, 2), Field(0, 3), Field(1, 0), Field(1, 0), Field(1, 0)],
|
[Field(1,0,0,0,0,0),Field(0,0,1,0,0,0),Field(1,1,1,0,0,0),Field(1,2,0,0,0,0),Field(0,3,1,0,0,0),Field(0,0,0,0,0,0),Field(0,0,0,0,0,0),Field(1,0,1,0,0,0),Field(1,0,0,0,0,0),Field(1,0,1,0,0,0)],
|
||||||
[Field(1, 0), Field(0, 0), Field(0, 1), Field(0, 2), Field(0, 3), Field(1, 0), Field(1, 0), Field(1, 0)]]
|
[Field(1,0,0,0,0,0),Field(0,0,1,0,0,0),Field(1,1,1,0,0,0),Field(1,2,0,0,0,0),Field(0,3,1,0,0,0),Field(0,0,0,0,0,0),Field(0,0,0,0,0,0),Field(1,0,1,0,0,0),Field(1,0,0,0,0,0),Field(1,0,1,0,0,0)],
|
||||||
|
[Field(1,0,0,0,0,0),Field(0,0,1,0,0,0),Field(1,1,1,0,0,0),Field(1,2,0,0,0,0),Field(0,3,1,0,0,0),Field(0,0,0,0,0,0),Field(0,0,0,0,0,0),Field(1,0,1,0,0,0),Field(1,0,0,0,0,0),Field(1,0,1,0,0,0)],
|
||||||
|
[Field(1,0,0,0,0,0),Field(0,0,1,0,0,0),Field(1,1,1,0,0,0),Field(1,2,0,0,0,0),Field(0,3,1,0,0,0),Field(0,0,0,0,0,0),Field(0,0,0,0,0,0),Field(1,0,1,0,0,0),Field(1,0,0,0,0,0),Field(1,0,1,0,0,0)]]
|
||||||
|
|
||||||
pygame.init()
|
pygame.init()
|
||||||
|
|
||||||
player = Player()
|
player = Player()
|
||||||
|
|
||||||
screen = pygame.display.set_mode([500, 500])
|
screen = pygame.display.set_mode([600, 600])
|
||||||
|
|
||||||
running = True
|
running = True
|
||||||
clock = pygame.time.Clock()
|
clock = pygame.time.Clock()
|
||||||
@ -37,44 +55,47 @@ while running:
|
|||||||
if event.key == pygame.K_LEFT:
|
if event.key == pygame.K_LEFT:
|
||||||
if player.x > 0:
|
if player.x > 0:
|
||||||
player.x = player.x - 1
|
player.x = player.x - 1
|
||||||
if event.key ==pygame.K_UP:
|
if event.key == pygame.K_UP:
|
||||||
if player.y > 0:
|
if player.y > 0:
|
||||||
player.y = player.y - 1
|
player.y = player.y - 1
|
||||||
if event.key ==pygame.K_RIGHT:
|
if event.key == pygame.K_RIGHT:
|
||||||
if player.x < 7:
|
if player.x < 9:
|
||||||
player.x = player.x + 1
|
player.x = player.x + 1
|
||||||
if event.key ==pygame.K_DOWN:
|
if event.key == pygame.K_DOWN:
|
||||||
if player.y < 7:
|
if player.y < 9:
|
||||||
player.y = player.y + 1
|
player.y = player.y + 1
|
||||||
screen.fill((178, 255, 51))
|
|
||||||
img1 = pygame.image.load('1.png')
|
screen.fill((175, 255, 50))
|
||||||
img2 = pygame.image.load('2.png')
|
imgWheat = pygame.image.load('img/wheat.png')
|
||||||
img3 = pygame.image.load('3.png')
|
imgCarrot = pygame.image.load('img/carrot.png')
|
||||||
imgPlayer = pygame.image.load('player.png')
|
imgCabbage = pygame.image.load('img/cabbage.png')
|
||||||
|
imgPlayer = pygame.image.load('img/player.png')
|
||||||
|
|
||||||
i = 0
|
i = 0
|
||||||
while i < len(T):
|
while i < len(T):
|
||||||
j = 0
|
j = 0
|
||||||
while j < len(T[i]):
|
while j < len(T[i]):
|
||||||
color = (0, 0, 0)
|
color = (0, 0, 0)
|
||||||
if T[i][j].isWet == 0:
|
if T[i][j].isWet == 0:
|
||||||
color = (160, 82, 45)
|
color = (160, 80, 40)
|
||||||
else:
|
else:
|
||||||
color = (51, 25, 0)
|
color = (50, 25, 0)
|
||||||
pygame.draw.rect(screen, color, pygame.Rect(50 + 50 * i, 50 + 50 * j, 50, 50))
|
pygame.draw.rect(screen, color, pygame.Rect(50 + 50 * i, 50 + 50 * j, 50, 50))
|
||||||
if T[i][j].thingOn==1:
|
if T[i][j].plantType == 1:
|
||||||
screen.blit(img1, (50 + 50 * i, 50 + 50 * j))
|
screen.blit(imgWheat, (50 + 50 * i, 50 + 50 * j))
|
||||||
if T[i][j].thingOn==2:
|
if T[i][j].plantType == 2:
|
||||||
screen.blit(img2, (50 + 50 * i, 50 + 50 * j))
|
screen.blit(imgCarrot, (50 + 50 * i, 50 + 50 * j))
|
||||||
if T[i][j].thingOn==3:
|
if T[i][j].plantType == 3:
|
||||||
screen.blit(img3, (50 + 50 * i, 50 + 50 * j))
|
screen.blit(imgCabbage, (50 + 50 * i, 50 + 50 * j))
|
||||||
j = j + 1
|
j = j + 1
|
||||||
i = i + 1
|
i = i + 1
|
||||||
|
|
||||||
i = 0
|
i = 0
|
||||||
while i < len(T)+1:
|
while i < len(T)+1:
|
||||||
pygame.draw.line(screen, (0, 0, 0), (50 + i * 50, 50), (50 + i * 50, 50 + len(T) * 50),5)
|
pygame.draw.line(screen, (0, 0, 0), (50 + i * 50, 50), (50 + i * 50, 50 + len(T) * 50), 5)
|
||||||
pygame.draw.line(screen, (0, 0, 0), (50, 50 + i * 50), (50 + len(T) * 50, 50 + i * 50),5)
|
pygame.draw.line(screen, (0, 0, 0), (50, 50 + i * 50), (50 + len(T) * 50, 50 + i * 50), 5)
|
||||||
i = i + 1
|
i = i + 1
|
||||||
|
|
||||||
tmpImg = pygame.transform.rotate(imgPlayer, player.rotation)
|
tmpImg = pygame.transform.rotate(imgPlayer, player.rotation)
|
||||||
screen.blit(tmpImg, (55 + 50 * player.x, 55 + 50 * player.y))
|
screen.blit(tmpImg, (55 + 50 * player.x, 55 + 50 * player.y))
|
||||||
pygame.display.flip()
|
pygame.display.flip()
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user