From 45c733989f5a1ae7547fdaaf287161392537f752 Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Wed, 11 Mar 2020 23:53:05 +0100 Subject: [PATCH] change --- targets/Bank.py => Bank.py | 2 +- targets/BankTarget.py => BankTarget.py | 2 +- targets/Target.py => Target.py | 0 factories/TargetFactory.py | 4 ---- targets/ReboundContactTarget.py | 2 +- targets/__pycache__/Bank.cpython-38.pyc | Bin 1383 -> 0 bytes targets/__pycache__/BankTarget.cpython-38.pyc | Bin 772 -> 0 bytes .../ReboundContactTarget.cpython-38.pyc | Bin 672 -> 688 bytes targets/__pycache__/Target.cpython-38.pyc | Bin 615 -> 0 bytes targets/bottom_lanes/LeftInlaneTarget.py | 2 +- targets/bottom_lanes/LeftOutlaneTarget.py | 2 +- targets/bottom_lanes/RightInlaneTarget.py | 2 +- .../bottom_lanes/RightOutlaneKickerTarget.py | 2 +- targets/bottom_lanes/RightOutlaneTarget.py | 2 +- .../__pycache__/LeftInlaneTarget.cpython-38.pyc | Bin 665 -> 681 bytes .../LeftOutlaneTarget.cpython-38.pyc | Bin 670 -> 686 bytes .../RightInlaneTarget.cpython-38.pyc | Bin 649 -> 665 bytes .../RightOutlaneKickerTarget.cpython-38.pyc | Bin 706 -> 722 bytes .../RightOutlaneTarget.cpython-38.pyc | Bin 675 -> 691 bytes targets/canal/CanalButtonBottomTarget.py | 2 +- targets/canal/CanalButtonMiddleBottomTarget.py | 2 +- targets/canal/CanalButtonMiddleTarget.py | 2 +- targets/canal/CanalButtonMiddleTopTarget.py | 2 +- targets/canal/CanalButtonTopTarget.py | 2 +- .../CanalButtonBottomTarget.cpython-38.pyc | Bin 685 -> 701 bytes ...CanalButtonMiddleBottomTarget.cpython-38.pyc | Bin 701 -> 717 bytes .../CanalButtonMiddleTarget.cpython-38.pyc | Bin 688 -> 704 bytes .../CanalButtonMiddleTopTarget.cpython-38.pyc | Bin 695 -> 711 bytes .../CanalButtonTopTarget.cpython-38.pyc | Bin 685 -> 701 bytes targets/fixed_targets/FixedTarget1.py | 2 +- targets/fixed_targets/FixedTarget2.py | 2 +- targets/fixed_targets/FixedTarget3.py | 2 +- targets/fixed_targets/FixedTarget4.py | 2 +- targets/fixed_targets/FixedTarget5.py | 2 +- .../__pycache__/FixedTarget1.cpython-38.pyc | Bin 653 -> 669 bytes .../__pycache__/FixedTarget2.cpython-38.pyc | Bin 653 -> 669 bytes .../__pycache__/FixedTarget3.cpython-38.pyc | Bin 653 -> 669 bytes .../__pycache__/FixedTarget4.cpython-38.pyc | Bin 653 -> 669 bytes .../__pycache__/FixedTarget5.cpython-38.pyc | Bin 653 -> 669 bytes targets/left_bank/LeftBankLeft.py | 2 +- targets/left_bank/LeftBankMiddleLeft.py | 2 +- targets/left_bank/LeftBankMiddleRight.py | 2 +- targets/left_bank/LeftBankRight.py | 2 +- targets/left_bank/LeftBankTarget.py | 2 +- .../__pycache__/LeftBankLeft.cpython-38.pyc | Bin 657 -> 669 bytes .../LeftBankMiddleLeft.cpython-38.pyc | Bin 688 -> 700 bytes .../LeftBankMiddleRight.cpython-38.pyc | Bin 693 -> 705 bytes .../__pycache__/LeftBankRight.cpython-38.pyc | Bin 651 -> 667 bytes .../__pycache__/LeftBankTarget.cpython-38.pyc | Bin 630 -> 648 bytes targets/pop_bumpers/LeftPopTarget.py | 2 +- targets/pop_bumpers/RightPopTarget.py | 2 +- .../__pycache__/LeftPopTarget.cpython-38.pyc | Bin 649 -> 665 bytes .../__pycache__/RightPopTarget.cpython-38.pyc | Bin 654 -> 670 bytes targets/right_bank/RightBank.py | 2 +- targets/right_bank/RightBankLeft.py | 2 +- targets/right_bank/RightBankMiddle.py | 2 +- targets/right_bank/RightBankRight.py | 2 +- .../__pycache__/RightBank.cpython-38.pyc | Bin 805 -> 823 bytes .../__pycache__/RightBankLeft.cpython-38.pyc | Bin 663 -> 675 bytes .../__pycache__/RightBankMiddle.cpython-38.pyc | Bin 676 -> 688 bytes .../__pycache__/RightBankRight.cpython-38.pyc | Bin 668 -> 680 bytes targets/slingshots/LeftSlingshotTarget.py | 2 +- targets/slingshots/RightSlingshotTarget.py | 2 +- .../LeftSlingshotTarget.cpython-38.pyc | Bin 678 -> 694 bytes .../RightSlingshotTarget.cpython-38.pyc | Bin 683 -> 699 bytes targets/specials/SpecialOrangeTarget.py | 2 +- targets/specials/SpecialRedTarget.py | 2 +- targets/specials/SpinnerTarget.py | 2 +- .../SpecialOrangeTarget.cpython-38.pyc | Bin 691 -> 707 bytes .../__pycache__/SpecialRedTarget.cpython-38.pyc | Bin 676 -> 692 bytes .../__pycache__/SpinnerTarget.cpython-38.pyc | Bin 645 -> 661 bytes targets/technical/CreditTarget.py | 2 +- targets/technical/OutholeTarget.py | 2 +- targets/technical/RisingBall.py | 2 +- .../__pycache__/CreditTarget.cpython-38.pyc | Bin 641 -> 657 bytes .../__pycache__/OutholeTarget.cpython-38.pyc | Bin 646 -> 662 bytes .../__pycache__/RisingBall.cpython-38.pyc | Bin 638 -> 654 bytes targets/top_bank/TopBankLeft.py | 2 +- targets/top_bank/TopBankMiddle.py | 2 +- targets/top_bank/TopBankMiddleLeft.py | 2 +- targets/top_bank/TopBankMiddleRight.py | 2 +- targets/top_bank/TopBankRight.py | 2 +- .../__pycache__/TopBankLeft.cpython-38.pyc | Bin 651 -> 663 bytes .../__pycache__/TopBankMiddle.cpython-38.pyc | Bin 661 -> 673 bytes .../TopBankMiddleLeft.cpython-38.pyc | Bin 682 -> 694 bytes .../TopBankMiddleRight.cpython-38.pyc | Bin 687 -> 699 bytes .../__pycache__/TopBankRight.cpython-38.pyc | Bin 656 -> 668 bytes 87 files changed, 42 insertions(+), 46 deletions(-) rename targets/Bank.py => Bank.py (86%) rename targets/BankTarget.py => BankTarget.py (78%) rename targets/Target.py => Target.py (100%) delete mode 100644 targets/__pycache__/Bank.cpython-38.pyc delete mode 100644 targets/__pycache__/BankTarget.cpython-38.pyc delete mode 100644 targets/__pycache__/Target.cpython-38.pyc diff --git a/targets/Bank.py b/Bank.py similarity index 86% rename from targets/Bank.py rename to Bank.py index 26d0625..758ed51 100644 --- a/targets/Bank.py +++ b/Bank.py @@ -1,4 +1,4 @@ -from targets.Target import Target +from Target import Target class Bank(Target): def __init__(self, points, name, targets): diff --git a/targets/BankTarget.py b/BankTarget.py similarity index 78% rename from targets/BankTarget.py rename to BankTarget.py index 1af2af2..9bb577f 100644 --- a/targets/BankTarget.py +++ b/BankTarget.py @@ -1,4 +1,4 @@ -from targets.Target import Target +from Target import Target class BankTarget(Target): def __init__(self, points): diff --git a/targets/Target.py b/Target.py similarity index 100% rename from targets/Target.py rename to Target.py diff --git a/factories/TargetFactory.py b/factories/TargetFactory.py index f57f4f5..c2593c3 100644 --- a/factories/TargetFactory.py +++ b/factories/TargetFactory.py @@ -1,7 +1,3 @@ -from targets import * -from targets.BankTarget import BankTarget - - class TargetFactory: @staticmethod def createAllTargets(): diff --git a/targets/ReboundContactTarget.py b/targets/ReboundContactTarget.py index 98f000d..b8f32cd 100644 --- a/targets/ReboundContactTarget.py +++ b/targets/ReboundContactTarget.py @@ -1,4 +1,4 @@ -from targets.Target import Target +from Target import Target class ReboundContactTarget(Target): def __init__(self): diff --git a/targets/__pycache__/Bank.cpython-38.pyc b/targets/__pycache__/Bank.cpython-38.pyc deleted file mode 100644 index 20f19f43aa3f679d9a33fa97ec3620277bfb9da3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1383 zcmZux%}(1u5T02(juR3pN@!`tp{Gi|ggyX5s730H3$#)#wJR%YXsAiTu8~UQo`S?< zG#qp5^X#>!zCur(Svw&qtTgNWo0)IEnem5qy9qRYeLDQ|Qvm$t&GPVRb3kHV(WF3O z1{WA3!h29cc{iZE6enIRlz$9S?GL?z2yJkZ=(9BM@pgH5)y5pqB83z?yRN)I;*L=3h69R4b`M?{T6(PLvpuf{kO^BTaQ7`2d~)+i`k(mhXM;R z5eS7>fW!i(;tr64IffY?MV_sht5K?LJ$IOm?MSK9v%bkwEvqvrBj5Ta%}#AF8ukad zvHl>rNOeFSW@sBy_OiqnDQEC^qq|$F?J~UX=-P%-_6Pl3N`_}x39yL)j@$0V{I*9a zSPWis6z@nJ{W;N3EI|S1cnA}mpx#-ICi0GYxKIaR11yH6LsJ2tTR*VCbNEOETneT@ zGolFNpl{^YejW)cx^HYy2B6z?Sx)P;vW>m7bdY`@>3yym!>T^H7{9KfD7Dy*l-<2- z*h@0A-(4sX*Itrkjx@U|C9M|(JDr)(A$#25=|A7=vU*#ZZ_EJzc5uA;2!ItXn3p-B z6&F+BGRX1197--cyTt`y(tHJ=)HSkUJthfDm}?7|%#LP?8FZE35JMbqSHK>Gx`J+w z%%yspOi+s9u*%jH8RunipDj@`SaTrt7W-Z$OFyTxrwoNt#HBWVSpj(@um?~$&_&f% zP&!;VQ!XAsC*B?P(=sIAL5jt25Z5`C-_mRSjLbZWu1*(xd5`YJ0^NhYYjE>$uSsc} zQeF(zRmSUs2>*PuveebGF>&k~PP_>ydD;gt*ToXZUSP`~wyk9LN9w diff --git a/targets/__pycache__/BankTarget.cpython-38.pyc b/targets/__pycache__/BankTarget.cpython-38.pyc deleted file mode 100644 index 52a6b68975dd9068aefeb993f707ca16cd5a22b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 772 zcmZuvv5wO~5S`hzeZJs?6BJO=y2^cR}brD?7TNKem9*?fbGZo*B>4uz)uOrmT>TbkAK3>fWa14SRuk& zFv{pX7;W)dSIQ)3P^P~)3rY;xdF?*hZYkl|^bq)`3@lV=pi(z*fd-A*=ar6Fn}l&< zQj_hWN^c;6D&z7;Ve+zGe;#V9QDMPyq`rT^u7fMQW|;=BfSBbB4r=kHR3Y`-jddYw zJbh|9{*ZXvUW9CO*{nN%z;H~oY-{g{4)FWY{IrXm_|rS)`Q~fLiJEoO5y^nOIKUit z4@X&lGnPEpTNC_`&?pc({HDGG%VnXZTAY{KWt{0!c0sey1G*#ma4hbgxI)~FUCw7v zkl}7NQo!&2Oa4k;$liN$A$8J1i9PFm#y!a`Q%Iflwwub!IC$KhjF{pj?}x{-u2+^Q zOo&#OX4?ubh`wy=w!d*wBMNsXjKXx7_tLg4(TFy-8oQLO#?8u1ax9V}brLU19cIIR a=KWvcL|nWaRl4gUf7Xk7E_;ZL6zUIG-Io~v diff --git a/targets/__pycache__/ReboundContactTarget.cpython-38.pyc b/targets/__pycache__/ReboundContactTarget.cpython-38.pyc index 71e2c0ea6c0518988ee3672c63a94b341a57c3c4..f4e57a421997e2b21c13294cb86ef8c882b8df82 100644 GIT binary patch delta 92 zcmZ3$x`CB9l$V!_0SFYbGviiIUXW diff --git a/targets/__pycache__/Target.cpython-38.pyc b/targets/__pycache__/Target.cpython-38.pyc deleted file mode 100644 index 467a338bc4c37e0953c0607c13e3e2af92106c7c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 615 zcmZuuJx{|h5Ix&T8Uhs(NK6cDC<|Q}5kfGql>t~XV3pdGLi&N7BDLxUKLkepl2<1F z0u%32iaK!7ozK3z_wFv&&1OcB!_(Hyz99PK%c?}UoIw2^j3FaR8i+y&IwvEIdL^T* zcu|Ek(Iw^a7qTc9A-lNs);)J_OWWnARgt)yK>aR^r9v1&xiIpT3T2dua7HEuToRJ2 zj_cW~tB|@B_8H?0>UUt~VosXo5>^=Yr6E+yc2M{IDpw&HkNU&PhiKRt*wDbEeza2r zB5%t(7X!m3FdyXBaC~ncw5podw-)>d<7r5>?hjF^Io)$Qi3Hzl^EYQ1?_!UC!anb? zZgvaKoZg@hX!BhPY!r=(b}oxX<@&vzb*_P=T(}fR-Oa-AUvdn@j_2`7&9Yx+4AjnJ z?vMx6I%HZ8MrKm7zoGThq*E>;ZXJa+&I&fq>}mpDEt7aQsYqkTFYR0v+34?wI%cl} R|6zpmXhD64~|in>iS585x--hcOug00J=>m;e9( delta 76 zcmbQq+R4fr%FD~e00bK%UE-!px|fwVl$V!_0SFYbGviiI4}U}R*P+{I)J06mNuy#N3J delta 76 zcmX@hx|fwVl$V!_0SGoky2S0C$g3gB7{$oQ;Lec3l)~J?kiwkG*vuToG|}rRlY!pm bKt>NnLFQY0C5c7psU^jFAz*s)EGAx|fwVl$V!_0SFYbGvhW)Y5)KL delta 76 zcmdnXx|WqUl$V!_0SGoky2S06$g3gB7{$oQ;Lec3l)~J?kiwkG*vuToG|}rGle*q! bFGhPtLFQY0C5c7psU^jFAz*rP7n3mnsml}y diff --git a/targets/fixed_targets/FixedTarget1.py b/targets/fixed_targets/FixedTarget1.py index c094844..d27de31 100644 --- a/targets/fixed_targets/FixedTarget1.py +++ b/targets/fixed_targets/FixedTarget1.py @@ -1,4 +1,4 @@ -from targets.Target import Target +from Target import Target class FixedTarget1(Target): diff --git a/targets/fixed_targets/FixedTarget2.py b/targets/fixed_targets/FixedTarget2.py index cefd889..9fe5653 100644 --- a/targets/fixed_targets/FixedTarget2.py +++ b/targets/fixed_targets/FixedTarget2.py @@ -1,4 +1,4 @@ -from targets.Target import Target +from Target import Target class FixedTarget2(Target): diff --git a/targets/fixed_targets/FixedTarget3.py b/targets/fixed_targets/FixedTarget3.py index 7186cb4..ad470eb 100644 --- a/targets/fixed_targets/FixedTarget3.py +++ b/targets/fixed_targets/FixedTarget3.py @@ -1,4 +1,4 @@ -from targets.Target import Target +from Target import Target class FixedTarget3(Target): def __init__(self): diff --git a/targets/fixed_targets/FixedTarget4.py b/targets/fixed_targets/FixedTarget4.py index c08bcec..5645b24 100644 --- a/targets/fixed_targets/FixedTarget4.py +++ b/targets/fixed_targets/FixedTarget4.py @@ -1,4 +1,4 @@ -from targets.Target import Target +from Target import Target class FixedTarget4(Target): diff --git a/targets/fixed_targets/FixedTarget5.py b/targets/fixed_targets/FixedTarget5.py index 962793e..f85b6a7 100644 --- a/targets/fixed_targets/FixedTarget5.py +++ b/targets/fixed_targets/FixedTarget5.py @@ -1,4 +1,4 @@ -from targets.Target import Target +from Target import Target class FixedTarget5(Target): diff --git a/targets/fixed_targets/__pycache__/FixedTarget1.cpython-38.pyc b/targets/fixed_targets/__pycache__/FixedTarget1.cpython-38.pyc index 18714773ee1a7dda7a7e345d08f4bc2a3b231255..943a92604d8270c942df8ec9ec533cd0324d5212 100644 GIT binary patch delta 92 zcmeBWoy*D_%FD~e00auznQ^lw@@j}OL@_WjxHF_Mr7*WJq%fy4G&4srPV~B<b diff --git a/targets/fixed_targets/__pycache__/FixedTarget2.cpython-38.pyc b/targets/fixed_targets/__pycache__/FixedTarget2.cpython-38.pyc index cc29cfac27cd2dbba3ccef337c4b234197f0e631..a9eee9bce4bdc10e2772740335f9a9d14f151785 100644 GIT binary patch delta 92 zcmeBWoy*D_%FD~e00auznQ^lw@@j}OL@_WjxHF_Mr7*WJq%fy4G&4srPV~B<b diff --git a/targets/fixed_targets/__pycache__/FixedTarget3.cpython-38.pyc b/targets/fixed_targets/__pycache__/FixedTarget3.cpython-38.pyc index 2ff7b30c76e16e013f55c7963ad7d3baf6e5ab13..0a8a7d216ed8f197481d06d8441e19600664975c 100644 GIT binary patch delta 92 zcmeBWoy*D_%FD~e00auznQ@CI@@j}OL@_WjxHF_Mr7*WJq%fy4G&4srPV~B<4~|io0%C685x--J2M#r03D$iy8r+H delta 74 zcmeBR{l>x@%FD~e00bK%UE;bY@@j}OMlmunxHF_Mr7*WJq%fy4HZw;tP4wE%q^h@B cnbDAupE-)BB(W$xwWL_jDKRg5awwBA0BBzk>;M1& diff --git a/targets/pop_bumpers/LeftPopTarget.py b/targets/pop_bumpers/LeftPopTarget.py index 245a327..657f88f 100644 --- a/targets/pop_bumpers/LeftPopTarget.py +++ b/targets/pop_bumpers/LeftPopTarget.py @@ -1,4 +1,4 @@ -from targets.Target import Target +from Target import Target class LeftPopTarget(Target): diff --git a/targets/pop_bumpers/RightPopTarget.py b/targets/pop_bumpers/RightPopTarget.py index 44eac83..f82bc7a 100644 --- a/targets/pop_bumpers/RightPopTarget.py +++ b/targets/pop_bumpers/RightPopTarget.py @@ -1,4 +1,4 @@ -from targets.Target import Target +from Target import Target class RightPopTarget(Target): diff --git a/targets/pop_bumpers/__pycache__/LeftPopTarget.cpython-38.pyc b/targets/pop_bumpers/__pycache__/LeftPopTarget.cpython-38.pyc index 26d22c5908442d7d97fd48e29e980662d3687dcf..0e1a926c5e2e81e9ce79318eb3dce8bb30a24dfb 100644 GIT binary patch delta 92 zcmeBVoyp1@%FD~e00auznQ>Dm@@j}OL@_WjxHF_Mr7*WJq%fy4G&4srPV_ph%FD~e00auznQ;pz@@j}OL@_WjxHF_Mr7*WJq%fy4G&4srPV_pfgejC30%Ws9 zu`n{YGo-Mlu(dFxu%$9IGe@y*%u{7la@5br&rQ`Y%1A9q&C4&+cgx8vC4~|io2N3WGBUDFKFJgV0M@V{ssI20 delta 111 zcmdnawv>%Gl$V!_0SGoky2Ry8AiA1;}QN zVr67-XGmd9VQXPXVM}FfW{zUpn5W9fq^P%fE2AnSKl?47lEk9))RJO7r^LMM$+wwe E0NlnIWB>pF diff --git a/targets/right_bank/__pycache__/RightBankLeft.cpython-38.pyc b/targets/right_bank/__pycache__/RightBankLeft.cpython-38.pyc index c95ce955e31119e0837fe965974f56926b0364fe..11abd640a8efa88ac591a502d57d56bfd1104097 100644 GIT binary patch delta 92 zcmbQvx|o$Wl$V!_0SFYbGviiGn?a>u6 diff --git a/targets/slingshots/LeftSlingshotTarget.py b/targets/slingshots/LeftSlingshotTarget.py index 255bdcf..54c26a3 100644 --- a/targets/slingshots/LeftSlingshotTarget.py +++ b/targets/slingshots/LeftSlingshotTarget.py @@ -1,4 +1,4 @@ -from targets.Target import Target +from Target import Target class LeftSlingshotTarget(Target): def __init__(self): diff --git a/targets/slingshots/RightSlingshotTarget.py b/targets/slingshots/RightSlingshotTarget.py index b55af0b..e7730da 100644 --- a/targets/slingshots/RightSlingshotTarget.py +++ b/targets/slingshots/RightSlingshotTarget.py @@ -1,4 +1,4 @@ -from targets.Target import Target +from Target import Target class RightSlingshotTarget(Target): diff --git a/targets/slingshots/__pycache__/LeftSlingshotTarget.cpython-38.pyc b/targets/slingshots/__pycache__/LeftSlingshotTarget.cpython-38.pyc index 9fa56957ae013ef4573f81abb404fdf3bf1d2f8d..a134398d367e069bfc0b4b16710f75f687be1e81 100644 GIT binary patch delta 92 zcmZ3+x{Z}Ll$V!_0SFYbGviiHPx# delta 76 zcmdnOx`dTCl$V!_0SGoky2PbS#ARfh!Xr diff --git a/targets/technical/__pycache__/OutholeTarget.cpython-38.pyc b/targets/technical/__pycache__/OutholeTarget.cpython-38.pyc index 01bf6bddfd916aa8d6987ce09fe8e08aae3df8cb..42e9ce19ed90427832b712c2bc16fe1c5d2f2837 100644 GIT binary patch delta 92 zcmZo;oyN)=%FD~e00auznQ`+b@@j}OL@_WjxHF_Mr7*WJq%fy4G&4srPV_pZDm@@j}OL@_WjxHF_Mr7*WJq%fy4G&4srPV_ph2nnp diff --git a/targets/top_bank/__pycache__/TopBankMiddleLeft.cpython-38.pyc b/targets/top_bank/__pycache__/TopBankMiddleLeft.cpython-38.pyc index 5f61bb1de7f3df249415e42ee1b0ca539f9c1202..13aa1bd2a83fe3c1fcf818460e73451b7cc351e9 100644 GIT binary patch delta 92 zcmZ3*x{Z}Ll$V!_0SFYbGvjtoQRZ7hC5c7psU^jFPKkNhAz=38OeSLh