From 9bbf7df917ed7ded935487320b4368141444d6ce Mon Sep 17 00:00:00 2001 From: s464852 Date: Thu, 24 Mar 2022 14:22:46 +0100 Subject: [PATCH 1/3] Add gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c18dd8d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +__pycache__/ -- 2.20.1 From 86d38ad0e5312ce1fd1a0b625954e8cf38bacdec Mon Sep 17 00:00:00 2001 From: s464852 Date: Thu, 24 Mar 2022 15:12:58 +0100 Subject: [PATCH 2/3] Update agent sprite to tracktor --- assets/tracktor/tractor.png | Bin 0 -> 3139 bytes dot-22-433567.png | Bin 5125 -> 0 bytes main.py | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 assets/tracktor/tractor.png delete mode 100644 dot-22-433567.png diff --git a/assets/tracktor/tractor.png b/assets/tracktor/tractor.png new file mode 100644 index 0000000000000000000000000000000000000000..4bb03239a7fdafa2d352a6ac29a1d577c89d7a37 GIT binary patch literal 3139 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 literal 0 HcmV?d00001 diff --git a/dot-22-433567.png b/dot-22-433567.png deleted file mode 100644 index be7c968fb8adc8e4f5cb2b1c8786eda3412faccc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5125 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 diff --git a/main.py b/main.py index f087020..1f564b9 100644 --- a/main.py +++ b/main.py @@ -6,7 +6,7 @@ import settings import common import agent -AGENT_IMG = pygame.image.load("dot-22-433567.png") +AGENT_IMG = pygame.image.load('./assets/tracktor/tractor.png') AGENT = pygame.transform.scale(AGENT_IMG, (settings.Field.size(), settings.Field.size())) possibleFields = { -- 2.20.1 From 7eae2b25c2dcf5930d132546a5f3ec5b7b756387 Mon Sep 17 00:00:00 2001 From: s464852 Date: Thu, 24 Mar 2022 15:13:59 +0100 Subject: [PATCH 3/3] Add new methods to agent TO DO: add irrigation, fertelization etc. --- agent.py | 9 ++++++++- main.py | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/agent.py b/agent.py index bf1f8ab..bbca452 100644 --- a/agent.py +++ b/agent.py @@ -3,10 +3,11 @@ import settings class Instance: - def __init__(self): + def __init__(self, tank_capacity): size = settings.Field.size self.rect = pygame.Rect(0, 0, size(), size()) self.action = '' + self.tank_capacity = tank_capacity def coordinates(self): return { @@ -19,7 +20,13 @@ class Instance: def y(self): return int(self.rect.y / settings.Field.size()) + + def get_tank_capacity(self): + return self.tank_capacity + def set_tank_capacity(self, fuel_units): + self.tank_capacity = fuel_units + def move(self): key_pressed = pygame.key.get_pressed() height = settings.Pygame.height() diff --git a/main.py b/main.py index 1f564b9..a850cc3 100644 --- a/main.py +++ b/main.py @@ -65,7 +65,7 @@ def draw_window(agent, fields): common = common.Instance() -agent = agent.Instance() +agent = agent.Instance(1000) def main(): -- 2.20.1