diff --git a/.idea/.gitignore b/.idea/.gitignore index e7e9d11..26d3352 100644 --- a/.idea/.gitignore +++ b/.idea/.gitignore @@ -1,2 +1,3 @@ # Default ignored files +/shelf/ /workspace.xml diff --git a/.idea/misc.xml b/.idea/misc.xml index 43a1e8a..d56657a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index d675357..5323eb7 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/constants.py b/constants.py index 3ca4a9f..c8471c5 100644 --- a/constants.py +++ b/constants.py @@ -13,15 +13,8 @@ TILE_SIZE = 100 HORIZONTAL_TILES_NUMBER = ceil(DISPLAY_SIZE_HORIZONTAL/TILE_SIZE) VERTICAL_TILES_NUMBER = floor((DISPLAY_SIZE_VERTICAL-200)/TILE_SIZE) -#TILE_SIZE - #colors WHITE = (255, 255, 255) #SUPER UPRAWA -BLACK = (0, 0, 0) -RED = (255, 0, 0) #DO ZASIANIA -YELLOW = (255, 255, 0) #DO PODLANIA -GREEN = (0, 255, 0) #DO SCIECIA - #tractor const @@ -29,8 +22,8 @@ TRACTOR_WIDTH = TILE_SIZE TRACTOR_HEIGHT = TILE_SIZE #FRAMES PER SECOND -FPS = 10 +FPS = 3 #ANIMATION_PART -ANIMATION_PART = 11 \ No newline at end of file +ANIMATION_PART = 1 \ No newline at end of file diff --git a/driving.py b/driving.py index 60f5608..eb9e4aa 100644 --- a/driving.py +++ b/driving.py @@ -7,7 +7,6 @@ def cruiseControl(tractor, direction, cruiseControl): direction = "STOP" return direction - def manualTurning(event, tractor): direction = "STOP" if event.type == pygame.KEYDOWN: diff --git a/main.py b/main.py index 83f37e8..242b9ea 100644 --- a/main.py +++ b/main.py @@ -15,7 +15,7 @@ display = pygame.display.set_mode((DISPLAY_SIZE_HORIZONTAL, DISPLAY_SIZE_VERTICA pygame.display.set_caption('Tractor') working = True -cruiseControl = True +cruiseControl = False autoAction = True animationSpeed = ANIMATION_PART @@ -30,7 +30,7 @@ toolCounter = - 1 board = Board.generate() -tractor = Tractor(horizontal_index=-0, vertical_index=0, hitch="nothing", header=False, autodrive=True) +tractor = Tractor(horizontal_index=-0, vertical_index=0, hitch="nothing", header=False, autodrive=False) tillageUnit = TillageUnit("Nothing") tractor.turnOnEngine()