diff --git a/Java/scripts/md5 b/Java/scripts/md5 index 22a476c..d4665a7 100644 --- a/Java/scripts/md5 +++ b/Java/scripts/md5 @@ -1,4 +1,4 @@ -build.sh:55f0208b07ba384f45009d6f92fe88fe *- -clean.sh:96ce35f2d2dcb555421e00a6afda23ca *- -commit.sh:5e4448db9ad48e72ec3a1ff4f5763b41 *- -jar.sh:56f9b7c6dc8e85f28ffefe9ce82b1f07 *- +build.sh:55f0208b07ba384f45009d6f92fe88fe - +clean.sh:96ce35f2d2dcb555421e00a6afda23ca - +commit.sh:5e4448db9ad48e72ec3a1ff4f5763b41 - +jar.sh:56f9b7c6dc8e85f28ffefe9ce82b1f07 - diff --git a/src/sig/objects/Player.java b/src/sig/objects/Player.java index 26db60a..9db9408 100644 --- a/src/sig/objects/Player.java +++ b/src/sig/objects/Player.java @@ -8,7 +8,7 @@ import sig.map.CollisionType; import sig.map.Tile; public class Player extends Object{ - double y_acceleration = 15; + double y_acceleration = 9000; double x_acceleration = 0; double x_velocity = 0; double y_velocity = 5; @@ -29,10 +29,10 @@ public class Player extends Object{ for(int i=0;i<4;i++){ double check_distance = (displacement/4)*(i+1); Tile checked_tile_top = RabiClone.CURRENT_MAP.getTile((int)getX()/Tile.TILE_WIDTH, (int)(getY()+check_distance)/Tile.TILE_HEIGHT); - Tile checked_tile_bottom = RabiClone.CURRENT_MAP.getTile((int)(getX()+getSprite().getWidth())/Tile.TILE_WIDTH, (int)(getY()+getSprite().getHeight()+check_distance)/Tile.TILE_HEIGHT); + Tile checked_tile_bottom = RabiClone.CURRENT_MAP.getTile((int)(getX()+getSprite().getWidth())/Tile.TILE_WIDTH, (int)(getY()+getSprite().getHeight()/2+check_distance)/Tile.TILE_HEIGHT); //System.out.println((int)getX()/Tile.TILE_WIDTH); if(checked_tile_bottom.getCollision()==CollisionType.BLOCK){ - setY((getY()+check_distance)+getSprite().getHeight()/2); + setY((getY()+check_distance)); y_acceleration = 0; y_velocity = 0; is_collision=true; diff --git a/utils/filelist b/utils/filelist index 8a9f471..95ad5ff 100644 --- a/utils/filelist +++ b/utils/filelist @@ -1,5 +1,5 @@ .coauthors -.updateDirectories define.sh main.sh search.sh +.updateDirectories diff --git a/utils/md5 b/utils/md5 index 529ddc7..a47b4f9 100644 --- a/utils/md5 +++ b/utils/md5 @@ -1,4 +1,4 @@ -.updateDirectories:0ede00461e947494545e694040787b3f *- -define.sh:883c4033be11b6d1268b852beada5463 *- -main.sh:663ac9bb9ee46eb8cd1d717e8eb5e486 *- -search.sh:2a471ffc3daa12f96157e613873f589d *- +define.sh:883c4033be11b6d1268b852beada5463 - +main.sh:663ac9bb9ee46eb8cd1d717e8eb5e486 - +search.sh:2a471ffc3daa12f96157e613873f589d - +.updateDirectories:0ede00461e947494545e694040787b3f -