From 07e8dcf569077e555d5b6c6fbcd3803435efceb7 Mon Sep 17 00:00:00 2001
From: ghostlyzsh <pokeball.181818@gmail.com>
Date: Thu, 13 Apr 2023 16:42:41 -0500
Subject: [PATCH] gravity fix

---
 server/src/planet.rs                          |  11 ++++++-----
 server/src/timer.rs                           |   2 +-
 .../__pycache__/ninja_syntax.cpython-310.pyc  | Bin 5947 -> 5958 bytes
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/server/src/planet.rs b/server/src/planet.rs
index 04e425aa1eb8871a231fd994f109336bea058d4c..8702690534977f69798ee134c2325de338c1d3b1 100644
--- a/server/src/planet.rs
+++ b/server/src/planet.rs
@@ -1,3 +1,4 @@
+use log::debug;
 use nalgebra::{Vector2, vector};
 use rapier2d_f64::prelude::{RigidBodyHandle, RigidBodySet, ColliderBuilder, RigidBodyBuilder, ColliderSet};
 use starkingdoms_protocol::{PlanetType, ProtocolPlanet};
@@ -5,7 +6,7 @@ use starkingdoms_protocol::{PlanetType, ProtocolPlanet};
 use crate::{SCALE, manager::ClientHandlerMessage};
 
 //const GRAVITY: f64 = 0.001;
-const GRAVITY: f64 = 0.00006674;
+const GRAVITY: f64 = 6.6674;
 
 #[derive(Clone)]
 pub struct Planet {
@@ -19,7 +20,7 @@ pub struct Planet {
 impl Planet {
     pub fn gravity(&self, position: (f64, f64), mass: f64) -> (f64, f64) {
         let distance = ((position.0 - self.position.0).powi(2) + (position.1 - self.position.1).powi(2)).sqrt();
-        let force = GRAVITY * ((self.mass * mass) / distance * distance);
+        let force = GRAVITY * ((self.mass * mass) / (distance * distance));
         let mut direction = Vector2::new(self.position.0 - position.0, self.position.1 - position.1);
         direction.set_magnitude(force);
         (direction.x, direction.y)
@@ -57,7 +58,7 @@ impl Planets {
         Planets::make_planet(
             &mut planets,
             PlanetType::Earth,
-            2000.0,
+            4000.0,
             1000.0,
             (100.0, 100.0),
             rigid_body_set,
@@ -88,8 +89,8 @@ impl Planets {
         let mut direction = Vector2::zeros();
         for planet in self.planets.clone() {
             let planet_grav = planet.gravity(position, mass);
-            direction.x = planet_grav.0;
-            direction.y = planet_grav.1;
+            direction.x += planet_grav.0;
+            direction.y += planet_grav.1;
         }
         (direction.x, direction.y)
     }
diff --git a/server/src/timer.rs b/server/src/timer.rs
index eb6df7c18bdf831763b99e5c68f1d31c74b37955..4ca3d4b42f7ee15a83f1cbb1224f6430d19383ca 100644
--- a/server/src/timer.rs
+++ b/server/src/timer.rs
@@ -1,6 +1,6 @@
 
 use std::{time::Duration, sync::Arc};
-use log::{error};
+use log::{error, debug};
 
 use nalgebra::vector;
 use rapier2d_f64::prelude::{PhysicsPipeline, RigidBodyHandle};
diff --git a/spacetime_py/__pycache__/ninja_syntax.cpython-310.pyc b/spacetime_py/__pycache__/ninja_syntax.cpython-310.pyc
index b25a4cf58e2ba0cc243e4ce96661a3626d06c3b2..1ce0013edf75cb67d20ed60a1c9d539cbd32644c 100644
GIT binary patch
delta 743
zcmZvazi-n(6vsIeVl`JcbrTYrprrXxh)WeiO4U#!A&@8tP>ZN2QYb`8?AE5lMrQ}9
zU0`NFNN-?Zfq?-Qei$Yu78pA);XeWu{sFjWgIMC>bMNlH_q}`X`BVK%ojQ_~*vCKr
z;KDollFTfrrqegnP1A9`yW2aisp`gkl?_}^b-fPTvg}RW>AQ7r%ikrB1=8|w$KH}+
ziCer9Sb-0$%%SXONj?NIyVEyV1@^?We>R>Y@hU2&p(EBv4IYWJi$_pRLp3{!n+jqE
zaSSnws3GbI6>%JK!rv2H!uTA<al}c)Jp4?gq$Urq;`9^;ycn63*)UxKb*rHcJ}0Jz
zdWD)Bk!FmRhH6L?R_VEaxjm!BW>|>Bcq+#c#B{6Y1u@GrSa5)|??zQhhIzL{XW-o%
zcrI(eFM5U-rZK9LB6LSTk^&r(ZsnJ_i6SiTP<PO^E&EPqYT9KN(EcJkkxJw;yq666
z|56RgV?RjMmy;ENRAF8&m#>BI*syG!NqBGqE#pz$v$#-#ZF!O3_d$M6*5LYtJvWKV
z*v+W^4UEnsE+MWUmJw(jwSEnLXR;ur9#k-Gmgi6i&)DYKMNJAjCE}(AZ&F#J!PnF-
zS%If%jja3M(hGlokrf!vJj~rhp^oSw3`FSAh1Z#aZ1TA>5{T`#?)2JiwgKNWd8(mm
K9bxk4oc;sqm!hu#

delta 798
zcma))&ubGw6vv%)-L2VfLYk0h6WKIrw5v_F8m*c}6c1LhV!%V77-LMfx~16-lN3}u
zD0uer(2EEnC<ube;z`AuC&3@bJ@_a14~WqDZmoFCz<lP-oB7VXd2c?K-<LH{*CX3R
zi@%<Kt37ANf_1~|*;dEnw$<mWR^R3W&uy<+j_2C9Y(HQRBo_FN{Dv8Mp?fKDLkzqi
zU~cCzF$A*P?%90WKc<wKQpD<BT2p73Ne|W8>OSn$!kv5ui~E5Cz${P#Ouz!>fP=sx
z|F^m<%^ilV07roNf78&XVtQPl4x=hSIc>5uqUcg6qA!tLWkf||>zdor9r_;0Opl_Y
zE86L;#Jtc9EzIB^oRpz&S~?XbGZv<3S@qV3{q^C1SLly+QsnT&xW#hR8-K?PD(FqN
zNcZ%lau(`y^jM!_OY~8<|2wlrrRXnK^s}*o#ENt(p3mc*fxP0lU9LkoAz&(-HQ5D6
zp6<u1;(|}{r>sF&C)~;;+z4#5HWgTBfb+lw;35#FFnmyhSmKeAfip`_64~7~VZIW5
zfFC!;WEK%!VZ25^5?@)Jo+TGp)Bl+~`uEq=DU-VEUB&@6&;?e2u+$w`sCS^)H~Ve3
z`$5<PSs<!JcW_4-=FUKEwYpxX)#BI1oTq>>fk5%Dt=gR-M=TtX@h0Gipwl#!E^Yv0
CnU{P3