From 7096156d2fce2bbe7909ae0d454213708e9f3d28 Mon Sep 17 00:00:00 2001 From: EthanWinters64 <77895341+EthanWinters64@users.noreply.github.com> Date: Wed, 8 Feb 2023 11:40:12 -0700 Subject: [PATCH 1/3] Add files via upload --- Classes/Ball.py | 17 +---- Classes/Globals.py | 59 +--------------- Classes/Goal.py | 40 +---------- Classes/Robot.py | 71 +++++++++++++++++++- Classes/__pycache__/Ball.cpython-310.pyc | Bin 2011 -> 1260 bytes Classes/__pycache__/Ball.cpython-38.pyc | Bin 0 -> 1261 bytes Classes/__pycache__/Globals.cpython-310.pyc | Bin 3780 -> 3152 bytes Classes/__pycache__/Globals.cpython-38.pyc | Bin 0 -> 2617 bytes Classes/__pycache__/Goal.cpython-310.pyc | Bin 1309 -> 758 bytes Classes/__pycache__/Goal.cpython-38.pyc | Bin 0 -> 759 bytes Classes/__pycache__/PicObj.cpython-38.pyc | Bin 0 -> 437 bytes Classes/__pycache__/Robot.cpython-310.pyc | Bin 3437 -> 3437 bytes Classes/__pycache__/Robot.cpython-38.pyc | Bin 0 -> 4700 bytes 13 files changed, 73 insertions(+), 114 deletions(-) create mode 100644 Classes/__pycache__/Ball.cpython-38.pyc create mode 100644 Classes/__pycache__/Globals.cpython-38.pyc create mode 100644 Classes/__pycache__/Goal.cpython-38.pyc create mode 100644 Classes/__pycache__/PicObj.cpython-38.pyc create mode 100644 Classes/__pycache__/Robot.cpython-38.pyc diff --git a/Classes/Ball.py b/Classes/Ball.py index 351f34a..39a3a53 100644 --- a/Classes/Ball.py +++ b/Classes/Ball.py @@ -21,20 +21,5 @@ def move(self): def setSpeed(self,v): self.v = v - - def getSpeed(self): - """Returns the speed of the ball as a list, index 0 is the velocity of the ball while index 1 is the direction of the ball (in degrees). - \nIf you want the velocity in one direction make sure you use math.sin or math.cos.\nTo get the x speed use math.sin, its weird but its correct""" - return self.v - - def getXSpeed(self): - return self.v[0]*math.sin(math.radians(self.v[1])) - - def getYSpeed(self): - return self.v[0]*math.cos(math.radians(self.v[1])) - - def resetToMiddle(self): - self.xpos = WIDTH //2 - self.ypos = HEIGHT //2 - + return self.v \ No newline at end of file diff --git a/Classes/Globals.py b/Classes/Globals.py index cc4a288..7a33298 100644 --- a/Classes/Globals.py +++ b/Classes/Globals.py @@ -19,7 +19,6 @@ GREY = (128,128,128) TURQUOISE = (64,224,208) -score = [0, 0] # index 0 is red team and index 1 is blue team @@ -54,10 +53,7 @@ def draw_robots(win, robot_list): def draw(win, robot_list): win.fill(WHITE) draw_robots(win, robot_list) - draw_score(win, score) pygame.display.update() - - def updateBall(robot, ball): if robot.hasball: @@ -84,58 +80,7 @@ def algorithm(robot2, robot3, ball, goal): if getRBD(robot2, goal)+1>=robot2.getDegree()>=getRBD(robot2, goal)-1: robot2.throwBall() -def control(robot, event, ball): - if event.type == pygame.TEXTINPUT: - if event.text =="r": - robot.up() - elif event.text == "s": - robot.down() - if event.text == "y": - robot.left() - elif event.text == "t": - robot.right() - if event.text == "a": - robot.turnLeft() - print(getBallDist(robot, ball)) - elif event.text == "d": - robot.turnRight() - if event.text == "w": - robot.foreward() - if event.text == "q": - if getBallDist(robot, ball)< 5: - robot.grabBall(ball) - elif event.text == "x": - robot.throwBall() - updateBall(robot, ball) #print(robot.front[2]) - -def draw_score(window, score): - # create a font object. - # 1st parameter is the font file - # which is present in pygame. - # 2nd parameter is size of the font - font = pygame.font.Font('freesansbold.ttf', 32) - - # create a text surface object, - # on which text is drawn on it. - textRed = font.render(f'Red Team: {score[0]}', True, RED, WHITE) - textBlue = font.render(f'Blue Team: {score[1]}', True, BLUE, WHITE) - - - # create a rectangular object for the - # text surface object - textRedRect = textRed.get_rect() - textRedRect.center = (WIDTH // 2 - 150, 100) - - textBlueRect = textBlue.get_rect() - textBlueRect.center = (WIDTH // 2 + 150, 100) - - # copying the text surface object - # to the display surface object - # at the center coordinate. - WIN.blit(textRed, textRedRect) - WIN.blit(textBlue, textBlueRect) - -def resetScore(): - score = [0,0] \ No newline at end of file + #if event.type == pygame.KEYUP: + # if diff --git a/Classes/Goal.py b/Classes/Goal.py index b60c7b0..c834759 100644 --- a/Classes/Goal.py +++ b/Classes/Goal.py @@ -1,7 +1,5 @@ import pygame -from Classes.Ball import Ball # you can also import * -from Classes.Globals import * class Goal: def __init__(self, xpos, ypos, width, height, team, color): self.xpos = xpos-(width/2) @@ -13,40 +11,4 @@ def __init__(self, xpos, ypos, width, height, team, color): def draw(self,win): #not tested - pygame.draw.rect(win, self.color, (self.xpos, self.ypos, self.width,self.height)) - - def scoreGoal(self, ball: Ball) -> bool: - # if goal is on the left - if self.xpos < 400: - # if inside the net - # ball is on the left side of the net AND ball is below the top of the net AND ball is also above the bottom of the net - if (ball.xpos <= self.xpos + self.width) and (ball.ypos > self.ypos and ball.ypos < self.ypos + self.height): - # if ball is going towards the net - # idk if it should be less than or EQUAL to but why not - if ball.getXSpeed() <= 0: - score [1] +=1 - ball.resetToMiddle() - ball.setSpeed([0,0]) - return True - - - # if goal is on the right - else: - - # if inside the net - # if ball is on the right side of the net AND ball is below the top of the net AND ball is also above the bottom of the net - if (ball.xpos >= self.xpos) and (ball.ypos > self.ypos and ball.ypos < self.ypos + self.height): - # idk if it should be greater than or EQUAL to but why not - if ball.getXSpeed() >= 0: - score [0] +=1 - ball.resetToMiddle() - ball.setSpeed([0,0]) - return True - return False - - - - - - - + pygame.draw.rect(win, self.color, (self.xpos, self.ypos, self.width,self.height)) \ No newline at end of file diff --git a/Classes/Robot.py b/Classes/Robot.py index 15ecee6..6906ccf 100644 --- a/Classes/Robot.py +++ b/Classes/Robot.py @@ -1,7 +1,8 @@ import pygame import math +from Classes.Globals import * # to import all global variables class Robot: - def __init__(self, speed,turn_speed, xpos, ypos, color,radius): + def __init__(self, speed,turn_speed, xpos, ypos, color,radius, directions): self.turn_speed = turn_speed #deg per frame self.xpos = xpos self.ypos = ypos @@ -14,7 +15,8 @@ def __init__(self, speed,turn_speed, xpos, ypos, color,radius): self.accel = 1 self.front = [xpos,ypos+radius, 0]#initially looks down at 0 deg self.power = 0 - + self.directions = directions + def get_turn_speed(self): return self.turn_speed def up(self): @@ -78,5 +80,70 @@ def draw(self, win): #try give claw to indicate front #Spygame.draw.rect(win, self.color,()) + def control(robot, event, ball): # control checks which keys are pressed and updates the robot's movement booleans + # 0 forward + # 1 backward + # 2 left + # 3 right + # 4 turn left + # 5 turn right + # 6 up + # 7 down + # F and B are respective to the front of the robot, while all others are headless + if event.type == pygame.KEYDOWN: + if event.key == pygame.K_f: + robot.directions[0] = True + elif event.key == pygame.K_b: + robot.directions[1] = True + if event.key == pygame.K_a: + robot.directions[2] = True + elif event.key == pygame.K_d: + robot.directions[3] = True + if event.key == pygame.K_z: + robot.directions[4] = True + elif event.key == pygame.K_x: + robot.directions[5] = True + if event.key == pygame.K_w: + robot.directions[6] = True + elif event.key == pygame.K_s: + robot.directions[7] = True + if event.type == pygame.KEYUP: + if event.key == pygame.K_f: + robot.directions[0] = False + elif event.key == pygame.K_b: + robot.directions[1] = False + if event.key == pygame.K_a: + robot.directions[2] = False + elif event.key == pygame.K_d: + robot.directions[3] = False + if event.key == pygame.K_z: + robot.directions[4] = False + elif event.key == pygame.K_x: + robot.directions[5] = False + if event.key == pygame.K_w: + robot.directions[6] = False + elif event.key == pygame.K_s: + robot.directions[7] = False + def drive(robot): + if (robot.directions[0] == True): + robot.foreward() + if (robot.directions[1] == True): + robot.backward() + if (robot.directions[2] == True): + robot.left() + if (robot.directions[3] == True): + robot.right() + if (robot.directions[4] == True): + robot.turnLeft() + if (robot.directions[5] == True): + robot.turnRight() + if (robot.directions[6] == True): + robot.up() + if (robot.directions[7] == True): + robot.down() + + def __lt__(self, other): return False + + \ No newline at end of file diff --git a/Classes/__pycache__/Ball.cpython-310.pyc b/Classes/__pycache__/Ball.cpython-310.pyc index 374a9aaf854f143683858a90062072a2cbd8a1ae..401bdfa3e5ec39b8a8c5d1379a77baa17ca49b46 100644 GIT binary patch delta 140 zcmcc3|Avz~%IkeZs}r^zvym0h1(5~NrfM956`V^@^q e0WvulI2buNIG8zDd6*t+6ZY_ z@B>vo0J>y}Sn&(&*#wCl3nX^^0j_77N7afe`S@P@*!TGOZ}I0sIdNTwVEp+0E1-q_ z@*DbS|NWgMR{B7m+stKUoQrIMoyFN<=i0=peEGI!(9d6g8wc#x3RsQinh#nJn;kKS z#i=g1f=jMC$$H3G#8;6fEd+;_>7bH%fdqHT*zo3uYu3%0{zkE+;i?90p;*?iI^@=J dy@IJtY--!KX%}n@hgmX(iOcv!i^GrB`ah{d)4Kow diff --git a/Classes/__pycache__/Ball.cpython-38.pyc b/Classes/__pycache__/Ball.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..6ce470c7311afd948d2823a481047f9ee0d99f2a GIT binary patch literal 1261 zcmZ`&O>fjN5VaF0n|>?>sR9Zd5GPVq-3v#ApbPW>+5_7PDVHdX(>6;sS?p{}tKR4j z;3u@l9{58(aN*Ryz==0bLrV)@`FSR`-^{%6Zg#t~3}fT_kMx_v*iUk<4j0Z#OuY<{ zO!9(7&B`MV-zl68w$7w0#W9oOs}s4B4_WA)<2)OL-0Ds998F!J+qy-JG6TYLYi|IT=6RaDCODv|kA z8@?C1M(C{ARvr=ffHS7%u>9)xHg%?S?@hg%lppi5Cg*jgKh@Qw_o3RV(&^-Jzmi$& z4D)fXUnE**xBQ&=Xcn(=h`zVNze|m>5`S?35=SJ_=!Wp zj3C8GV0zmSVdS3*j=m1r86Ti}e{!&sj58yoO7@MP<|-{R)d9n0jVgc}I*L>??tWg{ zk{h5T)os8nOl?!*hch-&VoXWoc92a}HpvYbNQWkRw!~`Z#KojU@jjN=DL>_l>>l>f zStNhuod2J5p6#zYu$?_`+S^nygJ4FClX};{Tq*U`LDJ4bPAOK}?A)~dg2Mcso4<}hB@8V#qWz+O_=Z2nC zr432lhemBU^#H!QPeAYUvRNkBxrjoWe@AI|24O&NvBblOV>27a<4R5ovghOY^E4@% z9n~dfYQ9<`cu4Sw;4-AO>?3ipL4O-f;siVh0yppiN746Cs6{Ml0bmv`{uZn2MYWX_ X+Mf6qr3s!liM=2dG${aH9yq@NY})h0 literal 0 HcmV?d00001 diff --git a/Classes/__pycache__/Globals.cpython-310.pyc b/Classes/__pycache__/Globals.cpython-310.pyc index 75a49e3a5f77bf392dc3592e42db51dc90e5bf61..40a6e7bc6623859cd1f66a5136ef63b288a9676a 100644 GIT binary patch delta 510 zcmWlU&ubGw6vyXfe<#hFHcgx6m!=KD#Z*HZtAT=Ivt$>_R+^Mb1V#EHRH7-{1r^eh zdhl51<|)OaC&{%J!9PH+1NPQK>EBT3n;GW&dG9;JdvE>}|7PuBG8t#Iwtk-NwUWnn z0Zxza40cjD{h9UBID={8EY4zvn87)mC(dCO7l`wi!#pvI1uPO5u!J{>IlP5sVjdT9 ziC94BFsCw6Aq2?r_pu*P;(6salqdg{4S)(SYu{mopK8mG7HOCf8?y*b09X_ou@QWV zQKY<4$Jz-4hOEOvo1QtkP+#v42148Q{H_~1&6%!^M6Jf8k2KF0ch|G^ETY$GnNN!{@g0V`sB!3f@xVzzy~KK)ac_uKdkXz z@mgh-+|ZIzlCmP@fs}_*WKU`WiM!C@^+dB5kl_@=n)Gjw2;Fo2w%4WE{Z`lO=}-M< z8(TrREbq+2e)RI~5c@*e^#hTR>E5e@Xn*)lDBEtUr?t0THxTNR%^jCtCf9h?E~V`lC@5Bj5(8&G#d#gI}ATtNQKDf{s2o$?o<0NKr;tSC@g_C%acnVM96!B?1jnl-_ zn8O+39OiMBcn0Tio;Z&SxJW#U1w2DMhiCC+;(1)cbHod{jIR(cB5Vr({1G3Z+Aioq z>^}W#^N;Ty{qWDn0JBk3`vw*xU4IN`4}a3v0nSBf^DDRoztxjLY$gVbE-h~9QPIpDw$c_%yh(lx_xx;ZsL$>OvKZ|<7nk0ks7x~~FucyN z#&Ct0`-irj;{v zLp?M{+!?lw&|;fA;=9%T?2ZhA{&u&2tJlGzQaeWlI_$nv3$RcRw(ndiNT5J{-@V%T zG#H0+6q1(-j=p5T0io~7A`$hs*Hy9c9-}3LE(S8zYo!f&AyKb>@KGtYcLUXwK}*p+ zsBF~BvDFH?iWhEGsDAtVY{4 zym6d8>2hKM9$S24KcU&5B*>U~BM-JY3AQ!~o|%P2Z;|w3@RxH_lP2;O)IQkN4vwp* zRg=>23kJf6<758+m9Zm(exNq_YTu{)KJVs%Y!dl}q+aqRvSX`Us$47AWrLiCb-i+9 z{llt!l@*)vn|FFt#hdK9?6$V=s&=m{w|KRAtyW5vs`3Uo(S3K-;BrNe-NpP08Iu1Z n$#-7z9ZkMbHlsh?Wq3Q9_LgTf+q4Z^rzb-*l{}uE_h$bC5lajd diff --git a/Classes/__pycache__/Globals.cpython-38.pyc b/Classes/__pycache__/Globals.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..ac6ec2518a31b0d7a494745113eb679a784babd4 GIT binary patch literal 2617 zcmZWq&u<$=6rP!#U2lFiZPWZ{+LBf+U?@!~Ac0hsG_jjRL{4!Mg|396O=e>|b!;=c zQJQLlkiwBOmkKF9^w0|@PCf7kAP}7QfRK919SMmGd~eoH;&fN@=Djzwv)_F0y_w~{ zzHWx+>tFs{|GtZ{S7e-gB#cS4@Fxhx6t6Nb?YYO5@I)Y#HOM?m$v})TPX=t$K5zmn z5F4V&y^OJ4Wj8rz%JI5X#_LwD*Q2_;Ue)dOsUELi^?GMipEscTy|e0!cTNqcv)?lB zygH}OqaRd*>H_);YDf*EA5tS~6#cNesK(Hbs7vZH`cZX7y@CFs8dq1*k14*$veyoQ zoE0kL7GtH~|5<$X{Mp~1mVWz{p6ioOdy4h7`ucWbe6g~XwGRKoT+Q1eYo)q4?JzUQ ziy3C{dWPBDANeh~Y_Is*%$@KnxLZjNVpVmEZ97D16Ue=B&wbPqoH_rb(+80c^!AC>*u z3MP<|3&O`yy)n_|Xu7U~wgJ8-rmKD!2I0g^wZ7(8!&{Br#5Jq0mMa$t4H3YE?t@%6 zI@x$gchC&v>rf(gz#|d!O)F-b)(G2AEeT7K)f9{D1utanL~i*}IkC&Tje3+={#uyG zCyhEJ9AQ=@jz&PE_gnoPv%6IE;y+1mDTr28C5-&qdT<4v6eHI|&^s^^r5QAX@ivs0 z9k3?b6A?cUkp-+W7K)EDgO+R?wn%M**D9ERA5ws_PU7O%4|Kg2=`(QX0TO3PP|Wms zh!<938~BL?pVh?PFw-eOC$`Xob*3=Xl?{%p zNFLZ|PLzoyqM3>9eLlvTyvg@@EQTp5os=Iv0$_(82|8se{opI>>QU&16~hk^vt3h$ zx+J55k`4j{-A5b^iCIUF(Fd0x5{t$!L-Xw2TxDa!v!76RIu{%eS)9sI{)H5N#wA$n z$2-8CR+B>Cz(@zHlo`aiVU@tgJjcH52eaY;SwctMSCYz3_hXPMO=*88YbDlBrIvJ? z2(MNVy%h54@Y3W}Gby}-?~lWqh1CIs%80-iAlIN!Xd_U}8Hx$8_60O+6QO9b^dv|j zIf>k;P=c+@&MoCNEu1)w-4YH2kXs2GRev{ewj0Wif~?SQVO+mWq7$or6TXkoLP|8o zyYU)d2TDRnNDWH*0!7XAHDKjbPH7Rve3dklkgJvC)rL;^nZ5M@UERwGqO@9c_x+!cZ^w_Ot zSo|4A1h}!-7ke_oX>Z~Uiz41CTCeR>C^vw%n#fvcw~fZuO_ig7jvZ9m=#M9 zP=$>njj{;@IQr$$f2{OBW)HIP~H#L`Zp*}$l zDm`&G>N?o*wZbW?{WS`(p1^DnUe@&;va`0nK%Vph_`sY5o-Ebq=DKn!#t`AOvOb0RI^2LJ31hz-_MY!k@jQZ=y?2A7?f{H#570;+e}W&3ewmxi6*{ z3i>@vNL<8obqm*IVy(;-k{&YG{YF%&*AlCk&w2JtF`q9aa%z4#?>Ue1^YaTU`dxhL z*;DiPr$57T%f*ND7+WabFU;gUi4PumT}#Ww&zBeG7W3vZHMdnt*A2o&1#Ak>Bza09 v;XbivvwL#|x_1F^yBgf1d&wLz*sq|Y&lLl_7usvD<4V`U+m9yQjGOr%W@id} literal 0 HcmV?d00001 diff --git a/Classes/__pycache__/Goal.cpython-310.pyc b/Classes/__pycache__/Goal.cpython-310.pyc index 6c82950982a887559877f11e9ba74a714c402cb3..bcedec3d2e6d04a37fb7817839b2a9d1c49afd3c 100644 GIT binary patch delta 339 zcmbQs^^KJ;pO=@50SIhX-b-G{IFV1rQ3}XQVMt-jVTfXIXGmd6VQyhaVQyxMVoYHS zX3%7L2~zHt3?h*M6OiKo#Kkfbdt_OF3fU&^p03CO6e(f_5gZ_b6GX6q2zDT`lA(xu zaxtSXBg^E2jE#XHp&~3AG?|J(PQ1ljo|#v~4N?Rqct9+EAOT_&gREC$s^WCdPt4Iv zDM~E&(`20-&Z3&j3sZ)q6`>!bjTxjL2KczG$ P)s7LQ8{}#ZMj=K3ojEal literal 1309 zcmbVMPjAyO6t^8GO}n-m6VgCP9EY;Q#Eog1ra_T*q6ao46jh2s>~%@grr7Dmrrg*E z;3KR@z6u|~2QHj;<2)|B=l)RzoN(oz-+Q*-KmXFA)oKtJ;@kJ+S&fh%sH_eLlp~mW z7eEj}a}wgpayn!oqbNJMb4reh;KIEj!u`xbF6apfygRr#9-vb>fV|>>t{~u@b?+G54?M#^jSFq~mBmuVL*phzUMS;U zrlLGI-nmTs=VeecT+94Sd2mf(A_^O;))0JzI>1+=TCm(7cJ_Pkv{bs6#TTjUy)Kf; zP>xF7d)awgd??B^(LEHB$@nB4_Bwg2wbVVVcz1kd{3uFCX&FTrO*aABv`szxYtZYK zJ-0ZMU?q!zGNxl&v<*T@GJ4CPQ6z&VWYB^P8k0d=vf3G+I{3oS5ZVoV2SAlu zZ%QbxHNgbyvnid`j`gq3Mbv?-#)}vbPc7tSymA@ORTmJC{a?I*chfHv+6I%{Aq4)c z8S%5T5<9&k4EEqJ)A9$qjBP5Q=o5bXO3fNY|{4cayX6*=EN4(G{81emk=}JNwONUrwiofcEkCeesVE0tr73TgeLC^dnflsFyk;YUgy4W6CLnUZz&^p{?<~7?#=7i% zzs#Gfvgs*!XWZw$?XnN;r?yykFJ`SaV{lQfvRR!wXIw^Yzv{L=QL1dpUMYIg9U%Za z#u0~cI}LebPC@OAMn16%I=w`vhl>5+s1{VHM1?w3s7{62RFiA@Q!xCNs0y2>iI2PO zO};W-YMXDow5I4oZ;y4Ja!db<7n`yPo$r9S+NTKQxWJ6x9t6Hrbe=}kT!XJD~t)%SDNItp+1$RpTUtl2}=@7JILr5m*78k%_nbmuf3)0z%60_ E05$)Zf&c&j literal 0 HcmV?d00001 diff --git a/Classes/__pycache__/PicObj.cpython-38.pyc b/Classes/__pycache__/PicObj.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..88fcdce800167a7bf8fecf94c4a49cd9c237840d GIT binary patch literal 437 zcmY*Uy-veG4E9|@6;)J7hzDTJLS6u&qEN9FM5&OnoYLGO0{J6O22eNpG7P-X4JN?lXqa3Wd}_)nxG6Vf(pJY|sm(xEX&!`GjA$_EH#wWPiH?jlqdhk~tYD?Ol8jCnLO4+GWd8yls-}_2Ew{g~2>Itd4?M7~obArDm bbOSumak{RHqh3C&W`Xri`w?fX`X<0H2w+VTIXj%W_@bgZqk7h3{zyJK%!A6n9p?lVie zzqPj&&K2qTJ#ryz~YCtY$>Gu%);yXQ(La|WC3$e7Nw8A zAWO20z9?tpEP7wg$qM?CoRUy@a*bt~~6h1+4=^dWin z`mGu`*F;sw}EmGtTv2yBH)EunG>Prf!2bj z-~y&eWjBcHBZFQAE~1B8qQ96fH_kAzD4F%5FJZt%(Zm%%_<;4?K894>MRf_}6DPGM zEu738^kgFr9&kGpqHjVp`=ECX=*R`IL`C%dRG@?2Hxpucx)6#Mp1Pnb!^7_DV@sCP zB}w>Bi$ZhlOxm}W&lA8?t=+x&#+U>%sRWwx%|tlI_=+1eUGGk?6Enq)Ol|ZgVPaA0 zpm%%|gKWoR`?-ULcyA-RSFB@kEEcV73)+bKwgA0&4iD(h{mfTR?AnlSby6A`EpeYV z;=RO)THU0`&~9`iH47%~QHj$GBXzD_{hd$+hYcmahZiDlge9)y$s#Hve-~9VtG`H9 z%`>K|dW9;yN-!-1{Ov|_pMt*&jwym?4(TIK%cW z^)7R68nxskbriYCzlw3F)9-K(Ne0fWEw6LrxkfKBt30AZ|B%AdYb>#dI9?F_`P8X% zj&CFXkIu^PX7bb9ULZf?N-Lq>;%KV9DbdGp`k#VhTx64cGlmI?rzGDr=ZVxNZ7W$Uqhj6s@cK@Fc1fR36Q}x(}D|%AZPXkdOfU7{L*9e#@M=_}0 z;B<mXwu6~(Z7&o^85s7YVE=J2CRqb6rukbDQj-j%*i>U6E3Y^b<|>c@jyRX}68KG961- zx;yT%V=U;^(!{2d8J&H|{jQdhLhop|@ia(WsTzk#q1jT+PLLLYG*DW}kT-EzLh3*; zZkRZSt?n5&R6hXgCYtfUYoebO7x;eD0VVr!%%&aU&#>@7w5?dQ?R{H)g|UONi}7_j zNE+YWC4(;j|GvQ^o(;AL>?4D9*R7n}2Y%1sy_~xQ>=y=GIK^EC{tpIU%(-WP{j0(H zr?_W<|H|M?nwvVz?c2W>>dRAF{9BfDEv}5T0GDkjV|oC8)!?Z~_69TonM~U;WzN2p!9BmUc2qZzD;B$gQ0^D`*>XT2Z zPU0!v$PzF3EI=7OE&UanEU?4Qud!sb0brG8Mf#M_?JJs65oMg$vuJ1gzKL1$?TNII zC(plQJ!~&BxUMy9wS?>@Sm|l3j!8JmJ6Xk{v99603#^m#dItMTVBH*BFxW1zUXCpq z>@#2sIo3DWKLK0Ju_c538?bo|S}mt}VN)M~X#w;T=%U^y;I=B(2x=XmTGIQbt`qSl z0k2W&Wr8ZfO@b=~D*#B1KjWAO+o_wFCspgS;CDbqs{p+5_%CREb1~3wP2|ixEz=A2 ze-buM3a*%?C@+ln0(Dl1LcQL>P4tgo%(C-rnw?WZt-8$nY8Q#IUQf#P`qNMzbU2=^ z*MD=+=%f^N5g$;O339blduYpy45cljZS*#obuq~zUEL=5J^@b)ojlb;jy@)+5sd7o zN4(A|Mjlm;_+el8%f9Wq`f+>@y@$v49Xz&Qz`W?c?O)PwRb3sFY85Xg^X8I%`@>GS Z-RMM`W7>j=zn)s)16o|4oLCjl{{S?0YBc}= literal 0 HcmV?d00001 From a4733e1870bfe6503c80555f950dce8caff1f434 Mon Sep 17 00:00:00 2001 From: EthanWinters64 <77895341+EthanWinters64@users.noreply.github.com> Date: Wed, 8 Feb 2023 11:41:48 -0700 Subject: [PATCH 2/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 18b0a18..9aeb0c0 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ # RobocupSim -sim for robocup \ No newline at end of file +My branch focuses on the Robot Class, where I updated the movement system to allow for diagonal movement and simultainous movement/rotation operations From 9006d08e2c73041d7583049c6edd2f95ea1dd348 Mon Sep 17 00:00:00 2001 From: EthanWinters64 <77895341+EthanWinters64@users.noreply.github.com> Date: Wed, 8 Feb 2023 11:43:06 -0700 Subject: [PATCH 3/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9aeb0c0..f8c4eec 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ # RobocupSim -My branch focuses on the Robot Class, where I updated the movement system to allow for diagonal movement and simultainous movement/rotation operations +My branch focuses on the Robot Class, where I updated the movement system to allow for diagonal movement and simultainous movement/rotation operations. Work was also done on the Globals class, where methods such as control were changed and relocated to the Robot class