From c1de9921fe3d8fdfa5ef808d05787ea7e4f8aca7 Mon Sep 17 00:00:00 2001 From: RolenKeddie Date: Sun, 16 Feb 2025 15:10:32 -0700 Subject: [PATCH 01/13] im not sure what I changed --- .../core/__pycache__/__init__.cpython-312.pyc | Bin 176 -> 164 bytes .../__pycache__/environment.cpython-312.pyc | Bin 7645 -> 7633 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/project/core/__pycache__/__init__.cpython-312.pyc b/project/core/__pycache__/__init__.cpython-312.pyc index 9b5d73c4a1739045fbc160f2d6a0ca58dff0e964..43d9acdd811b844ac978a4e4e11d41c53e129a70 100644 GIT binary patch delta 80 zcmdnMxP+1WG%qg~0}yaTZ<@$$Z0YQ56%$&VT2vfUl%JiN662Czo|luKm{J@Ql%JfP iS`r_enH!UuZfIa?5K~Z;pOuebJilG%qg~0}yaTZ%Q{2*vL1Z+0xC~DkiizwWv6zC_g(jCB`McJTE6dF{L;r oC_gznwIn_`GdCtR-O#|)Af})wKPxr4Bqlk(C^csDC+63Z0MBS1zW@LL delta 98 zcmca;eb<`rG%qg~0}#A5U6{U?ee;+)jV;>5ha$yqE!9O&zN6J0syy= BBp?6) From c1aa96af38fedfb6a91722540a79e06a943578e1 Mon Sep 17 00:00:00 2001 From: RolenKeddie Date: Sun, 16 Feb 2025 15:15:05 -0700 Subject: [PATCH 02/13] Test to check if this works --- names/New test | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 names/New test diff --git a/names/New test b/names/New test new file mode 100644 index 0000000..e69de29 From 03f3f9e4022eed169e8e26a7f93fc4ddbf1992a0 Mon Sep 17 00:00:00 2001 From: RolenKeddie Date: Wed, 19 Feb 2025 15:31:10 -0700 Subject: [PATCH 03/13] changes --- .../core/__pycache__/__init__.cpython-313.pyc | Bin 0 -> 164 bytes .../core/__pycache__/environment.cpython-313.pyc | Bin 0 -> 7729 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 project/core/__pycache__/__init__.cpython-313.pyc create mode 100644 project/core/__pycache__/environment.cpython-313.pyc diff --git a/project/core/__pycache__/__init__.cpython-313.pyc b/project/core/__pycache__/__init__.cpython-313.pyc new file mode 100644 index 0000000000000000000000000000000000000000..5e6be4bd0b9fe232674dafb967044cefde050ae6 GIT binary patch literal 164 zcmey&%ge<81RT+u(n0iN5CH>>P{wB#AY&>+I)f&o-%5reCLr%KNa~hzvQgjEsy$%s>_Z1xzUh literal 0 HcmV?d00001 diff --git a/project/core/__pycache__/environment.cpython-313.pyc b/project/core/__pycache__/environment.cpython-313.pyc new file mode 100644 index 0000000000000000000000000000000000000000..060c3e13d06930d00939dd4cbec84b83f61dafcf GIT binary patch literal 7729 zcmb_hU2qdwcJ9`1TWVXDoOoo}{rV&Poe7cCC^F0

Fqkj=oHj@}l#IQH1 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 L;2D9j*u(z Date: Wed, 19 Feb 2025 16:09:54 -0700 Subject: [PATCH 04/13] adding gravity and sum of forces function to physics engine --- .../__pycache__/physics_engine.cpython-313.pyc | Bin 0 -> 3273 bytes project/__pycache__/settings.cpython-313.pyc | Bin 0 -> 159 bytes .../core/__pycache__/base_object.cpython-313.pyc | Bin 0 -> 7347 bytes .../core/__pycache__/projectile.cpython-313.pyc | Bin 0 -> 360 bytes project/core/__pycache__/rocket.cpython-313.pyc | Bin 0 -> 3140 bytes project/core/__pycache__/static.cpython-313.pyc | Bin 0 -> 3858 bytes 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 project/__pycache__/physics_engine.cpython-313.pyc create mode 100644 project/__pycache__/settings.cpython-313.pyc create mode 100644 project/core/__pycache__/base_object.cpython-313.pyc create mode 100644 project/core/__pycache__/projectile.cpython-313.pyc create mode 100644 project/core/__pycache__/rocket.cpython-313.pyc create mode 100644 project/core/__pycache__/static.cpython-313.pyc diff --git a/project/__pycache__/physics_engine.cpython-313.pyc b/project/__pycache__/physics_engine.cpython-313.pyc new file mode 100644 index 0000000000000000000000000000000000000000..46ab2228612249b107eb76946021ba676f2e759e GIT binary patch literal 3273 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 N&iUv!1b+C6{s&-VHMsx) literal 0 HcmV?d00001 diff --git a/project/core/__pycache__/projectile.cpython-313.pyc b/project/core/__pycache__/projectile.cpython-313.pyc new file mode 100644 index 0000000000000000000000000000000000000000..3e33494f011d1b354abc228b22f04fc1878f147f GIT binary patch literal 360 zcmXv|O-sW-6x_{6OD3vHz9w(m$ZGb^JbXY*)2Pr7NhZ=Kjen?PbCgx?MZn>EOv*mmN?P0~N81GFV{Fn$80w5+8Xn#P#e4s?rHOi@K6tkf}yTgML1F04Co znu^B6dZcf1W42vuB3`B;e2m ziQueFq-i&^pOO5XjKrt;L7yv=gmP>=uz`nUoTXvaxULb?D5!=F$Ci&XmMW)I#m*Qx zT~%Bj7joWV^CQ^IF=@vj!bvRgNg>JC$xN`skLn07@c;u-0ANrG0u-dMBsdgJQWKcK z#UnJ3GL=cy-oP*<6(<;;20yH5?&eL7RPkJ@v$C(PBU~dH zl0N|%P5>Er(LjfH50-$oYP3OCcTI9-2ND|ik#KoiDpaEv^lH3wOq@@Cbx7BYNi{29 z)pXT5L7cix^bZUToH`}Hf2vO&I@#A-G;(on<0J^#$O0gkoSZ9i{Y<=#a>X3wwL&JR zQon9yvb4n{T23=Ey6j?`Y?3jot0pN>-cm9;&?#ndng)nzXKa-UIn|a4v?gFwYf6VT zuWGrxP5B#I*3Q#_r4Us$DElR4rzw}U<6-KzRQ)R11$NMoo|!U~yrtPH!6?wMIX(g6 zWP7@(63hqLjbIM~3^Wk|(2!%Dqu9b^_S8OlRymy>u~cHEi3#yZpEGY5=$n;xds~*Y zLR!uB_YL-?i^N22X~iTekYnrjf_H)}YlddaGHrEvdMgN2W~~Fb$-Ip9Ean&Ti-m>4 z^Wzs+Vk0yD7eW_e^##2g>np|j9(I)b&z1VmJ=0cV7o6)=aZg!1QWB4p#Y9O=tcWLO z{I^3d#a;91*|dAJ)bXHmx%1%{E8-B|0muC1*~{+Tigxrg9bS$0l%t1B(ZfI! zUKRJ1#e*gBATl`D>+N0h-Lu_yC(5zjQml80lw$p*_WpL0 zy6ocQ!epsE?%;NGd>h;Z9~q_EtZ=~R$$0?32kaacK9X$v40eP~RUfz7WwnJl;KQeM z+XvW2j~bhRfO~D$;CTeDYO~h_N>#1_ZiLgTa>uI8lxnL{S9YnLm0fKG`3+iA`ez>+ z+gP<=i{u8D5BMt+u?OSZKz9neX4^Nqqw>7=Ky$}^$qj6C>LY449wF#7LEqd)a(c+= zCZ~}C3d~rQ5UgwJ&yvgy>c@6=yVF0eYj)g6x{w_oN)iKLVSb_E$Uejz20+7Jo1g%P zH?uYaD&o5oO|5<4-w94b? zqv#X=PvNKGXJ?-_m-;_>-u>xJ=!LN7cOi5qcq@1(ax3!P#rd(>v3uf@|3P3muw*~D zzI^>*_VL7{iDw5gygCaxf8w>E(^O$!tT4`ufj31AMDvu%~;t^HDfW( zLEM(v!4QJe0H`R-7K}tqku$bUv~ftO1x!xP zvHIL@!KZ*A!0xwt0DR57;aYj|^&x>j{yNI>&96f&fB?%!{u1EmxbLul-GSnC4(#^Y z6{nVyOA19q)ZTIYPj=@g!Lp_;#r(9TDVD4nFw|Ab8&d@sZ=6x2{zAsiJ7Tw)NQDpF wfP6@XK?Ww&Iso7gAIq|9%+6O#_bcYu8Y8YTJJy)+8zI3q&s_PFfyFWPZ%_(NZ2$lO literal 0 HcmV?d00001 diff --git a/project/core/__pycache__/static.cpython-313.pyc b/project/core/__pycache__/static.cpython-313.pyc new file mode 100644 index 0000000000000000000000000000000000000000..87213c3f54ac52ccba05a69a2b3fa895c40e2d5b GIT binary patch literal 3858 zcmds)O>7fK6o6;e`)4PCI*CmR6uD^#acLYmi*o)(^vE5k* z8V-n46{MijLt8jOPqj}8y^x-O6C7h9L^PlZsfQ{zq)?^DzBg;H9hbD~l_&Y_&fA%{ zGxOej`@GuH5+ES@*e~gEm5|@DQ5B_fvpNAc-xGrv^f+NuTqP!ntB=WWm5wX#N)ggQ zI*H-iN(?!!?)SN)nI^0XSk<`ZS#@F6z^cdno;8rBQU3}K9Eeg*Ur)L|T_p*Ij!muT;DhV=YBL4R74$ul)atzZ;T{*ciqDVG@5z|=a72rd&tbl!t)mAS(wRNT%Jle z4p*H*qL4{)gNo@dY!BKwGOxo~X({ymBBCcHEA13?aF~?#~oaIhisd#_x zY}U>tQciq0mppA1Od~TDx6*I#-M=@UXE|I&Jegxw+@1cO{0s}C|6nx`d#Y2$&3E>L z`s)IDthZd$%6i9@@Z!kQXJboxM_HeI652W!SPpNWYg%q?o0aFZ>ZQHol7AHjk|af4 z5uCON-7j!cAGl#JMAfc@413|I*~t0GG$@X{)4jDWB$YiY3l+nZbs#5RByXYffisVJlJA4rT|pAi}nQW;?K3i?`9} zpbfk11BH7W_*T29ecODo`SQq*W8aNk4;S0#!=>gtyRPPtuqPz+I--K&DdSY}Kk9>pRsYCf!PmtZ<$vY8{p~?XF z+tuYosS6W4Tz?2}NLW;))KMpQ?{CKL8*0#&WmELQ8SNqDLo#o(8;EB2%-10Ek zSq^sI4|ZL5ioNrFrM{oemxKFf>RxES8NLx-ly3!o4czX%d-%@brRd-TeaOX!?BYY@LIhtcLN75qt_;7nQJvwb zW!ey}FQO6WR zS$$sRu|eG-84}hWmC6IkpGxHcH3(E5T3zL#^T3HjHkHYykpx}vo`Kqu*Hs)?eF!KN zAQlZ!s8k#Xg_wBvAsN6hR0oDH>%ah5sH-`!Rb3;(#5>3_A8s&8;s6|R*=xZT#e4=p zZbP`ZNWd8jiOB|_?>~BDpoOFfzz9Dc4dTJ*|Gb$F<2SKEJWu~?R#9z$2W&4`BLFt6 zh(x8ef^=j1Kt-FLOSak)`G0F_{vo&=3SXgD`mcR*^^>cc%AxMr z{<&jl^R2U8ItC04Z+{5v4DGxh+EskDn3|s~O_uhQLkHa<+a89xVf_72PjO$dFn_Le zu5_dvIyBpV>DUX&QXjKYY-5scu8S9<6q9p9l!l7(yjoIW+s>5EETnEu-k7}Ies|lQ zZA-g8eV`AxDAhKs#KZ?ynMdx1U8fj7b z)^<>3P;hgw!c80%ZQ^QvCJluidj*;-3W_V)>8bn-m$G^O5*GY>#uJWZy8mPNrjM{O z47F<_o3<@cXbDpDCh^4WCZ<#(Vs+v}&-M4*BJv134(|XU66Y|er#?#QBhvPWG(94% okI9Z_dNUoOv*(`?ygu9BOi$9wI<`(itCbGY%iI1Wcook72COHoMF0Q* literal 0 HcmV?d00001 From 823cbea3d9a2d9f62abd2faa2ba47476c80d2742 Mon Sep 17 00:00:00 2001 From: Vince Date: Sat, 22 Feb 2025 16:50:31 -0700 Subject: [PATCH 05/13] Acceleration testing --- project/physics_engine.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/project/physics_engine.py b/project/physics_engine.py index 48a9973..b85bfeb 100644 --- a/project/physics_engine.py +++ b/project/physics_engine.py @@ -10,7 +10,13 @@ def calculate_gravity(object,environment): pass def calculate_acceleration(force,mass): - pass + """ + Calculate acceleration + :param force: force[0] "fx", force[1] "fy" from resulting force + :param mass: mass of the rocket + :return: acceleration of the rocket (ax, ay) + """ + return (force[0]/mass, force[1]/mass) def calculate_collision_force(object1,object2): pass From af531352f6d0084d643add4559eacfd70920751c Mon Sep 17 00:00:00 2001 From: Vince Date: Sat, 22 Feb 2025 17:01:50 -0700 Subject: [PATCH 06/13] Testing commit and calculate_acceleration --- project/physics_engine.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/project/physics_engine.py b/project/physics_engine.py index 48a9973..7aaf8cd 100644 --- a/project/physics_engine.py +++ b/project/physics_engine.py @@ -10,7 +10,16 @@ def calculate_gravity(object,environment): pass def calculate_acceleration(force,mass): - pass + """ + Calculate the acceleration of the rocket + a = F/m + param: force[0] "fx", force[1] "fy" + Force vectors of the rocket + param: mass + Mass of the rocket + return: "ax", "ay" + """ + return (force[0] / mass, force[1] / mass) def calculate_collision_force(object1,object2): pass From daf00283d21f54a10b4bf623f34ac11b756ecefc Mon Sep 17 00:00:00 2001 From: Vince Date: Sat, 22 Feb 2025 18:07:16 -0700 Subject: [PATCH 07/13] EXAMPLE INITIAL CONDITIONS AND UPDATING FORCES --- project/core/rocket.py | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/project/core/rocket.py b/project/core/rocket.py index a311723..574fa50 100644 --- a/project/core/rocket.py +++ b/project/core/rocket.py @@ -24,8 +24,12 @@ def __init__(self,screen,launchsite,result = None,object_type = "rocket",dt=None self.x = launchsite.x+launchsite.width*.5-self.width*.5 self.y = launchsite.y-self.height self.dt = dt - - + + #TESING INITIAL MASS, THRUST & ANGLE + self.mass = 100 #EXAMPLE mass of rocket (kg) + self.thrust = 1000 #EXAMPLE initial thrust (N) + self.angle = math.radians(90) #EXAMPLE initial angle of rocket (rad) + self.velocity = [0,0] def draw(self): @@ -51,6 +55,31 @@ def check_collision(self,other,environment): def update(self,environment=None): + + #EXAMPLE Calculate the magnitude of thrust components + thrust_x = self.thrust * np.cos(self.angle) + thrust_y = self.thrust * np.sin(self.angle) + + #EXAMPLE Calculate force + force_x = thrust_x + force_y = thrust_y - (self.mass * environment.gravity) + force = np.array([force_x, force_y]) + + #Use physics_engine to calculate acceleration with force and mass + acceleration = physics_engine.calculate_acceleration(force,self.mass) + + #Update velocity + # a = dv/dt + # a * dt = vf - vi + # vf = vi + (a * dt) + self.velocity += acceleration * self.dt + + # v = ds/dt + # v * dt = sf - si + # sf = si + (v * dt) + self.x += self.velocity[0] * self.dt + self.y += self.velocity[1] * self.dt + #this will update forces and stuff pass From af484d9a5f047d8d05eb65105a706faf63abfc9c Mon Sep 17 00:00:00 2001 From: Vince Date: Sat, 22 Feb 2025 20:47:25 -0700 Subject: [PATCH 08/13] fix because of error not able to multiply acceleration array to float --- project/core/rocket.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/core/rocket.py b/project/core/rocket.py index 574fa50..d072040 100644 --- a/project/core/rocket.py +++ b/project/core/rocket.py @@ -72,7 +72,7 @@ def update(self,environment=None): # a = dv/dt # a * dt = vf - vi # vf = vi + (a * dt) - self.velocity += acceleration * self.dt + self.velocity += [(acceleration[0] * self.dt),(acceleration[1] * self.dt)] # v = ds/dt # v * dt = sf - si From 4fef738a194bfa6d7eab62f0cb3fbf1797642593 Mon Sep 17 00:00:00 2001 From: Vince Date: Sat, 22 Feb 2025 21:35:42 -0700 Subject: [PATCH 09/13] moving rocket up idk --- project/core/rocket.py | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/project/core/rocket.py b/project/core/rocket.py index d072040..71ffd78 100644 --- a/project/core/rocket.py +++ b/project/core/rocket.py @@ -26,9 +26,9 @@ def __init__(self,screen,launchsite,result = None,object_type = "rocket",dt=None self.dt = dt #TESING INITIAL MASS, THRUST & ANGLE - self.mass = 100 #EXAMPLE mass of rocket (kg) - self.thrust = 1000 #EXAMPLE initial thrust (N) - self.angle = math.radians(90) #EXAMPLE initial angle of rocket (rad) + self.mass = 10 #EXAMPLE mass of rocket (kg) + self.thrust = 200 #EXAMPLE initial thrust (N) + self.angle = np.radians(270) #EXAMPLE initial angle of rocket (rad) self.velocity = [0,0] def draw(self): @@ -41,17 +41,14 @@ def draw(self): pg.draw.rect(self.screen,"red",(self.x,self.y,self.width,self.height)) self.screen.blit(image, image_rect) - def erase(self): - #handled elsewhere pass - def compute_altitude(self): - pass + return max(0, self.launchsite.y - self.y) def check_collision(self,other,environment): - pass + pass def update(self,environment=None): @@ -72,16 +69,16 @@ def update(self,environment=None): # a = dv/dt # a * dt = vf - vi # vf = vi + (a * dt) - self.velocity += [(acceleration[0] * self.dt),(acceleration[1] * self.dt)] - + self.velocity = np.array(self.velocity) + (np.array(acceleration) * self.dt) + # v = ds/dt # v * dt = sf - si # sf = si + (v * dt) self.x += self.velocity[0] * self.dt self.y += self.velocity[1] * self.dt - + print(f"Thrust: {thrust_y} Force: {force_y} Velocity: {self.velocity}, Position: ({self.x}, {self.y})") #this will update forces and stuff - pass + \ No newline at end of file From 87ec3dee986d14a02f7454a9a57abd46122b6655 Mon Sep 17 00:00:00 2001 From: Vinny699 Date: Sun, 23 Feb 2025 00:29:34 -0700 Subject: [PATCH 10/13] py game coordiates (0,0) at the top left. --- project/core/rocket.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/project/core/rocket.py b/project/core/rocket.py index 71ffd78..997dba1 100644 --- a/project/core/rocket.py +++ b/project/core/rocket.py @@ -26,9 +26,9 @@ def __init__(self,screen,launchsite,result = None,object_type = "rocket",dt=None self.dt = dt #TESING INITIAL MASS, THRUST & ANGLE - self.mass = 10 #EXAMPLE mass of rocket (kg) - self.thrust = 200 #EXAMPLE initial thrust (N) - self.angle = np.radians(270) #EXAMPLE initial angle of rocket (rad) + self.mass = 10 #EXAMPLE mass of rocket (kg) + self.thrust = 200 #EXAMPLE initial thrust (N) + self.angle = np.radians(90) #EXAMPLE initial angle of rocket (rad) self.velocity = [0,0] def draw(self): @@ -59,7 +59,7 @@ def update(self,environment=None): #EXAMPLE Calculate force force_x = thrust_x - force_y = thrust_y - (self.mass * environment.gravity) + force_y = thrust_y + (self.mass * environment.gravity) #inverted for pygame coordinates (0,0) at the top left force = np.array([force_x, force_y]) #Use physics_engine to calculate acceleration with force and mass @@ -75,7 +75,7 @@ def update(self,environment=None): # v * dt = sf - si # sf = si + (v * dt) self.x += self.velocity[0] * self.dt - self.y += self.velocity[1] * self.dt + self.y -= self.velocity[1] * self.dt #inverted for pygame coordinates (0,0) at the top left print(f"Thrust: {thrust_y} Force: {force_y} Velocity: {self.velocity}, Position: ({self.x}, {self.y})") #this will update forces and stuff From af596a3c3352792ed46760dba65a6804adead411 Mon Sep 17 00:00:00 2001 From: RolenKeddie Date: Sat, 1 Mar 2025 09:36:16 -0700 Subject: [PATCH 11/13] Create .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0d20b64 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.pyc From 0fa458058bfab895d3554f9b1e8f4ad6c1515dbf Mon Sep 17 00:00:00 2001 From: RolenKeddie Date: Sat, 1 Mar 2025 11:19:42 -0700 Subject: [PATCH 12/13] idk --- .../physics_engine.cpython-313.pyc | Bin 3273 -> 3508 bytes .../__pycache__/environment.cpython-313.pyc | Bin 7729 -> 7729 bytes .../core/__pycache__/rocket.cpython-313.pyc | Bin 3140 -> 3140 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/project/__pycache__/physics_engine.cpython-313.pyc b/project/__pycache__/physics_engine.cpython-313.pyc index 46ab2228612249b107eb76946021ba676f2e759e..6e820a234d6581237d1ebcf2c50a11aead51d3ac 100644 GIT binary patch delta 419 zcmX>pxkZ}qGcPX}0}zz>9Zr|x+{ibTv7Q;o1>w(1Kw>IGC_^wKE07h+sLKr`8G@M* zJQF4r22JLwrCiR5Imx9ti6yBDiOI>SIjKd7C7JnoTvi2%MTxlzY57ITsa6mw+8|az zDXl_D2g)@BaVwP+(u(qP6^c@eOA~TRGV{_QvM>X36N`(j6hNdxewso_Myf(lesXqd z371t-YDsBPo)wC5YmFp$Xu#KrPJqJiN99|Nz@ z1jSB|2_c=nGfWo<&a_zIGSl_~x8?;F&B+rPbtmgE*|16g)rwBeWinF`1!)Btr=U>8 z4y0~zB-?(Qv@=+NNRE@PcSPxqt+*($!mFJ0M}e`f&c&j delta 138 zcmdlYeNvL|GcPX}0}!|+Y)jYY*vL1Pak4I>+~i&+LslW6Fwf)&X4A>y%r>mzKpsDk zXT~Tpxu02zRT9V-n!JwrInztV$xNFUAs diff --git a/project/core/__pycache__/environment.cpython-313.pyc b/project/core/__pycache__/environment.cpython-313.pyc index 060c3e13d06930d00939dd4cbec84b83f61dafcf..d052034c15a88aaa80347c1b16d4bd12f793a730 100644 GIT binary patch delta 20 acmdmJv(bk8GcPX}0}yC+AKJ*RCI}$U diff --git a/project/core/__pycache__/rocket.cpython-313.pyc b/project/core/__pycache__/rocket.cpython-313.pyc index 60233e7a678116be88d660a1685a84161585e7a5..b58a29a3b424ceb40b4ec390de5887a731e0fd40 100644 GIT binary patch delta 20 acmX>iaYTaqGcPX}0}zz>9p1=o$pZjAf(2m! delta 20 acmX>iaYTaqGcPX}0}yaTZ`#Oh$pZj7hXnBe From 77d10d46eacea2e130e5543ad1324a9bf3a070a9 Mon Sep 17 00:00:00 2001 From: RolenKeddie Date: Sat, 1 Mar 2025 11:20:40 -0700 Subject: [PATCH 13/13] idk2 --- .../physics_engine.cpython-313.pyc | Bin 3508 -> 3508 bytes .../core/__pycache__/rocket.cpython-313.pyc | Bin 3140 -> 3140 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/project/__pycache__/physics_engine.cpython-313.pyc b/project/__pycache__/physics_engine.cpython-313.pyc index 6e820a234d6581237d1ebcf2c50a11aead51d3ac..25bf521c3878c2b65367ee0609d32529ef9872ec 100644 GIT binary patch delta 19 ZcmdlYy+xYqGcPX}0}w3t-^jI!7XUUy1tZRA?T3jj3@1oQv^ diff --git a/project/core/__pycache__/rocket.cpython-313.pyc b/project/core/__pycache__/rocket.cpython-313.pyc index b58a29a3b424ceb40b4ec390de5887a731e0fd40..1327f3ec9ac30f5be688e3abf6e8e8374136ee70 100644 GIT binary patch delta 19 ZcmX>iaYTaaGcPX}0}w3t-^gXf0{}NY1knHh delta 19 ZcmX>iaYTaaGcPX}0}zz>ZRE1z0RT1z1f2i?