From 9355d382e500dfa25167f715a6534a1f93dd917f Mon Sep 17 00:00:00 2001
From: Tomasz Adamczyk <tpadamczyk7@gmail.com>
Date: Fri, 2 Apr 2021 19:46:23 +0200
Subject: [PATCH] zmiany w definitions

---
 .idea/workspace.xml                    |  59 +++++++++----------------
 __pycache__/definitions.cpython-37.pyc | Bin 2731 -> 2780 bytes
 definitions.py                         |   5 ++-
 py.py                                  |  16 +++----
 4 files changed, 31 insertions(+), 49 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index cde8c29..7663586 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,26 +5,6 @@
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/definitions.py" beforeDir="false" afterPath="$PROJECT_DIR$/definitions.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/py.py" beforeDir="false" afterPath="$PROJECT_DIR$/py.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/beetroots_stage1.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/beetroots_stage2.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/beetroots_stage3.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/beetroots_stage4.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/carrots_stage1.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/carrots_stage2.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/carrots_stage3.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/carrots_stage4.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/farmland.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/farmland_moist.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/potatoes_stage1.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/potatoes_stage2.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/potatoes_stage3.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/potatoes_stage4.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/tractor.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/wheat_stage1.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/wheat_stage2.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/wheat_stage3.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/wheat_stage4.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/wheat_stage5.png" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -115,6 +95,7 @@
       <workItem from="1617367883128" duration="2815000" />
       <workItem from="1617370723478" duration="1838000" />
       <workItem from="1617372800679" duration="949000" />
+      <workItem from="1617383739568" duration="1714000" />
     </task>
     <servers />
   </component>
@@ -122,44 +103,44 @@
     <option name="version" value="1" />
   </component>
   <component name="WindowStateProjectService">
-    <state width="1879" height="364" key="GridCell.Tab.0.bottom" timestamp="1617373756802">
+    <state width="1879" height="364" key="GridCell.Tab.0.bottom" timestamp="1617385468328">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
-    <state width="1879" height="364" key="GridCell.Tab.0.bottom/0.0.1920.1080@0.0.1920.1080" timestamp="1617373756802" />
-    <state width="1879" height="364" key="GridCell.Tab.0.center" timestamp="1617373756802">
+    <state width="1879" height="364" key="GridCell.Tab.0.bottom/0.0.1920.1080@0.0.1920.1080" timestamp="1617385468328" />
+    <state width="1879" height="364" key="GridCell.Tab.0.center" timestamp="1617385468327">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
-    <state width="1879" height="364" key="GridCell.Tab.0.center/0.0.1920.1080@0.0.1920.1080" timestamp="1617373756802" />
-    <state width="1879" height="364" key="GridCell.Tab.0.left" timestamp="1617373756802">
+    <state width="1879" height="364" key="GridCell.Tab.0.center/0.0.1920.1080@0.0.1920.1080" timestamp="1617385468327" />
+    <state width="1879" height="364" key="GridCell.Tab.0.left" timestamp="1617385468327">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
-    <state width="1879" height="364" key="GridCell.Tab.0.left/0.0.1920.1080@0.0.1920.1080" timestamp="1617373756802" />
-    <state width="1879" height="364" key="GridCell.Tab.0.right" timestamp="1617373756802">
+    <state width="1879" height="364" key="GridCell.Tab.0.left/0.0.1920.1080@0.0.1920.1080" timestamp="1617385468327" />
+    <state width="1879" height="364" key="GridCell.Tab.0.right" timestamp="1617385468327">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
-    <state width="1879" height="364" key="GridCell.Tab.0.right/0.0.1920.1080@0.0.1920.1080" timestamp="1617373756802" />
-    <state width="1879" height="364" key="GridCell.Tab.1.bottom" timestamp="1617373756803">
+    <state width="1879" height="364" key="GridCell.Tab.0.right/0.0.1920.1080@0.0.1920.1080" timestamp="1617385468327" />
+    <state width="1879" height="364" key="GridCell.Tab.1.bottom" timestamp="1617385468328">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
-    <state width="1879" height="364" key="GridCell.Tab.1.bottom/0.0.1920.1080@0.0.1920.1080" timestamp="1617373756803" />
-    <state width="1879" height="364" key="GridCell.Tab.1.center" timestamp="1617373756802">
+    <state width="1879" height="364" key="GridCell.Tab.1.bottom/0.0.1920.1080@0.0.1920.1080" timestamp="1617385468328" />
+    <state width="1879" height="364" key="GridCell.Tab.1.center" timestamp="1617385468328">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
-    <state width="1879" height="364" key="GridCell.Tab.1.center/0.0.1920.1080@0.0.1920.1080" timestamp="1617373756802" />
-    <state width="1879" height="364" key="GridCell.Tab.1.left" timestamp="1617373756802">
+    <state width="1879" height="364" key="GridCell.Tab.1.center/0.0.1920.1080@0.0.1920.1080" timestamp="1617385468328" />
+    <state width="1879" height="364" key="GridCell.Tab.1.left" timestamp="1617385468328">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
-    <state width="1879" height="364" key="GridCell.Tab.1.left/0.0.1920.1080@0.0.1920.1080" timestamp="1617373756802" />
-    <state width="1879" height="364" key="GridCell.Tab.1.right" timestamp="1617373756802">
+    <state width="1879" height="364" key="GridCell.Tab.1.left/0.0.1920.1080@0.0.1920.1080" timestamp="1617385468328" />
+    <state width="1879" height="364" key="GridCell.Tab.1.right" timestamp="1617385468328">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
-    <state width="1879" height="364" key="GridCell.Tab.1.right/0.0.1920.1080@0.0.1920.1080" timestamp="1617373756802" />
-    <state x="0" y="0" key="com.intellij.ide.util.TipDialog" timestamp="1617372800402">
+    <state width="1879" height="364" key="GridCell.Tab.1.right/0.0.1920.1080@0.0.1920.1080" timestamp="1617385468328" />
+    <state x="0" y="0" key="com.intellij.ide.util.TipDialog" timestamp="1617383739858">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
-    <state x="0" y="0" key="com.intellij.ide.util.TipDialog/0.0.1920.1080@0.0.1920.1080" timestamp="1617372800402" />
+    <state x="0" y="0" key="com.intellij.ide.util.TipDialog/0.0.1920.1080@0.0.1920.1080" timestamp="1617383739858" />
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
-    <SUITE FILE_PATH="coverage/SmartTractor$py.coverage" NAME="py Coverage Results" MODIFIED="1617373729734" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/SmartTractor$py.coverage" NAME="py Coverage Results" MODIFIED="1617385384539" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
   </component>
 </project>
\ No newline at end of file
diff --git a/__pycache__/definitions.cpython-37.pyc b/__pycache__/definitions.cpython-37.pyc
index 577de207f3ffa598149360b5c20a844471f6e011..95a1261889066f91409d6ff3d9332ffbcb34612a 100644
GIT binary patch
delta 666
zcmZ9KJ5K^Z6oq$&-DO?C_yBf6-meu!3lu90FdCr{3-FPNi4-%MSlXGG(5R(}nZ#D8
zEsP=YPgq#kp)t1n3une<vtf#pJ7>OgZ*DTrq3_W2Rv@5D>=fJQo#x!bv<c9w^#rPT
z<^-ZJG6*E$pv2S&N>D;3iV$$2^i(2UczYUF@oXRV0g5tL@A*iSk?;)mAzg$^U96xO
z_MkY4V>u{c#gI^9B0ewTNjsh##}RkjV}gQ9*<8xuxZ~zRf=dgo>mz9g<dz!@3ov6h
z%s3o(vb`LM5R>fzP<|q3h+M(W6`WiFo5;cuw1}gqh!@Zjj%Cm?+rC6fIBsvhGSMtS
z?>!bs(l@3l`olC$RoMa=x++`UtQfUsk6Lp^amT$%PH^isx9)J<adUaWRcx-}a1{(%
zQn4`N|DZYAWI9rq&>Q)~UxXu_)t4$aTFN#3Qa-`P;6*Ki<v@L>v0HDS*7o)fn(d+g
ysIlFyk8kS#<4_SU{q;T$ZnY{<YrI>HzE2%{?^vk;jdpZ{)^w9qhkBY`>E%B}52We<

delta 576
zcmZ9Jxl02<6vlV<a<iJCm_4F7%(+QS8e=EK1H}!9jS*!~u$WOy<55`%HrAp%t=$wB
zVkP+t?5u1o1hKF*g;?1Lf|GSwLZ%qzee?Ui_l9}X?zGTcFsO2DEm=ETze5)x6WRCH
zHOf=ekQ|wEjXp;qG8t_0O@wu(s!l)EDNp%rzR6=9-jS9yJl*hhgGksU0*=rK5yKpj
z3=U+zc+wL)?8Zhtd(^jgl<xLnmy3B^%;!2vH>bH=+~eXt7bp4#j}v%vj9n$26iv`E
zHb27Yo&duQ$an!6KOjR)oFx&QBO}-%qc~5ZxWL|5q(u_@e;*!)89|#WdES!m?I_(t
zCfpunk1P9J8O{X_R)rKw!jWLXmmtFptJ3hus%cS%Zy{x6U3bNESA2JcpcSr=Yj-|#
zxlQ0qe1QY$c%Z=Veh3`rZty8Rqsi8TJb@sgT!o~y+I-!9mF<PvqFryblvyNKng6f~
fKY{hYDLX1iK_cv_8tkhkJgEv?syb5OR;~O2anX`d

diff --git a/definitions.py b/definitions.py
index e3304c2..dc707e2 100644
--- a/definitions.py
+++ b/definitions.py
@@ -1,6 +1,6 @@
 import os
 import pygame
-BLOCK_SIZE = 100
+BLOCK_SIZE = 60
 BEETROOTS_GROW_TIME = 5
 BEETROOTS_MAXIMUM_STATE = BEETROOTS_GROW_TIME * 3 + 1
 BEETROOTS_STAGE_0 = pygame.image.load(os.path.join('resources', 'beetroots_stage_0.png'))
@@ -23,6 +23,8 @@ CARROTS_STAGE_3 = pygame.image.load(os.path.join('resources', 'carrots_stage_3.p
 CARROTS_STAGE_3 = pygame.transform.scale(CARROTS_STAGE_3, (BLOCK_SIZE, BLOCK_SIZE))
 DIRT = pygame.image.load(os.path.join('resources', 'dirt.png'))
 DIRT = pygame.transform.scale(DIRT, (BLOCK_SIZE, BLOCK_SIZE))
+HEIGHT_AMOUNT, WIDTH_AMOUNT = 10, 10
+HEIGHT,  WIDTH = BLOCK_SIZE * HEIGHT_AMOUNT, BLOCK_SIZE * WIDTH_AMOUNT
 FARMLAND_DRY = pygame.image.load(os.path.join('resources', 'farmland_dry.png'))
 FARMLAND_DRY = pygame.transform.scale(FARMLAND_DRY, (BLOCK_SIZE, BLOCK_SIZE))
 FARMLAND_WET = pygame.image.load(os.path.join('resources', 'farmland_wet.png'))
@@ -38,7 +40,6 @@ POTATOES_STAGE_2 = pygame.image.load(os.path.join('resources', 'potatoes_stage_2
 POTATOES_STAGE_2 = pygame.transform.scale(POTATOES_STAGE_2, (BLOCK_SIZE, BLOCK_SIZE))
 POTATOES_STAGE_3 = pygame.image.load(os.path.join('resources', 'potatoes_stage_3.png'))
 POTATOES_STAGE_3 = pygame.transform.scale(POTATOES_STAGE_3, (BLOCK_SIZE, BLOCK_SIZE))
-WIDTH, HEIGHT = 1000, 1000
 WINDOW = pygame.display.set_mode((WIDTH, HEIGHT))
 TRACTOR = pygame.image.load(os.path.join('resources', 'minecart_command_block.png'))
 TRACTOR = pygame.transform.scale(TRACTOR, (BLOCK_SIZE, BLOCK_SIZE))
diff --git a/py.py b/py.py
index dc9f3d3..f20cbc3 100644
--- a/py.py
+++ b/py.py
@@ -8,9 +8,9 @@ import tractor
 pygame.display.set_caption("Smart Tractor")
 fields = []
 def create_base_map():
-    for i in range(10):
+    for i in range(definitions.WIDTH_AMOUNT):
         temp_map_field = []
-        for j in range(10):
+        for j in range(definitions.HEIGHT_AMOUNT):
             temp_rect = pygame.Rect(i * definitions.BLOCK_SIZE, j * definitions.BLOCK_SIZE, definitions.BLOCK_SIZE, definitions.BLOCK_SIZE)
             temp_soil = soil.Soil(False, False, False)
             temp_plant = plant.Plant("none", 0)
@@ -18,8 +18,8 @@ def create_base_map():
             temp_map_field.append(temp_field)
         fields.append(temp_map_field)
 def fill_map():
-    for i in range(10):
-        for j in range(10):
+    for i in range(definitions.WIDTH_AMOUNT):
+        for j in range(definitions.HEIGHT_AMOUNT):
             field = fields[i][j]
             rect = field.get_rect()
             if field.get_plant().get_name() == "beetroot" and field.get_plant().get_state() > 0 and field.get_plant().get_state() <= 1 * definitions.BEETROOTS_GROW_TIME:
@@ -75,8 +75,8 @@ def do_work(tractor1, tractor1_rect):
     loop = True
     if tractor1.get_all_amount_of_seeds() == 0:
         loop = False
-    x = int(tractor1_rect.x / 100)
-    y = int(tractor1_rect.y / 100)
+    x = int(tractor1_rect.x / definitions.BLOCK_SIZE)
+    y = int(tractor1_rect.y / definitions.BLOCK_SIZE)
     field = fields[x][y]
     if field.get_soil().get_state() is False:
         field.get_soil().set_state(True)
@@ -151,8 +151,8 @@ def draw_window(tractor1_rect):
     definitions.WINDOW.blit(definitions.TRACTOR, (tractor1_rect.x, tractor1_rect.y))
     pygame.display.update()
 def grow_plants():
-    for i in range(10):
-        for j in range(10):
+    for i in range(definitions.WIDTH_AMOUNT):
+        for j in range(definitions.HEIGHT_AMOUNT):
             field = fields[i][j]
             if field.get_plant().get_name() == "beetroot" and field.get_plant().get_state() > 0 and field.get_plant().get_state() < definitions.BEETROOTS_MAXIMUM_STATE:
                 field.get_plant().set_state(field.get_plant().get_state() + 1)