From fe44b4ffa575602af11ad6006d0d5c8453304ec2 Mon Sep 17 00:00:00 2001
From: Emil Gutkiewicz <s459307@pc23e.labs.wmi.amu.edu.pl>
Date: Fri, 25 Mar 2022 10:01:12 +0100
Subject: [PATCH] updated some trailer data

---
 __pycache__/agent.cpython-38.pyc    | Bin 1861 -> 1851 bytes
 __pycache__/common.cpython-38.pyc   | Bin 704 -> 694 bytes
 __pycache__/field.cpython-38.pyc    | Bin 4234 -> 4224 bytes
 __pycache__/settings.cpython-38.pyc | Bin 1700 -> 1690 bytes
 trailer.py                          |  40 +++++++++++++++++++---------
 5 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/__pycache__/agent.cpython-38.pyc b/__pycache__/agent.cpython-38.pyc
index 7fecea2bba6af01dd082642a310d3faf2db739d7..851941efcd1bab5035dcb7cc5129218e6ab88517 100644
GIT binary patch
delta 62
zcmX@gx0{bEl$V!_0SIDqH*ys)s_N-y<maa97nhW#q~?_r>ld4tS{fUe>z5QIW|!m_
Q>E|XEm!xi9$vB4<0359oMF0Q*

delta 72
zcmdnZca)DSl$V!_0SKziHgXj(>Rae%<maa9r{-qn=ob{_XQd{W6zdn4l%`}R>IYX<
aCM9R)7X{}g7L|k)C1#i8Z=TOMhZO)3rWjZN

diff --git a/__pycache__/common.cpython-38.pyc b/__pycache__/common.cpython-38.pyc
index 3523410b4d631a68ba3f77200360b750562b9feb..64eca0d9d66ace3a8a42ae603eb47a2ed2f238ef 100644
GIT binary patch
delta 62
zcmX@Wx{Z}Pl$V!_0SIDqZ6|VHQPtPa$j?pHFD@xfNzE%M)-N_OwKO&`*Donb%r40<
Q($7sSE=k?Y$GC|R04b~!BLDyZ

delta 72
zcmdnSdVrNXl$V!_0SJV5Xien4qHn36k)NBYpPHMQqhC;zpOu<iQmkKGQks&Ps2^Na
anUtKFUlg31SX2^Hl$c$TznO(`6C(g4>=-=&

diff --git a/__pycache__/field.cpython-38.pyc b/__pycache__/field.cpython-38.pyc
index fd34ce30d2eb58f7bf19eee206fafd12e835dd57..6acf55c70eea0afd01a1fe0f91c8efae9eb3b4b4 100644
GIT binary patch
delta 1646
zcma)+OHUI~6vv&;v`kB93I^1Iq6Ht6*C0@df~151#zZ0!i8jGf+5rkPExGp+gBxAA
zk;K*Axp&dTjqwv0m#$oy+>JXEW8w#J<vDi>)0ReUa{ry&$N&7!xsSudi$vt1VMI>B
zZ_Rxld7~(Tzf~p%4CwehVr`dQ+oEj0V3!!R=tSz~_~@j?NN$&viRI=fv$+x284JU7
zf-a;LL_{gev0~n}*><@=V%U#{HDdBg;8UyLY4WG)TIU&@bhdHk4|RK5j<mpt2tKgw
z0?il{{<5r`-E(p!Mmk|A86f9yZFi%=Yps8|4LjRWPNT$8x=_%RTtMkT@sZ@0iG3X)
z2tY$1x}s~kN;>$g-od+qpOqN@9=y|sku%ZFqU{v2l#ya-OQ=P6tH#gd%c0@5296{w
zBmF2>P*fCI%mjW7qBJAA2m^i4s15=|il&4D<RUPoO>L#<*p+~180E>9rS<bLD;f5B
z&{*iyW(*jq2reM9&}i|Q?SV)nj4VRsjU7ABDymmkNf?EJ8YEetIRDymZLU5up+XhB
zd}OVgWibR^7Bm_F(G@ZT{ENykf2FT1N@U$fCL=IMgzg_~<=jS4avjFV7>XaJN_IKi
zKQLZD;%{sU1}32$0i@)n9)@oy7XKJ7EFz$fAT$P*CAdfgH=J^QSDuVa#M^atuxFn*
zyl4>TPUPNInUG54zWUpI;;?^<j6JHaWaFWb+aPOt3*G&U{k*WKX=v5s5mK~(9wZk3
zV%+5)TBlPUiwM$vKqgaYBMp(JqKI%dn|E@QX0x9AQ7NOB)|;WpdoS}kMiWNWB5ym+
zk&Wb=!C=x5!!ALq-YSG7Qxfr4G(A`?*KM3Wi*gJ|q=lbsoIf^t7n*_LTjUk|7>uN`
z&##$}gF#mLPcy^2&6&FJbGYO$;a{4G)n?)Sd;A~aF~}2WwbhuD)tHY>*WoPu1Ls|=
z=lML&X_h4}-fReieaV>6?9#qV@G6pClo1s9I?CgUk08N!hsaxjw}9X|^Nx?)B3USO
OYp;pzZ4}S6js5`vP7rSZ

delta 1636
zcma)+&rcIU6vx?ayWN&<3xR3{gjS4DpcVlY0s#~wL?d88LYiRhj|CRGT{62I=mipQ
zUgze;lLx$c@(=K+9z1y2n0WCY@aoC;-j;3)4RMqCW;65V`#$sL$4TN%BKSg4f-Uf6
zHa`a63POgz7bYe`(D8RNy=&-dTGh2u`hXdGYQZworgd1<a_P0oQNExVY)#KGYn|ox
zErW}my)hXkvH%L2+9A`*Sz19?tzDzY!q|`2b)xWhp3kjrr^0n{D;mY1E9WDBiMv9S
zFM0cVI$<d3VOKGt>wMU2@8I(YcDA9kqr_0Iq4-gHP_Co6iRn+lz77z~ZAu`rAbVwz
zb@1;}CvWq85yJeZZ>b+MXF}VWS}JBui)rPZjHu~5b$$w8lu}#gI0j)F8$h{<BBD^q
z;`o<DX-3ow1O3oUj0GaWD@Y#J3rtHA8MX30|FY5zqsf3{9p@E)_avpFr08u+Mjm(Z
zRCFrmOof5Eq*Q?z|K=Z9Xk@oVSf@iw)ojK&1YT)qrUyh8*borT%f5#tqp;70`LVpd
zNQ`oo5mS$V*wX6JPEJ>y($shvda+RyH(M33D=;{8r*VX0Xm}h3?n67{7^mGk3EUG>
ze8m^#Ujr+P$m(L)UP~*f3@6&YJn`Z&$ON4&wvG<e3+E9HVmu#wc8eAzvN-m*dwSvg
z{s@k3HWsxmnkLhZP<bcO%U!j*wiFD^L#v(zN$`4PA4~B+;ivpV>-1fR#rBzpfXt@Q
zh76JBRImftY@w7h&1}|jKPzV_{;C-oUFA5M)X;3DYEe*2r867io546T#I(!Ms#gdh
z*%Tl?;lD%k!_{(4WB43O4UmzAyVw|CQEqHB1H<RVDR>Qx&0?QhGZzPwY(T5WnIoL`
z@N5Il1GKmVrxH#)ZieGt;{U+GBro|VCBvs9GspGScyxJs7~O+L$GSzRC~LWL@pd+=
zl{E`CVgV;NTRysO<2>g<qus#1WW@HWnew5|@V>GH$_NTQl5~*q5-@yz7~Pj~{KFII
U94y*ADj9*hx#>^gt8JtI0143vQvd(}

diff --git a/__pycache__/settings.cpython-38.pyc b/__pycache__/settings.cpython-38.pyc
index 63ef74460fe88d6a9aa559ef77ff23185db58d3c..ca9dbf7d2f28fd49ceed7ddaf07a33c82625a419 100644
GIT binary patch
delta 61
zcmZ3&JBybql$V!_0SIDqCvrVkHPp|@&rQ`YE-6h(%_}L^FE%l?G&V5TFDXjQF3B&_
P&rK{YN!_f#*un|`6<iXz

delta 71
zcmbQmyM&i3l$V!_0SNY(PUL#7Z>^t^pPQ<mnwy!UUr>~vm6}{qtY2JGnv$8QA6!+L
Zl$@Dg6r7t_R1#8@m|c>;S&XrT6#yB*7z_Xa

diff --git a/trailer.py b/trailer.py
index b44a0ab..6112dd5 100644
--- a/trailer.py
+++ b/trailer.py
@@ -1,32 +1,48 @@
-class Trailer:
+from enum import Enum
 
-    def __init__(self, capacity, _type, priority, weight):
-        self.capacity = capacity
+class Priorities(Enum):
+    SMALLEST = 0
+    MEDIUM = 2
+    HIGH = 3
+    HIGHEST = 4
+
+    @staticmethod
+    def whatIsFirst(_prio1, _prio2):
+        if(_prio1 > _prio2):
+            return _prio1
+        elif _prio2 >= _prio1:
+            return _prio2
+
+
+class Trailer:
+    def __init__(self, _type: str, priority: Priorities, weight: float):
+        self.capacity = 1.0
         self.type = _type
         self.priority = priority
-        self.weight = weight
+        self.grossWeight = weight
 
+    def getWeight(self):
+        return self.grossWeight + self.capacity
+
+    def use(self):
+        self.capacity -= 0.1
 
 class Fertilizer(Trailer):  # do nawożenia
-
     def __init__(self):
-        super(Fertilizer, self).__init__(capacity=1, _type="Fertilizer", priority=1, weight=1)  # parametry do uzupełnienia
+        super(Fertilizer, self).__init__("Fertilizer", Priorities.SMALLEST, 100)  # parametry do uzupełnienia
 
 
 class Water(Trailer):  # do podlewania
-
     def __init__(self):
-        super(Water, self).__init__(capacity=1, _type="Water", priority=1, weight=1)  # parametry do uzupełnienia
+        super(Water, self).__init__("Water", Priorities.HIGH, 2000)  # parametry do uzupełnienia
 
 
 class Harvest(Trailer):  # do zbierania
-
     def __init__(self):
-        super(Harvest, self).__init__(capacity=1, _type="Harvest", priority=1, weight=1)  # parametry do uzupełnienia
+        super(Harvest, self).__init__("Harvest", Priorities.SMALLEST, 500)  # parametry do uzupełnienia
 
 
 class Sow(Trailer):  # do siania
-
     def __init__(self):
-        super(Sow, self).__init__(capacity=1, _type="Sow", priority=1, weight=1)  # parametry do uzupełnienia
+        super(Sow, self).__init__("Sow", Priorities.HIGHEST, 200)  # parametry do uzupełnienia
 
-- 
2.20.1